RepositoryFixes.mk | 35 -
codemaker/StaticLibrary_codemaker.mk | 2
codemaker/StaticLibrary_codemaker_cpp.mk | 2
codemaker/StaticLibrary_codemaker_java.mk | 2
connectivity/source/drivers/postgresql/pq_tools.cxx | 10
odk/CustomTarget_doxygen.mk | 6
odk/CustomTarget_lib.mk | 12
odk/CustomTarget_odkcommon.mk | 2
odk/config/configure.pl | 9
odk/config/setsdkenv_unix | 5
odk/config/setsdkenv_unix.csh.in | 289
----------
odk/docs/install.html | 11
odk/settings/settings.mk | 21
odk/util/check.pl | 4
registry/Library_reg.mk | 2
registry/Module_registry.mk | 2
registry/Package_inc.mk | 43 +
registry/ZipPackage_registry_odk_headers.mk | 45 -
reportdesign/source/ui/dlg/Formula.cxx | 10
sal/osl/unx/file.cxx | 6
sc/source/ui/formdlg/formula.cxx | 4
scp2/source/sdkoo/module_sdkoo.scp | 4
scp2/source/sdkoo/sdkoo.scp | 14
slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm | 3
store/Library_store.mk | 2
store/Module_store.mk | 2
store/Package_inc.mk | 34 +
store/ZipPackage_store_odk_headers.mk | 36 -
28 files changed, 139 insertions(+), 478 deletions(-)
New commits:
commit 857adeada9cc3276e79ceb828959a3ffe2d7409b
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Apr 10 16:08:08 2013 +0200
Revert "registry: new ZipPackage_registry_odk_headers"
This reverts commit ba8372449befc6c534ab9596d7a3fd1e66884d61.
The "reg" library is not actually a stable URE interface.
Conflicts:
odk/CustomTarget_doxygen.mk
registry/Module_registry.mk
Change-Id: Ic53e1b8eecd6a12c9ec194df2f0093004db7c01b
diff --git a/codemaker/StaticLibrary_codemaker.mk
b/codemaker/StaticLibrary_codemaker.mk
index ebd86c8..f95842f 100644
--- a/codemaker/StaticLibrary_codemaker.mk
+++ b/codemaker/StaticLibrary_codemaker.mk
@@ -31,7 +31,7 @@ $(eval $(call
gb_StaticLibrary_use_external,codemaker,boost_headers))
$(eval $(call gb_StaticLibrary_use_packages,codemaker,\
codemaker_inc \
- registry_odk_headers \
+ registry_inc \
sal_generated \
sal_odk_headers \
salhelper_odk_headers \
diff --git a/codemaker/StaticLibrary_codemaker_cpp.mk
b/codemaker/StaticLibrary_codemaker_cpp.mk
index 7bd5565..6c081ff 100644
--- a/codemaker/StaticLibrary_codemaker_cpp.mk
+++ b/codemaker/StaticLibrary_codemaker_cpp.mk
@@ -31,7 +31,7 @@ $(eval $(call
gb_StaticLibrary_use_external,codemaker_cpp,boost_headers))
$(eval $(call gb_StaticLibrary_use_packages,codemaker_cpp,\
codemaker_inc \
- registry_odk_headers \
+ registry_inc \
sal_generated \
sal_odk_headers \
salhelper_odk_headers \
diff --git a/codemaker/StaticLibrary_codemaker_java.mk
b/codemaker/StaticLibrary_codemaker_java.mk
index 4ef12c3..096da0f 100644
--- a/codemaker/StaticLibrary_codemaker_java.mk
+++ b/codemaker/StaticLibrary_codemaker_java.mk
@@ -31,7 +31,7 @@ $(eval $(call
gb_StaticLibrary_use_external,codemaker_java,boost_headers))
$(eval $(call gb_StaticLibrary_use_packages,codemaker_java,\
codemaker_inc \
- registry_odk_headers \
+ registry_inc \
sal_generated \
sal_odk_headers \
salhelper_odk_headers \
diff --git a/registry/Library_reg.mk b/registry/Library_reg.mk
index 1c79a00..375f162 100644
--- a/registry/Library_reg.mk
+++ b/registry/Library_reg.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Library_Library,reg))
$(eval $(call
gb_Library_set_soversion_script,reg,3,$(SRCDIR)/registry/util/reg.map))
$(eval $(call gb_Library_use_packages,reg,\
- registry_odk_headers \
+ registry_inc \
))
$(eval $(call gb_Library_add_defs,reg,\
diff --git a/registry/Module_registry.mk b/registry/Module_registry.mk
index 7806c2a..3d0eb96 100644
--- a/registry/Module_registry.mk
+++ b/registry/Module_registry.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_Module_Module,registry))
$(eval $(call gb_Module_add_targets,registry,\
Library_reg \
- ZipPackage_registry_odk_headers \
+ Package_inc \
$(if $(filter-out $(OS),IOS), \
Executable_regmerge \
Executable_regview \
diff --git a/registry/Package_inc.mk b/registry/Package_inc.mk
new file mode 100644
index 0000000..6d67701
--- /dev/null
+++ b/registry/Package_inc.mk
@@ -0,0 +1,43 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrov...@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,registry_inc,$(SRCDIR)/registry/inc/registry))
+
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/reader.h,reader.h))
+$(eval $(call
gb_Package_add_file,registry_inc,inc/registry/reader.hxx,reader.hxx))
+$(eval $(call
gb_Package_add_file,registry_inc,inc/registry/reflread.hxx,reflread.hxx))
+$(eval $(call
gb_Package_add_file,registry_inc,inc/registry/refltype.hxx,refltype.hxx))
+$(eval $(call
gb_Package_add_file,registry_inc,inc/registry/reflwrit.hxx,reflwrit.hxx))
+$(eval $(call
gb_Package_add_file,registry_inc,inc/registry/regdllapi.h,regdllapi.h))
+$(eval $(call
gb_Package_add_file,registry_inc,inc/registry/registry.h,registry.h))
+$(eval $(call
gb_Package_add_file,registry_inc,inc/registry/registry.hxx,registry.hxx))
+$(eval $(call
gb_Package_add_file,registry_inc,inc/registry/regtype.h,regtype.h))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/types.h,types.h))
+$(eval $(call
gb_Package_add_file,registry_inc,inc/registry/version.h,version.h))
+$(eval $(call gb_Package_add_file,registry_inc,inc/registry/writer.h,writer.h))
+$(eval $(call
gb_Package_add_file,registry_inc,inc/registry/writer.hxx,writer.hxx))
+
+# vim: set noet sw=4 ts=4:
diff --git a/registry/ZipPackage_registry_odk_headers.mk
b/registry/ZipPackage_registry_odk_headers.mk
deleted file mode 100644
index ca0d738..0000000
--- a/registry/ZipPackage_registry_odk_headers.mk
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 David Ostrovsky <d.ostrov...@gmx.de> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call
gb_ZipPackage_ZipPackage,registry_odk_headers,$(SRCDIR)/registry/inc/registry))
-
-$(eval $(call
gb_ZipPackage_add_files,registry_odk_headers,inc/registry,include/registry,\
- reader.h \
- reader.hxx \
- reflread.hxx \
- refltype.hxx \
- reflwrit.hxx \
- regdllapi.h \
- registry.h \
- registry.hxx \
- regtype.h \
- types.h \
- version.h \
- writer.h \
- writer.hxx \
-))
-
-# vim: set noet sw=4 ts=4:
commit 5ad95cec96f6f08c55bb226a6eaeb1eeb95c1279
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Apr 10 16:04:53 2013 +0200
Revert "store: new ZipPackage_store_odk_headers"
This reverts commit 5c60cebafdc6d6d773c794c0a4ee58d63782df22.
The "store" library is not actually a stable URE interface.
Conflicts:
odk/CustomTarget_doxygen.mk
Change-Id: I221696515ba07b0155406a503c33760c58d1338f
diff --git a/store/Library_store.mk b/store/Library_store.mk
index fabac10..11c822e 100644
--- a/store/Library_store.mk
+++ b/store/Library_store.mk
@@ -31,7 +31,7 @@ $(eval $(call
gb_Library_set_soversion_script,store,3,$(SRCDIR)/store/util/store
$(eval $(call gb_Library_use_external,store,boost_headers))
$(eval $(call gb_Library_use_packages,store,\
- store_odk_headers \
+ store_inc \
))
$(eval $(call gb_Library_add_defs,store,\
diff --git a/store/Module_store.mk b/store/Module_store.mk
index f6a9454..9f166ac 100644
--- a/store/Module_store.mk
+++ b/store/Module_store.mk
@@ -28,7 +28,7 @@ $(eval $(call gb_Module_Module,store))
$(eval $(call gb_Module_add_targets,store,\
Library_store \
- ZipPackage_store_odk_headers \
+ Package_inc \
))
# vim:set noet sw=4 ts=4:
diff --git a/store/Package_inc.mk b/store/Package_inc.mk
new file mode 100644
index 0000000..11c3e15
--- /dev/null
+++ b/store/Package_inc.mk
@@ -0,0 +1,34 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2012 David Ostrovsky <d.ostrov...@gmx.de> (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,store_inc,$(SRCDIR)/store))
+
+$(eval $(call
gb_Package_add_file,store_inc,inc/store/store.h,inc/store/store.h))
+$(eval $(call
gb_Package_add_file,store_inc,inc/store/store.hxx,inc/store/store.hxx))
+$(eval $(call
gb_Package_add_file,store_inc,inc/store/storedllapi.h,inc/store/storedllapi.h))
+$(eval $(call
gb_Package_add_file,store_inc,inc/store/types.h,inc/store/types.h))
+
+# vim: set noet sw=4 ts=4:
diff --git a/store/ZipPackage_store_odk_headers.mk
b/store/ZipPackage_store_odk_headers.mk
deleted file mode 100644
index cb21dbc..0000000
--- a/store/ZipPackage_store_odk_headers.mk
+++ /dev/null
@@ -1,36 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2012 David Ostrovsky <d.ostrov...@gmx.de> (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call
gb_ZipPackage_ZipPackage,store_odk_headers,$(SRCDIR)/store/inc/store))
-
-$(eval $(call
gb_ZipPackage_add_files,store_odk_headers,inc/store,include/store,\
- store.h \
- store.hxx \
- storedllapi.h \
- types.h \
-))
-
-# vim: set noet sw=4 ts=4:
commit c56013e97b7b5cf7a09a3ff99e0c172450dcb5a5
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Apr 10 16:00:44 2013 +0200
API CHANGE: odk: remove "store" and "reg" libraries
These libraries were never part of the stable URE interface, and thus
including their headers and import libs in the SDK was a mistake.
Apparently at least on MacOSX and some Linux distros it was not
possible to link against the libraries anyway.
Change-Id: I3c43c86ff5d7bc316ed7af0be4ef313f7869ac23
diff --git a/odk/CustomTarget_doxygen.mk b/odk/CustomTarget_doxygen.mk
index 8bf2a14..df401f9 100644
--- a/odk/CustomTarget_doxygen.mk
+++ b/odk/CustomTarget_doxygen.mk
@@ -14,8 +14,8 @@ odkcommon_ZIPDEPS += $(odk_WORKDIR)/docs/cpp/ref/index.html
CPPDOCREFNAME := "$(PRODUCTNAME) $(PRODUCTVERSION) SDK C/C++ API Reference"
-odk_INCDIRLIST := sal salhelper rtl osl store typelib uno cppu cppuhelper \
- registry $(if $(filter WNT,$(OS)),systools)
+odk_INCDIRLIST := sal salhelper rtl osl typelib uno cppu cppuhelper \
+ $(if $(filter WNT,$(OS)),systools)
odk_INCFILELIST := com/sun/star/uno/Any.h \
com/sun/star/uno/Any.hxx \
com/sun/star/uno/genfunc.h \
@@ -41,8 +41,6 @@ DOXY_DEPS := $(SRCDIR)/odk/pack/gendocu/Doxyfile \
$(call gb_Package_get_target,salhelper_odk_headers) \
$(call gb_Package_get_target,cppu_odk_headers) \
$(call gb_Package_get_target,cppuhelper_odk_headers) \
- $(call gb_Package_get_target,store_odk_headers) \
- $(call gb_Package_get_target,registry_odk_headers)
$(eval $(call
gb_CustomTarget_register_target,odk/odkcommon/docs/cpp/ref,index.html))
diff --git a/odk/CustomTarget_lib.mk b/odk/CustomTarget_lib.mk
index d817835..910211e 100644
--- a/odk/CustomTarget_lib.mk
+++ b/odk/CustomTarget_lib.mk
@@ -20,8 +20,7 @@ $(odk_WORKDIR)/lib/$(notdir $(1)) : $(1)
endef
ifeq ($(COM),MSC)
-odk_LIBLIST := store \
- reg \
+odk_LIBLIST := \
sal \
salhelper \
cppu \
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index ad4697b..acaabbc 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -88,8 +88,6 @@ CPPULIB=icppu.lib
CPPUHELPERLIB=icppuhelper.lib
SALHELPERLIB=isalhelper.lib
PURPENVHELPERLIB=ipurpenvhelper.lib
-REGLIB=ireg.lib
-STORELIB=istore.lib
BLANK=
EMPTYSTRING=
@@ -198,15 +196,11 @@ CPPU_ENV=gcc3
#CPPULIB=-luno_cppu
#CPPUHELPERLIB=-luno_cppuhelperC52
#SALHELPERLIB=-luno_salhelperC52
-#REGLIB=-lreg
-#STORELIB=-lstore
SALLIB=-luno_sal
CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID)
PURPENVHELPERLIB=-luno_purpenvhelper$(COMID)
-REGLIB=-lreg
-STORELIB=-lstore
EMPTYSTRING=
PATH_SEPARATOR=:
@@ -330,8 +324,6 @@ CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID)
PURPENVHELPERLIB=-luno_purpenvhelper$(COMID)
-REGLIB=-lreg
-STORELIB=-lstore
EMPTYSTRING=
PATH_SEPARATOR=:
@@ -437,12 +429,10 @@ CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID)
PURPENVHELPERLIB=-luno_purpenvhelper$(COMID)
-REGLIB=-lreg
-STORELIB=-lstore
-INSTALL_NAME_URELIBS=$(XCRUN) install_name_tool -change
@__________________________________________________URELIB/libuno_sal.dylib.3
@executable_path/urelibs/libuno_sal.dylib.3 -change
@__________________________________________________URELIB/libuno_cppu.dylib.3
@executable_path/urelibs/libuno_cppu.dylib.3 -change
@__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3
@executable_path/urelibs/libuno_cppuhelper$(COMID).dylib.3 -change
@__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3
@executable_path/urelibs/libuno_salhelper$(COMID).dylib.3 -change
@__________________________________________________URELIB/libreg.dylib.3
@executable_path/urelibs/libreg.dylib.3 -change
@__________________________________________________URELIB/libstore.dylib.3
@executable_path/urelibs/libstore.dylib.3
+INSTALL_NAME_URELIBS=$(XCRUN) install_name_tool -change
@__________________________________________________URELIB/libuno_sal.dylib.3
@executable_path/urelibs/libuno_sal.dylib.3 -change
@__________________________________________________URELIB/libuno_cppu.dylib.3
@executable_path/urelibs/libuno_cppu.dylib.3 -change
@__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3
@executable_path/urelibs/libuno_cppuhelper$(COMID).dylib.3 -change
@__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3
@executable_path/urelibs/libuno_salhelper$(COMID).dylib.3
-INSTALL_NAME_URELIBS_BIN=$(XCRUN) install_name_tool -change
@__________________________________________________URELIB/libuno_sal.dylib.3
libuno_sal.dylib.3 -change
@__________________________________________________URELIB/libuno_cppu.dylib.3
libuno_cppu.dylib.3 -change
@__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3
libuno_cppuhelper$(COMID).dylib.3 -change
@__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3
libuno_salhelper$(COMID).dylib.3 -change
@__________________________________________________URELIB/libreg.dylib.3
libreg.dylib.3 -change
@__________________________________________________URELIB/libstore.dylib.3
libstore.dylib.3
+INSTALL_NAME_URELIBS_BIN=$(XCRUN) install_name_tool -change
@__________________________________________________URELIB/libuno_sal.dylib.3
libuno_sal.dylib.3 -change
@__________________________________________________URELIB/libuno_cppu.dylib.3
libuno_cppu.dylib.3 -change
@__________________________________________________URELIB/libuno_cppuhelper$(COMID).dylib.3
libuno_cppuhelper$(COMID).dylib.3 -change
@__________________________________________________URELIB/libuno_salhelper$(COMID).dylib.3
libuno_salhelper$(COMID).dylib.3
EMPTYSTRING=
PATH_SEPARATOR=:
@@ -551,8 +541,6 @@ CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID)
PURPENVHELPERLIB=-luno_purpenvhelper$(COMID)
-REGLIB=-lreg
-STORELIB=-lstore
EMPTYSTRING=
PATH_SEPARATOR=:
diff --git a/scp2/source/sdkoo/module_sdkoo.scp
b/scp2/source/sdkoo/module_sdkoo.scp
index 5adfdf8..d496611 100644
--- a/scp2/source/sdkoo/module_sdkoo.scp
+++ b/scp2/source/sdkoo/module_sdkoo.scp
@@ -40,7 +40,5 @@ Module gid_Module_Optional_Sdkoo
gid_File_Zip_Odkheaders_sal,
gid_File_Zip_Odkheaders_salhelper,
gid_File_Zip_Odkheaders_cppu,
- gid_File_Zip_Odkheaders_cppuhelper,
- gid_File_Zip_Odkheaders_store,
- gid_File_Zip_Odkheaders_registry);
+ gid_File_Zip_Odkheaders_cppuhelper);
End
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index 70ea8fe..ff64264 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -180,20 +180,6 @@ File gid_File_Zip_Odkheaders_cppuhelper
Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
End
-File gid_File_Zip_Odkheaders_store
- TXT_FILE_BODY;
- Dir = gid_Dir_Basis_Sdk;
- Name = "store_odk_headers.zip";
- Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
-End
-
-File gid_File_Zip_Odkheaders_registry
- TXT_FILE_BODY;
- Dir = gid_Dir_Basis_Sdk;
- Name = "registry_odk_headers.zip";
- Styles = (ARCHIVE,USE_INTERNAL_RIGHTS);
-End
-
#if (!defined(WNT) && !defined( MACOSX) )
Directory gid_Dir_Lib_Sdk
Styles = (CREATE);
commit fb61a9c3fc491996cb1e96e579ef72d4d4d0f2a2
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Apr 10 15:27:39 2013 +0200
odk: settings.mk: add variable PURPENVHELPERLIB
This library is part of the stable URE interface.
Change-Id: Id131bdd333ecff2ae788830ca4b5b57b4a4a9c24
diff --git a/odk/settings/settings.mk b/odk/settings/settings.mk
index 0bae9b6..ad4697b 100644
--- a/odk/settings/settings.mk
+++ b/odk/settings/settings.mk
@@ -87,6 +87,7 @@ SALLIB=isal.lib
CPPULIB=icppu.lib
CPPUHELPERLIB=icppuhelper.lib
SALHELPERLIB=isalhelper.lib
+PURPENVHELPERLIB=ipurpenvhelper.lib
REGLIB=ireg.lib
STORELIB=istore.lib
@@ -203,6 +204,7 @@ SALLIB=-luno_sal
CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID)
+PURPENVHELPERLIB=-luno_purpenvhelper$(COMID)
REGLIB=-lreg
STORELIB=-lstore
@@ -327,6 +329,7 @@ SALLIB=-luno_sal
CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID)
+PURPENVHELPERLIB=-luno_purpenvhelper$(COMID)
REGLIB=-lreg
STORELIB=-lstore
@@ -433,6 +436,7 @@ SALLIB=-luno_sal
CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID)
+PURPENVHELPERLIB=-luno_purpenvhelper$(COMID)
REGLIB=-lreg
STORELIB=-lstore
@@ -546,6 +550,7 @@ SALLIB=-luno_sal
CPPULIB=-luno_cppu
CPPUHELPERLIB=-luno_cppuhelper$(COMID)
SALHELPERLIB=-luno_salhelper$(COMID)
+PURPENVHELPERLIB=-luno_purpenvhelper$(COMID)
REGLIB=-lreg
STORELIB=-lstore
commit 6f749e9595de50bdd8b7637155d3e40d94a45400
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Apr 10 15:22:55 2013 +0200
odk: remove duplicative setsdenv_unix.csh
Having to maintain only one of these seems easier, and likely nobody
uses csh any more.
Change-Id: Ia4ddb54d27999fbf17ceea0b8bd76e59a29b023d
diff --git a/odk/CustomTarget_odkcommon.mk b/odk/CustomTarget_odkcommon.mk
index 935f3ea..9ba2d6e 100644
--- a/odk/CustomTarget_odkcommon.mk
+++ b/odk/CustomTarget_odkcommon.mk
@@ -33,7 +33,7 @@ else
odk_CONFIGLIST := configure.pl \
setsdkenv_unix \
setsdkenv_unix.sh.in \
- setsdkenv_unix.csh.in
+
endif
define odk_config
diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index 8cd2a54..9a460c8 100644
--- a/odk/config/configure.pl
+++ b/odk/config/configure.pl
@@ -514,12 +514,9 @@ else
$main::SDK_AUTO_DEPLOYMENT = "NO";
}
-prepareScriptFile("setsdkenv_unix.sh.in", "setsdkenv_unix.sh", 1);
+prepareScriptFile("setsdkenv_unix.sh.in", "setsdkenv_unix.sh");
chmod 0644, "$main::OO_SDK_CONFIG_HOME/$main::hostname/setsdkenv_unix.sh";
-prepareScriptFile("setsdkenv_unix.csh.in", "setsdkenv_unix.csh", 2);
-chmod 0644, "$main::OO_SDK_CONFIG_HOME/$main::hostname/setsdkenv_unix.csh";
-
print "\n";
print "
************************************************************************\n";
print " * ... your SDK environment has been prepared.\n";
@@ -527,7 +524,6 @@ print " * For each time you want to use this configured SDK
environment, you\n";
print " * have to run the \"setsdkenv_unix\" script file!\n";
print " * Alternatively can you source one of the scripts\n";
print " * \"$main::OO_SDK_CONFIG_HOME/$main::hostname/setsdkenv_unix.sh\"\n";
-print " *
\"$main::OO_SDK_CONFIG_HOME/$main::hostname/setsdkenv_unix.csh\"\n";
print " * to get an environment without starting a new shell.\n";
print "
************************************************************************\n\n";
@@ -776,9 +772,6 @@ sub prepareScriptFile()
{
my $inputFile = shift;
my $outputFile = shift;
- # shell mode 1 = sh
- # 2 = csh
- my $shellMode = shift;
if ( ! -d "$main::OO_SDK_CONFIG_HOME/$main::hostname" )
{
diff --git a/odk/config/setsdkenv_unix b/odk/config/setsdkenv_unix
index 08972af..38ab222 100755
--- a/odk/config/setsdkenv_unix
+++ b/odk/config/setsdkenv_unix
@@ -38,10 +38,6 @@ then
then
rm $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.sh
fi
- if [ -r $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.csh ]
- then
- rm $HOME/$OO_SDK_NAME/$HOSTNAME/setsdkenv_unix.csh
- fi
shift
elif [ "$1" = "-h" ] || [ "$1" = "--help" ] || [ -n "$1" ]
then
@@ -52,7 +48,6 @@ then
echo " --force-configure : force a new configuration of your SDK
environment."
echo " Alternatively can you edit your SDK
environment scripts directly:"
echo " $HOME/$OO_SDK_NAME/setsdkenv_unix.sh"
- echo " $HOME/$OO_SDK_NAME/setsdkenv_unix.csh"
echo " -h, --help : print this help and exit"
echo
exit 1
diff --git a/odk/config/setsdkenv_unix.csh.in b/odk/config/setsdkenv_unix.csh.in
deleted file mode 100644
index bdd5ede..0000000
--- a/odk/config/setsdkenv_unix.csh.in
+++ /dev/null
@@ -1,289 +0,0 @@
-#! /bin/csh
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-# This file incorporates work covered by the following license notice:
-#
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements. See the NOTICE file distributed
-# with this work for additional information regarding copyright
-# ownership. The ASF licenses this file to you under the Apache
-# License, Version 2.0 (the "License"); you may not use this file
-# except in compliance with the License. You may obtain a copy of
-# the License at http://www.apache.org/licenses/LICENSE-2.0 .
-#
-
-# This script sets all enviroment variables, which are necessary for building
-# the examples of the Office Development Kit.
-# The Script was developed for the operating systems Solaris, Linux and MacOS.
-
-# The SDK name
-setenv OO_SDK_NAME @OO_SDK_NAME@
-
-# Installation directory of the Software Development Kit.
-# Example: setenv OO_SDK_HOME /opt/libreoffice/basis3.4/sdk
-setenv OO_SDK_HOME '@OO_SDK_HOME@'
-
-# Office installation directory.
-# Example: set OFFICE_HOME=/opt/libreoffice
-setenv OFFICE_HOME '@OFFICE_HOME@'
-
-# URE installation directory.
-# Example: setenv OO_SDK_URE_HOME /opt/libreoffice/ure
-setenv OO_SDK_URE_HOME '@OO_SDK_URE_HOME@'
-
-# Directory of the make command.
-# Example: setenv OO_SDK_MAKE_HOME /usr/bin
-setenv OO_SDK_MAKE_HOME @OO_SDK_MAKE_HOME@
-
-# Directory of the zip command.
-# Example: setenv OO_SDK_ZIP_HOME /usr/bin
-setenv OO_SDK_ZIP_HOME @OO_SDK_ZIP_HOME@
-
-# Directory of the C++ compiler.
-# Example: setenv OO_SDK_CPP_HOME /usr/bin
-setenv OO_SDK_CPP_HOME @OO_SDK_CPP_HOME@
-
-# Solaris only
-setenv OO_SDK_CC_55_OR_HIGHER @OO_SDK_CC_55_OR_HIGHER@
-
-# Directory of the Java SDK.
-# Example: setenv OO_SDK_JAVA_HOME "/usr/jdk/jdk1.6.0_10"
-setenv OO_SDK_JAVA_HOME @OO_SDK_JAVA_HOME@
-
-# Special output directory
-# Example: setenv OO_SDK_OUTPUT_DIR "$HOME"
-setenv OO_SDK_OUTPUT_DIR @OO_SDK_OUTPUT_DIR@
-
-# Environment variable to enable auto deployment of example components
-# Example: set SDK_AUTO_DEPLOYMENT=YES
-setenv SDK_AUTO_DEPLOYMENT @SDK_AUTO_DEPLOYMENT@
-
-# Get the operating system.
-set sdk_platform=`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`
-
-# Set the directory name.
-set programdir=program
-set javadir=bin
-switch (${sdk_platform})
- case "darwin*":
- set programdir="Contents/MacOS"
- set javacdir=Commands
- breaksw
-endsw
-
-
-# Set office program path.
-if ( "${OFFICE_HOME}" != "" ) then
- setenv OFFICE_PROGRAM_PATH "${OFFICE_HOME}/${programdir}"
-endif
-
-
-# Set UNO path, necessary to ensure that the cpp examples using the
-# new UNO bootstrap mechanism use the configured office installation.
-if ( ${?OFFICE_PROGRAM_PATH} ) then
- setenv UNO_PATH "${OFFICE_PROGRAM_PATH}"
-endif
-
-if ( "${OO_SDK_URE_HOME}" != "" ) then
- setenv OO_SDK_URE_BIN_DIR "${OO_SDK_URE_HOME}/bin"
- setenv OO_SDK_URE_LIB_DIR "${OO_SDK_URE_HOME}/lib"
- setenv OO_SDK_URE_JAVA_DIR "${OO_SDK_URE_HOME}/share/java"
-else
- setenv OO_SDK_URE_BIN_DIR "${OFFICE_PROGRAM_PATH}"
- setenv OO_SDK_URE_LIB_DIR "${OFFICE_PROGRAM_PATH}"
- setenv OO_SDK_URE_JAVA_DIR "${OFFICE_PROGRAM_PATH}/classes"
-endif
-
-# Set SDK example output directory
-setenv OO_SDK_OUT ${OO_SDK_HOME}
-if ( $?OO_SDK_OUTPUT_DIR ) then
- setenv OO_SDK_OUT ${OO_SDK_OUTPUT_DIR}/${OO_SDK_NAME}
-endif
-
-# check platform and set appropriate variables
-switch (`${OO_SDK_HOME}/config.guess | cut -d"-" -f3,4`)
- case "solaris*":
- if ( `${OO_SDK_HOME}/config.guess | cut -d"-" -f1` == "sparc" ) then
- set directoryname=solsparc
- set platform=Solaris Sparc
- else
- set directoryname=solintel
- set platform=Solaris Intel
- endif
- set comid=C52
- set pltfrm=sunpro
- set soext=so
- set exampleout=SOLARISexample.out
-
- # set LD_LIBRARY_PATH
- if ( $?LD_LIBRARY_PATH == 0) then
- setenv LD_LIBRARY_PATH
${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.
- else
- setenv LD_LIBRARY_PATH
${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
- endif
- breaksw
-
- case "linux-gnu":
- set directoryname=linux
- set comid=gcc3
- set pltfrm=gcc
- set soext=so
- set exampleout=LINUXexample.out
- set platform=Linux
-
- # set LD_LIBRARY_PATH
- if ( $?LD_LIBRARY_PATH == 0) then
- setenv LD_LIBRARY_PATH
${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.
- else
- setenv LD_LIBRARY_PATH
${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
- endif
- breaksw
-
- case "darwin*":
- set directoryname=macosx
- set comid=gcc3
- set pltfrm=gcc
- set soext=dylib
- set exampleout=MACOSXexample.out
- set platform=MacOSX
-
- # set DYLD_LIBRARY_PATH
- if ( $?DYLD_LIBRARY_PATH == 0) then
- setenv DYLD_LIBRARY_PATH
${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.
- else
- setenv DYLD_LIBRARY_PATH
${OO_SDK_OUT}/${directoryname}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${DYLD_LIBRARY_PATH}
- endif
- breaksw
-
- case "freebsd*":
- set directoryname=freebsd
- set comid=gcc3
- set pltfrm=gcc
- set soext=so
- set exampleout=FREEBSDexample.out
- set platform=FreeBSD
-
- # set LD_LIBRARY_PATH
- if ( $?LD_LIBRARY_PATH == 0) then
- setenv LD_LIBRARY_PATH
${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.
- else
- setenv LD_LIBRARY_PATH
${OO_SDK_HOME}/lib:${OO_SDK_OUT}/${exampleout}/lib:${OO_SDK_URE_LIB_DIR}:.:${LD_LIBRARY_PATH}
- endif
-
- if ( -e "/sbin/sysctl" ) then
- set OSVERSION=`/sbin/sysctl -n kern.osreldate`
- else
- set OSVERSION=`/usr/sbin/sysctl -n kern.osreldate`
- endif
-
- if ( ${OSVERSION} < 500016 ) then
- setenv PTHREAD_CFLAGS -D_THREAD_SAFE
- setenv PTHREAD_LIBS -pthread
- else if ( ${OSVERSION} < 502102 ) then
- setenv PTHREAD_CFLAGS -D_THREAD_SAFE
- setenv PTHREAD_LIBS -lc_r
- else
- setenv PTHREAD_LIBS -pthread
- endif
- breaksw
-endsw
-
-# set PATH
-if ( $?PATH == 0) then
- setenv PATH
${OO_SDK_ZIP_HOME}:${OO_SDK_MAKE_HOME}:${OO_SDK_HOME}/bin:${OO_SDK_OUT}/${exampleout}:${OO_SDK_URE_BIN_DIR}:.
-else
- setenv PATH
${OO_SDK_ZIP_HOME}:${OO_SDK_MAKE_HOME}:${OO_SDK_HOME}/bin:${OO_SDK_OUT}/${exampleout}:${OO_SDK_URE_BIN_DIR}:.:${PATH}
-endif
-
-# Set CLASSPATH
-if ( ${?OFFICE_PROGRAM_PATH} ) then
- if ( ${?CLASSPATH} == 0 ) then
- setenv CLASSPATH "${OFFICE_PROGRAM_PATH}/classes/unoil.jar"
- else
- setenv CLASSPATH
"${OFFICE_PROGRAM_PATH}/classes/unoil.jar:${CLASSPATH}"
- endif
-endif
-if ( $?CLASSPATH == 0) then
- setenv CLASSPATH
"${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/jurt.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar"
-else
- setenv CLASSPATH
"${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/jurt.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar:${CLASSPATH}"
-endif
-
-if ( $?OO_SDK_CPP_HOME == 0) then
- setenv PATH ${OO_SDK_CPP_HOME}:${PATH}
-endif
-
-if ( $?OO_SDK_JAVA_HOME == 0) then
- setenv PATH ${OO_SDK_JAVA_HOME}:${PATH}
-endif
-
-
-if ( "${platform}" == "MacOSX" ) then
-# For URE, prepare symbolic links for libraries:
-# Only necessary on MacOSX, on other Unix systems the links are already
prepared
-# in the SDK installation.
-
-# cleanup potential old links first
- rm -f "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.so" \
- "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
\
- "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}" \
- "${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}" \
-
"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
-
- if ( "${OO_SDK_URE_HOME}" != "" ) then
- mkdir -p "${OO_SDK_OUT}/${directoryname}/lib"
- ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppu.${soext}.3" \
- "${OO_SDK_OUT}/${directoryname}/lib/libuno_cppu.${soext}"
- ln -s "${OO_SDK_URE_LIB_DIR}/libuno_cppuhelper${comid}.${soext}.3" \
-
"${OO_SDK_OUT}/${directoryname}/lib/libuno_cppuhelper${comid}.${soext}"
- ln -s "${OO_SDK_URE_LIB_DIR}/libuno_sal.${soext}.3" \
- "${OO_SDK_OUT}/${directoryname}/lib/libuno_sal.${soext}"
- ln -s "${OO_SDK_URE_LIB_DIR}/libuno_salhelper${comid}.${soext}.3" \
-
"${OO_SDK_OUT}/${directoryname}/lib/libuno_salhelper${comid}.${soext}"
- ln -s "${OO_SDK_URE_LIB_DIR}/libuno_purpenvhelper${comid}.${soext}.3" \
-
"${OO_SDK_OUT}/${directoryname}/lib/libuno_purpenvhelper${comid}.${soext}"
- endif
-endif
-
-
-echo
-echo "
************************************************************************"
-echo " *"
-echo " * SDK environment is prepared for ${platform}"
-echo " *"
-echo " * SDK = ${OO_SDK_HOME}"
-echo " * Office = ${OFFICE_HOME}"
-echo " * URE = ${OO_SDK_URE_HOME}"
-echo " * Make = ${OO_SDK_MAKE_HOME}"
-echo " * Zip = ${OO_SDK_ZIP_HOME}"
-if ( $?OO_SDK_CPP_HOME == 0) then
-echo " * C++ Compiler = "
-else
-echo " * C++ Compiler = ${OO_SDK_CPP_HOME}"
-endif
-if ( $?OO_SDK_JAVA_HOME == 0) then
-echo " * Java = "
-else
-echo " * Java = ${OO_SDK_JAVA_HOME}"
-endif
-if ( $?OO_SDK_OUTPUT_DIR == 0) then
-echo " * Special Output directory = "
-else
-echo " * SDK Output directory = ${OO_SDK_OUT}"
-endif
-echo " * Auto deployment = ${SDK_AUTO_DEPLOYMENT}"
-echo " *"
-echo "
************************************************************************"
-
-unset sdkdir
-unset directoryname
-unset comid
-unset exampleout
-unset platform
-
-echo "]2;Shell prepared with the SDK environment"
diff --git a/odk/docs/install.html b/odk/docs/install.html
index 3594ac0..7f44cb1 100644
--- a/odk/docs/install.html
+++ b/odk/docs/install.html
@@ -141,10 +141,10 @@
<td colspan="2">
<p>The SDK provides an implicit configuration mechanism, which
configures the SDK build environment to your personal needs
the first
- time you use the SDK environment. This configuration step
creates one or
- two new setsdkenv_XXX scripts in the user's home
directory:</P>
+ time you use the SDK environment. This configuration step
creates one
+ new setsdkenv_XXX script in the user's home directory:</P>
<ul>
- <li><b>$HOME/$OO_SDK_NAME/setsdkenv_unix.sh</b> and
<b>$HOME/$OO_SDK_NAME/setsdkenv_unix.csh</b> -> for Unix
+
<li><b>$HOME/$OO_SDK_NAME/setsdkenv_unix.sh</b> -> for Unix
<li><b>C:\Documents and Settings\<username>\Application
Data\%OO_SDK_NAME%\setsdkenv_windows.bat</b></a> -> for
Windows2000/XP or later
</ul>
<p>The automatically started configure script (Unix and
Windows2000/XP)
@@ -244,9 +244,8 @@
<p>You must run the <b>setsdkenv_XXX</b> script every time
you want to
use the configured SDK environment. The settings are local
for the current
shell on Windows or the new started shell on UNIX. On UNIX you
- can now source one of the prepared environment
- script files ("setsdkenv_unix.sh" or
- "setsdkenv_unix.csh" dependending on the shell you
use) to prepare
+ can now source the prepared environment
+ script file ("setsdkenv_unix.sh") to prepare
your current shell instead of starting a new shell.</p>
</td>
</tr>
diff --git a/odk/util/check.pl b/odk/util/check.pl
index e138302..5c57cbc 100644
--- a/odk/util/check.pl
+++ b/odk/util/check.pl
@@ -138,10 +138,6 @@ if (-d "$StartDir") {
print "\nERROR: \"$StartDir/setsdkenv_unix.sh.in\" is missing\n";
$return++;
}
- if (! -e "$StartDir/setsdkenv_unix.csh.in") {
- print "\nERROR: \"$StartDir/setsdkenv_unix.csh.in\" is missing\n";
- $return++;
- }
}
print "\n";
commit d0857f0e57fb553b4ecb3b955273486dad002b90
Author: Michael Stahl <mst...@redhat.com>
Date: Wed Apr 10 14:47:34 2013 +0200
odk: fix packaging of WNT import libraries
(regression from 613221bde1744265c336c2b5f2ade0bfb9b22d16)
Change-Id: I32775c27e7d17bfc78562f231a4061630c5b7f1a
diff --git a/odk/CustomTarget_lib.mk b/odk/CustomTarget_lib.mk
index 98ab177..d817835 100644
--- a/odk/CustomTarget_lib.mk
+++ b/odk/CustomTarget_lib.mk
@@ -10,9 +10,10 @@
$(eval $(call gb_CustomTarget_CustomTarget,odk/odkcommon/lib))
define odk_lib
-odkcommon_ZIPLIST += lib/$(1)
-$(call gb_CustomTarget_get_target,odk/odkcommon/lib): $(odk_WORKDIR)/lib/$(1)
-$(odk_WORKDIR)/lib/$(1): $(call gb_Library_get_target,$(1))
+odkcommon_ZIPLIST += lib/$(notdir $(1))
+$(call gb_CustomTarget_get_target,odk/odkcommon/lib) : \
+ $(odk_WORKDIR)/lib/$(notdir $(1))
+$(odk_WORKDIR)/lib/$(notdir $(1)) : $(1)
mkdir -p $$(dir $$@)
$$(call gb_Output_announce,$$(subst $$(WORKDIR)/,,$$@),build,CPY,1)
cp $$< $$@
@@ -27,7 +28,7 @@ odk_LIBLIST := store \
cppuhelper \
purpenvhelper
-$(foreach lib,$(odk_LIBLIST),$(eval $(call odk_lib,$(lib))))
+$(foreach lib,$(odk_LIBLIST),$(eval $(call odk_lib,$(call
gb_Library_get_target,$(lib)))))
else ifeq ($(OS),LINUX)
odkcommon_ZIPLIST += lib/libsalcpprt.a
$(eval $(call gb_CustomTarget_register_target,odk/odkcommon/lib,libsalcpprt.a))
commit 164cf38321c63a03ec7acd9b4d5fef84404e1fd7
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Apr 9 23:05:15 2013 +0200
add explicit template instantiations to appease Apple llvm-g++ 4.2.1
Without these linking fails with unresolved auto_ptr<
formula::FormulaTokenArray> symbols which is clearly a compiler bug.
Change-Id: I14faf8e318522f913370ac186b5114ae5db997ad
diff --git a/reportdesign/source/ui/dlg/Formula.cxx
b/reportdesign/source/ui/dlg/Formula.cxx
index abbed45..cd92312 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -258,9 +258,13 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
pArray->Fill(_aTokenList, NULL);
return pArray;
}
-SAL_WNODEPRECATED_DECLARATIONS_POP
-//
=============================================================================
+
} // rptui
-//
=============================================================================
+
+// for mysterious reasons Apple llvm-g++ 4.2.1 needs these explicit
+// template instantiations; otherwise linking fails with unresolved symbols
+template class ::std::auto_ptr<formula::FormulaTokenArray>;
+template std::auto_ptr<formula::FormulaTokenArray>::operator
std::auto_ptr_ref<formula::FormulaTokenArray>();
+SAL_WNODEPRECATED_DECLARATIONS_POP
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/formdlg/formula.cxx b/sc/source/ui/formdlg/formula.cxx
index 55897bf..84413a5 100644
--- a/sc/source/ui/formdlg/formula.cxx
+++ b/sc/source/ui/formdlg/formula.cxx
@@ -659,6 +659,10 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
pArray->Fill( _aTokenList, pDoc->GetExternalRefManager());
return pArray;
}
+// for mysterious reasons Apple llvm-g++ 4.2.1 needs these explicit
+// template instantiations; otherwise linking fails with unresolved symbols
+template class ::std::auto_ptr<formula::FormulaTokenArray>;
+template std::auto_ptr<formula::FormulaTokenArray>::operator
std::auto_ptr_ref<formula::FormulaTokenArray>();
SAL_WNODEPRECATED_DECLARATIONS_POP
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit e816271818c0d08a92d0d7fe37b58556e4724092
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Apr 9 20:11:49 2013 +0200
connectivty: postgres: fix a bunch of empty for body warnings
Change-Id: Idd91616e43842142450c94ac8a61f4f29f4eb1b7
diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx
b/connectivity/source/drivers/postgresql/pq_tools.cxx
index cf65066..5ac5626 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -438,28 +438,28 @@ OUString extractTableFromInsert( const OUString & sql )
{
OUString ret;
int i = 0;
- for( ; i < sql.getLength() && isWhitespace(sql[i]) ; i++ );
+ while (i < sql.getLength() && isWhitespace(sql[i])) { i++; }
if( 0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength(
&sql.getStr()[i], sql.getLength() - i, "insert" , 6 ) )
{
i += 6;
- for( ; i < sql.getLength() && isWhitespace(sql[i]) ; i++ );
+ while (i < sql.getLength() && isWhitespace(sql[i])) { i++; }
if( 0 == rtl_ustr_ascii_shortenedCompareIgnoreAsciiCase_WithLength(
&sql.getStr()[i], sql.getLength() - i, "into" , 4 ) )
{
i +=4;
- for( ; i < sql.getLength() && isWhitespace(sql[i]) ; i++ );
+ while (i < sql.getLength() && isWhitespace(sql[i])) { i++; }
int start = i;
bool quote = (sql[i] == '"');
for( i++ ; i < sql.getLength() ; i ++ )
{
if( quote && sql[i] == '"' )
{
- for( i++ ; i < sql.getLength() && isWhitespace(sql[i]) ;
i++ );
+ while (i < sql.getLength() && isWhitespace(sql[i])) { i++;
}
if( '.' == sql[i] )
{
- for( i++ ; i < sql.getLength() && isWhitespace(sql[i])
; i++ );
+ while (i < sql.getLength() && isWhitespace(sql[i])) {
i++; }
if( '"' == sql[i] )
{
// the second part of the table name does not use
quotes
commit 5e7c0378c21a1a06eefecec4b29b4ae5f9ae4707
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Apr 9 20:11:21 2013 +0200
slideshow: that define causes -Wunused-macros with 10.6 SDK too
So since that is the new baseline let's get rid of it.
Change-Id: I20e921afca5e66f22d5403f383fb9fd5f0591142
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
index d2421a3..70417c7 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionerImpl.mm
@@ -28,9 +28,6 @@
#include "sal/config.h"
-#if MACOSX_SDK_VERSION < 1070
-#define GLX_GLXEXT_PROTOTYPES 1
-#endif
#include "OGLTrans_TransitionImpl.hxx"
#include <com/sun/star/beans/XFastPropertySet.hpp>
commit 6df71b906e201aaed49d5659dc6b42ebe80eb9f0
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Apr 9 16:36:51 2013 +0200
sal: that TimeValue define causes -Wunused-macros with 10.6 SDK too
So since that is the new baseline let's get rid of it.
Change-Id: I7b645fe2f6e641012919a87b63d5e14acce9e52b
diff --git a/sal/osl/unx/file.cxx b/sal/osl/unx/file.cxx
index bffca6d..7a991e8 100644
--- a/sal/osl/unx/file.cxx
+++ b/sal/osl/unx/file.cxx
@@ -43,13 +43,7 @@
#define HAVE_O_EXLOCK
// add MACOSX Time Value
-#if MACOSX_SDK_VERSION < 1070
-#define TimeValue CFTimeValue
-#endif
#include <CoreFoundation/CoreFoundation.h>
-#if MACOSX_SDK_VERSION < 1070
-#undef TimeValue
-#endif
#endif /* MACOSX */
commit 01df12e60f76a052dd936a24215f8fbe4876a8a9
Author: Michael Stahl <mst...@redhat.com>
Date: Tue Apr 9 12:33:46 2013 +0200
RepositoryFixes: clean up WNT import libraries
The internal ones are all obsolete crutches for dmake.
Change-Id: I207db3e9106532e0c3fce873d0e2f9f40b22416f
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index 56a4f31..0479b92 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -71,14 +71,6 @@ gb_Library_DLLFILENAMES := $(patsubst
rdf:rdf%,rdf:librdf%,$(gb_Library_DLLFILEN
# libpyuno_wrapper.dll => pyuno.pyd
gb_Library_DLLFILENAMES := $(patsubst
pyuno:pyuno.dll,pyuno:pyuno.pyd,$(gb_Library_DLLFILENAMES))
-gb_Library_FILENAMES := $(patsubst sb:isb%,sb:basic%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst sfx:isfx%,sfx:sfx%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
svt:isvt%,svt:svtool%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst tl:itl%,tl:itools%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
vbahelper:ivbahelper%,vbahelper:vbahelper%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
curl:icurl%,curl:libcurl%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
npsoplugin:inpsoplugin%,npsoplugin:npsoplugin%,$(gb_Library_FILENAMES))
-
gb_StaticLibrary_FILENAMES := $(patsubst
png:png%,png:libpng%,$(gb_StaticLibrary_FILENAMES))
gb_StaticLibrary_FILENAMES := $(patsubst
salcpprt:salcpprt%,salcpprt:cpprtl%,$(gb_StaticLibrary_FILENAMES))
@@ -107,22 +99,14 @@ gb_Library_DLLFILENAMES := $(patsubst
ssl:ssl%,ssl:ssleay32%,$(gb_Library_DLLFIL
else # $(COM) != GCC
-gb_Library_FILENAMES := $(patsubst
comphelper:icomphelper%,comphelper:icomphelp%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
cppunit:icppunit%,cppunit:icppunit_dll%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
crypto:icrypto%,crypto:libeay32%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
crypto:libcrypto%,crypto:libcrypto_static%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
db47:idb47%,db47:libdb47%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
exslt:iexslt%,exslt:libexslt%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
lpsolve55:ilpsolve55%,lpsolve55:lpsolve55%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
package2:ipackage2%,package2:ipackage%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
rdf:irdf%,rdf:librdf%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
ssl:issl%,ssl:ssleay32%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
ssl:libssl%,ssl:libssl_static%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
xml2:ixml2%,xml2:libxml2%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
xmlsec1:ixmlsec1%,xmlsec1:libxmlsec%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
xmlsec1-mscrypto:ixmlsec1-mscrypto%,xmlsec1-mscrypto:libxmlsec-mscrypto%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst
xmlsec1-nss:ixmlsec1-nss%,xmlsec1-nss:libxmlsec-nss%,$(gb_Library_FILENAMES))
-gb_Library_FILENAMES := $(patsubst
xslt:ixslt%,xslt:libxslt%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst z:z%,z:zlib%,$(gb_Library_FILENAMES))
@@ -131,15 +115,28 @@ gb_Library_NOILIBFILENAMES := \
icudt icuin icule icuuc \
langtag \
lcms2 \
+ lpsolve55 \
xpcom \
xpcom_core \
nspr4 \
nss3 \
smime3 \
- uwinapi \
-gb_Library_FILENAMES := $(filter-out $(foreach
lib,$(gb_Library_NOILIBFILENAMES),$(lib):%),$(gb_Library_FILENAMES))
-gb_Library_FILENAMES += $(foreach
lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT))
+# these have prefix "lib" instead of "i"
+gb_Library_LIBLIBFILENAMES := \
+ curl \
+ exslt \
+ rdf \
+ xml2 \
+ xslt \
+
+gb_Library_FILENAMES := \
+ $(filter-out $(foreach lib,$(gb_Library_NOILIBFILENAMES),$(lib):%) \
+ $(foreach
lib,$(gb_Library_LIBLIBFILENAMES),$(lib):%) \
+ ,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES += \
+ $(foreach
lib,$(gb_Library_NOILIBFILENAMES),$(lib):$(lib)$(gb_Library_PLAINEXT)) \
+ $(foreach
lib,$(gb_Library_LIBLIBFILENAMES),$(lib):lib$(lib)$(gb_Library_PLAINEXT))
endif # ifeq ($(COM),GCC)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
