[Libreoffice-commits] core.git: 8 commits - configure.ac instsetoo_native/CustomTarget_setup.mk jurt/com RepositoryFixes.mk scp2/source solenv/gbuild ure/Package_install.mk ure/source
Tor Lillqvist
tml at collabora.com
Sun Aug 10 00:09:32 PDT 2014
RepositoryFixes.mk | 2 +
configure.ac | 5 ++--
instsetoo_native/CustomTarget_setup.mk | 4 +--
jurt/com/sun/star/lib/util/NativeLibraryLoader.java | 10 ++++++++
scp2/source/ooo/common_brand.scp | 4 +--
solenv/gbuild/CppunitTest.mk | 2 -
ure/Package_install.mk | 4 ---
ure/source/unorc | 23 --------------------
ure/source/unorc.in | 23 ++++++++++++++++++++
9 files changed, 44 insertions(+), 33 deletions(-)
New commits:
commit 4625227ed8db6b738f47f193df48d2791fb25246
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Aug 8 17:47:38 2014 +0300
Seems to work now
Change-Id: I59402e2f0503369370cc87017e0c8e01541ccfa0
diff --git a/configure.ac b/configure.ac
index 898bb53..a390444 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1351,7 +1351,7 @@ AC_ARG_ENABLE(macosx-sandbox,
AC_ARG_ENABLE(canonical-installation-tree-structure,
AS_HELP_STRING([--enable-canonical-installation-tree-structure],
[Make the installation tree structure be more canonical for
- the platform. Implemented only for OS X. Experimental and currently broken.]),
+ the platform. Implemented only for OS X. Experimental.]),
,)
commit 59622dabdec080c2a720a17987dceba2c03afe90
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Aug 8 11:28:49 2014 +0300
javaldx is not built for WNT or MACOSX so no point in the uno wrapper script
Change-Id: I127205ebf6fb3fe01de6803a989e970f46df22bb
diff --git a/RepositoryFixes.mk b/RepositoryFixes.mk
index cc37c50..6023b04 100644
--- a/RepositoryFixes.mk
+++ b/RepositoryFixes.mk
@@ -22,7 +22,9 @@
gb_Executable_FILENAMES := $(foreach group,$(gb_Executable_VALIDGROUPS),\
$(foreach exe,$(gb_Executable_$(group)),$(exe):$(exe)$(gb_Executable_EXT)))
+ifneq (,$(filter-out MACOSX WNT,$(OS)))
gb_Executable_FILENAMES := $(patsubst uno:uno,uno:uno.bin,$(gb_Executable_FILENAMES))
+endif
gb_Executable_FILENAMES := $(patsubst unopkg_bin:unopkg_bin%,unopkg_bin:unopkg.bin,$(gb_Executable_FILENAMES))
gb_Executable_FILENAMES := $(patsubst unopkg_com:unopkg_com%,unopkg_com:unopkg.com,$(gb_Executable_FILENAMES))
gb_Executable_FILENAMES := $(patsubst crashrep_com:crashrep_com%,crashrep_com:crashrep.com,$(gb_Executable_FILENAMES))
diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index 44b5d7c..19f5492 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -9,7 +9,7 @@
$(eval $(call gb_Package_Package,ure_install,$(SRCDIR)/ure/source))
-ifneq (WNT,$(OS))
+ifneq (,$(filter-out MACOSX WNT,$(OS)))
$(eval $(call gb_Package_add_file,ure_install,$(LIBO_URE_BIN_FOLDER)/startup.sh,startup.sh))
$(eval $(call gb_Package_add_symbolic_link,ure_install,$(LIBO_URE_BIN_FOLDER)/uno,startup.sh))
endif
commit 5e5aa9b08a39530b0b117141f0f65d1dc2dad84e
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Aug 8 00:33:26 2014 +0300
Use LIBO_URE_BIN_FOLDER and LIBO_SHARE_JAVA_FOLDER
Needed in case of --enable-canonical-installation-tree-structure.
Change-Id: I965ebd9b89e1b9f7bb6534e3c25d29d3b470acf4
diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk
index 0270ec8..48c264b 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -60,12 +60,12 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'UNO_SHARED_PACKAGES_CACHE=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):UNO_SHARED_PACKAGES_CACHE}' \
&& echo 'TMP_EXTENSIONS=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):TMP_EXTENSIONS}' \
&& echo 'UNO_USER_PACKAGES_CACHE=$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):UNO_USER_PACKAGES_CACHE}' \
- && echo 'URE_BIN_DIR=$(if $(filter WNT,$(OS)),$${.link:$${BRAND_BASE_DIR}/ure-link}/bin,$${BRAND_BASE_DIR}/ure-link/bin)' \
+ && echo 'URE_BIN_DIR=$(if $(filter WNT,$(OS)),$${.link:$${BRAND_BASE_DIR}/ure-link}/bin,$${BRAND_BASE_DIR}/$(LIBO_URE_BIN_FOLDER))' \
&& echo 'URE_MORE_JAVA_CLASSPATH_URLS=$(if $(SYSTEM_HSQLDB),$(HSQLDB_JAR))' \
&& echo 'URE_OVERRIDE_JAVA_JFW_SHARED_DATA=$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/config/javasettings_$${_OS}_$${_ARCH}.xml' \
&& echo 'URE_OVERRIDE_JAVA_JFW_USER_DATA=$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/config/javasettings_$${_OS}_$${_ARCH}.xml' \
&& echo 'URE_LIB_DIR=$(if $(filter WNT,$(OS)),$${.link:$${BRAND_BASE_DIR}/ure-link}/bin,$${BRAND_BASE_DIR}/ure-link/lib)' \
- && echo 'URE_MORE_JAVA_TYPES=$$ORIGIN/classes/unoil.jar $$ORIGIN/classes/ScriptFramework.jar $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}' \
+ && echo 'URE_MORE_JAVA_TYPES=$${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)/unoil.jar $${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)/ScriptFramework.jar $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}' \
&& echo 'URE_MORE_SERVICES=$${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_UserUnoFile}:UNO_SERVICES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_SharedUnoFile}:UNO_SERVICES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_BundledUnoFile}:UNO_SERVICES} <$$ORIGIN/services>*' \
&& echo 'URE_MORE_TYPES=<$$ORIGIN/types>* $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_UserUnoFile}:UNO_TYPES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_SharedUnoFile}:UNO_TYPES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,uno):PKG_BundledUnoFile}:UNO_TYPES}' \
) > $@
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 323289d..562cad7 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1185,7 +1185,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types
ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap";
Key = "URE_MORE_JAVA_TYPES";
- Value = "$ORIGIN/classes/unoil.jar $ORIGIN/classes/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}";
+ Value = "${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/unoil.jar ${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER "/ScriptFramework.jar ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}";
End
ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_Shared_Data
@@ -1223,7 +1223,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Bin_Dir
#if defined WNT
Value = "${.link:${BRAND_BASE_DIR}/ure-link}/bin";
#else
- Value = "${BRAND_BASE_DIR}/ure-link/bin";
+ Value = "${BRAND_BASE_DIR}/" LIBO_URE_BIN_FOLDER;
#endif
End
commit b6869717a389d65bd50e8096d033a689d9298e84
Author: Tor Lillqvist <tml at collabora.com>
Date: Fri Aug 8 00:31:29 2014 +0300
Fixes for the --enable-canonical-installation-tree-structure case
Do install the uno and startup.sh commands, smoketest needs them
Change-Id: Ia530564e4b664881d730355a80e2af4476987e10
diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index 94156b8..44b5d7c 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -10,11 +10,9 @@
$(eval $(call gb_Package_Package,ure_install,$(SRCDIR)/ure/source))
ifneq (WNT,$(OS))
-ifeq ($(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),)
$(eval $(call gb_Package_add_file,ure_install,$(LIBO_URE_BIN_FOLDER)/startup.sh,startup.sh))
$(eval $(call gb_Package_add_symbolic_link,ure_install,$(LIBO_URE_BIN_FOLDER)/uno,startup.sh))
endif
-endif
ifeq (MACOSX,$(OS))
ifeq ($(ENABLE_MACOSX_MACLIKE_APP_STRUCTURE),)
commit 6ac523554213f11838443de0cd9b62415f5d2ffd
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Aug 7 23:26:10 2014 +0300
Make this work better in the ENABLE_MACOSX_MACLIKE_APP_STRUCTURE case
In that case the dylibs won't be in the parent directory of where the
jars are (Resources), but in Frameworks.
Change-Id: I628d828ca820d07724947050f54f9f5f9148e159
diff --git a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java b/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
index c6c4c01..50b1f05 100644
--- a/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
+++ b/jurt/com/sun/star/lib/util/NativeLibraryLoader.java
@@ -106,6 +106,16 @@ public final class NativeLibraryLoader {
if (path.exists()) {
return path;
}
+ // In case of ENABLE_MACOSX_MACLIKE_APP_STRUCTURE,
+ // dir is now the Resources dir, we want to look in Frameworks
+ if (System.getProperty("os.name").startsWith("Mac")
+ && dir.getName().equals("Resources")) {
+ dir = dir.getParentFile();
+ path = new File(dir, "Frameworks/" + name);
+ if (path.exists()) {
+ return path;
+ }
+ }
}
}
}
commit e24d3ff2cd9e2da4c81105d2e9dbee6187fac55f
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Aug 7 21:41:41 2014 +0300
Use @LIBO_URE_LIB_FOLDER@ for URE_INTERNAL_LIB_DIR
In the --enable-canonical-installation-tree-structure case (on OS X),
the URE unorc is definitely not in the same place as any libs. Noticed
in JunitTest_comphelper_complex.
Change-Id: Ic6097021f9abc081e2a7c7aac25286ad2c4b75e5
diff --git a/ure/source/unorc.in b/ure/source/unorc.in
index 29f3ded..bc0ecbe 100644
--- a/ure/source/unorc.in
+++ b/ure/source/unorc.in
@@ -16,7 +16,7 @@
# the License at http://www.apache.org/licenses/LICENSE-2.0 .
#
[Bootstrap]
-URE_INTERNAL_LIB_DIR=${ORIGIN}
+URE_INTERNAL_LIB_DIR=${BRAND_BASE_DIR}/@LIBO_URE_LIB_FOLDER@
URE_INTERNAL_JAVA_DIR=${BRAND_BASE_DIR}/@LIBO_URE_SHARE_JAVA_FOLDER@
URE_INTERNAL_JAVA_CLASSPATH=${URE_MORE_JAVA_TYPES}
UNO_TYPES=${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES}
commit d83f28a2505923a4f01237f7587bf8ede57d0bed
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Aug 7 21:08:15 2014 +0300
Use @LIBO_URE_SHARE_JAVA_FOLDER@ instead of hardcoding ../share/java
Makes CppunitTest_dbaccess_hsqldb_test work also in the
--enable-canonical-installation-tree-structure (on OS X), otherwise
the use of $URE_INTERNAL_JAVA_CLASSPATH (looked up from the URE unorc)
in stoc/source/javavm/javavm.cxx fails.
Change-Id: I5ea045594c32e6a1398b73cff1e4aa8bbe1aa265
diff --git a/configure.ac b/configure.ac
index dcf3b69..898bb53 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13053,7 +13053,8 @@ AC_CONFIG_FILES([config_host.mk
lo.xcent
instsetoo_native/util/openoffice.lst
sysui/desktop/macosx/Info.plist
- ios/lo.xcconfig])
+ ios/lo.xcconfig
+ ure/source/unorc])
AC_CONFIG_HEADERS([config_host/config_buildid.h])
AC_CONFIG_HEADERS([config_host/config_clang.h])
AC_CONFIG_HEADERS([config_host/config_eot.h])
diff --git a/ure/source/unorc b/ure/source/unorc.in
similarity index 93%
rename from ure/source/unorc
rename to ure/source/unorc.in
index 1efbfe2..29f3ded 100644
--- a/ure/source/unorc
+++ b/ure/source/unorc.in
@@ -17,7 +17,7 @@
#
[Bootstrap]
URE_INTERNAL_LIB_DIR=${ORIGIN}
-URE_INTERNAL_JAVA_DIR=${ORIGIN}/../share/java
+URE_INTERNAL_JAVA_DIR=${BRAND_BASE_DIR}/@LIBO_URE_SHARE_JAVA_FOLDER@
URE_INTERNAL_JAVA_CLASSPATH=${URE_MORE_JAVA_TYPES}
UNO_TYPES=${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES}
UNO_SERVICES=${ORIGIN}/../share/misc/services.rdb ${URE_MORE_SERVICES}
commit 3369185bddc4ece889381511055917e58a42a837
Author: Tor Lillqvist <tml at collabora.com>
Date: Thu Aug 7 17:47:25 2014 +0300
Use $(LIBO_SHARE_FOLDER) instead of hardcoded "share"
Change-Id: Ic97e51efaa280c64764b1c5f38c3b87af82a422b
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index a59c2a4..4599dae 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -43,7 +43,7 @@ gb_CppunitTest_CPPTESTCOMMAND := $(call gb_Executable_get_target_for_build,cppun
define gb_CppunitTest__make_args
$(HEADLESS) \
"-env:BRAND_BASE_DIR=$(call gb_Helper_make_url,$(INSTROOT))" \
-"-env:BRAND_SHARE_SUBDIR=share" \
+"-env:BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)" \
"-env:UserInstallation=$(call gb_Helper_make_url,$(call gb_CppunitTest_get_target,$*).user)" \
$(if $(URE),\
$(if $(strip $(CONFIGURATION_LAYERS)),\
More information about the Libreoffice-commits
mailing list