.gitignore | 1
Makefile.in | 2
configure.ac | 6 +
instsetoo_native/CustomTarget_setup.mk | 4 -
officecfg/registry/data/org/openoffice/Office/Paths.xcu | 2
officecfg/registry/schema/org/openoffice/Office/Common.xcs | 4 -
officecfg/util/alllang.xsl | 52 +++++++++++--
officecfg/util/schema_trim.xsl | 44 ++++++++++-
sal/Library_sal.mk | 1
scp2/source/ooo/common_brand.scp | 4 -
solenv/gbuild/Configuration.mk | 4 +
solenv/gbuild/HelpTarget.mk | 2
ure/Module_ure.mk | 1
ure/Package_builddir_install.mk | 16 ++++
ure/Package_install.mk | 2
ure/source/unorc | 23 -----
ure/source/unorc.in | 23 +++++
17 files changed, 147 insertions(+), 44 deletions(-)
New commits:
commit bcab47543f908edbc86d119a88f209c5ac21ba19
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Sep 12 12:09:17 2014 +0300
Handle LIBO_SHARE_HELP_FOLDER
Change-Id: I4f004321c58da1d81a2cc3c80504347db583d86a
diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
index 05f8e0b..9edc6b4 100644
--- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu
@@ -98,7 +98,7 @@
</node>
<node oor:name="Help" oor:op="fuse" oor:mandatory="true">
<node oor:name="InternalPaths">
- <node oor:name="$(instpath)/help" oor:op="fuse"/>
+ <node oor:name="$(instpath)/@LIBO_SHARE_HELP_FOLDER@" oor:op="fuse"/>
</node>
</node>
<node oor:name="Linguistic" oor:op="fuse" oor:mandatory="true">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index 33c0329..bace846 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1613,7 +1613,7 @@
<info>
<desc>Specifies the path to the Office help files.</desc>
</info>
- <value>$(instpath)/help</value>
+ <value>$(instpath)/@LIBO_SHARE_HELP_FOLDER@</value>
</prop>
<prop oor:name="Linguistic" oor:type="xs:string" oor:nillable="false">
<info>
@@ -1808,7 +1808,7 @@
<desc>Specifies the default directory where Office help files are
located.</desc>
</info>
- <value>$(instpath)/help</value>
+ <value>$(instpath)/@LIBO_SHARE_HELP_FOLDER@</value>
</prop>
<prop oor:name="Linguistic" oor:type="xs:string" oor:nillable="false">
<info>
diff --git a/officecfg/util/alllang.xsl b/officecfg/util/alllang.xsl
index 31b53bc..f5d9ae1 100644
--- a/officecfg/util/alllang.xsl
+++ b/officecfg/util/alllang.xsl
@@ -35,6 +35,7 @@
<xsl:param name="fallback-locale">en-US</xsl:param>
<xsl:param name="LIBO_SHARE_FOLDER"/>
+<xsl:param name="LIBO_SHARE_HELP_FOLDER"/>
<xsl:variable name="schemaRootURL">
<xsl:value-of select="$schemaRoot"/>
@@ -341,19 +342,23 @@
<xsl:template match="@oor:name">
<xsl:attribute name="oor:name">
- <xsl:call-template name="replace">
+ <xsl:call-template name="replacetwo">
<xsl:with-param name="input" select="current()"/>
- <xsl:with-param name="pattern" select="'@LIBO_SHARE_FOLDER@'"/>
- <xsl:with-param name="replace" select="$LIBO_SHARE_FOLDER"/>
+ <xsl:with-param name="pattern1" select="'@LIBO_SHARE_FOLDER@'"/>
+ <xsl:with-param name="replace1" select="$LIBO_SHARE_FOLDER"/>
+ <xsl:with-param name="pattern2"
select="'@LIBO_SHARE_HELP_FOLDER@'"/>
+ <xsl:with-param name="replace2"
select="$LIBO_SHARE_HELP_FOLDER"/>
</xsl:call-template>
</xsl:attribute>
</xsl:template>
<xsl:template match="text()">
- <xsl:call-template name="replace">
+ <xsl:call-template name="replacetwo">
<xsl:with-param name="input" select="current()"/>
- <xsl:with-param name="pattern" select="'@LIBO_SHARE_FOLDER@'"/>
- <xsl:with-param name="replace" select="$LIBO_SHARE_FOLDER"/>
+ <xsl:with-param name="pattern1" select="'@LIBO_SHARE_FOLDER@'"/>
+ <xsl:with-param name="replace1" select="$LIBO_SHARE_FOLDER"/>
+ <xsl:with-param name="pattern2"
select="'@LIBO_SHARE_HELP_FOLDER@'"/>
+ <xsl:with-param name="replace2" select="$LIBO_SHARE_HELP_FOLDER"/>
</xsl:call-template>
</xsl:template>
@@ -378,4 +383,39 @@
</xsl:choose>
</xsl:template>
+ <xsl:template name="replacetwo">
+ <xsl:param name="input"/>
+ <xsl:param name="pattern1"/>
+ <xsl:param name="replace1"/>
+ <xsl:param name="pattern2"/>
+ <xsl:param name="replace2"/>
+ <xsl:choose>
+ <xsl:when test="contains($input, $pattern1)">
+ <xsl:call-template name="replace">
+ <xsl:with-param
+ name="input" select="substring-before($input, $pattern1)"/>
+ <xsl:with-param name="pattern" select="$pattern2"/>
+ <xsl:with-param name="replace" select="$replace2"/>
+ </xsl:call-template>
+ <xsl:value-of select="$replace1"/>
+ <xsl:call-template name="replacetwo">
+ <xsl:with-param
+ name="input" select="substring-after($input, $pattern1)"/>
+ <xsl:with-param name="pattern1" select="$pattern1"/>
+ <xsl:with-param name="replace1" select="$replace1"/>
+ <xsl:with-param name="pattern2" select="$pattern2"/>
+ <xsl:with-param name="replace2" select="$replace2"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="replace">
+ <xsl:with-param
+ name="input" select="$input"/>
+ <xsl:with-param name="pattern" select="$pattern2"/>
+ <xsl:with-param name="replace" select="$replace2"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
</xsl:transform>
diff --git a/officecfg/util/schema_trim.xsl b/officecfg/util/schema_trim.xsl
index 79b3c5c..4ebac1c 100644
--- a/officecfg/util/schema_trim.xsl
+++ b/officecfg/util/schema_trim.xsl
@@ -24,6 +24,7 @@
version="1.0">
<xsl:param name="LIBO_SHARE_FOLDER"/>
+ <xsl:param name="LIBO_SHARE_HELP_FOLDER"/>
<!-- Get the correct format -->
<xsl:output method="xml" indent="yes"/>
@@ -81,10 +82,12 @@
</xsl:template>
<xsl:template match="text()">
- <xsl:call-template name="replace">
+ <xsl:call-template name="replacetwo">
<xsl:with-param name="input" select="current()"/>
- <xsl:with-param name="pattern" select="'@LIBO_SHARE_FOLDER@'"/>
- <xsl:with-param name="replace" select="$LIBO_SHARE_FOLDER"/>
+ <xsl:with-param name="pattern1" select="'@LIBO_SHARE_FOLDER@'"/>
+ <xsl:with-param name="replace1" select="$LIBO_SHARE_FOLDER"/>
+ <xsl:with-param name="pattern2"
select="'@LIBO_SHARE_HELP_FOLDER@'"/>
+ <xsl:with-param name="replace2" select="$LIBO_SHARE_HELP_FOLDER"/>
</xsl:call-template>
</xsl:template>
@@ -109,4 +112,39 @@
</xsl:choose>
</xsl:template>
+ <xsl:template name="replacetwo">
+ <xsl:param name="input"/>
+ <xsl:param name="pattern1"/>
+ <xsl:param name="replace1"/>
+ <xsl:param name="pattern2"/>
+ <xsl:param name="replace2"/>
+ <xsl:choose>
+ <xsl:when test="contains($input, $pattern1)">
+ <xsl:call-template name="replace">
+ <xsl:with-param
+ name="input" select="substring-before($input, $pattern1)"/>
+ <xsl:with-param name="pattern" select="$pattern2"/>
+ <xsl:with-param name="replace" select="$replace2"/>
+ </xsl:call-template>
+ <xsl:value-of select="$replace1"/>
+ <xsl:call-template name="replacetwo">
+ <xsl:with-param
+ name="input" select="substring-after($input, $pattern1)"/>
+ <xsl:with-param name="pattern1" select="$pattern1"/>
+ <xsl:with-param name="replace1" select="$replace1"/>
+ <xsl:with-param name="pattern2" select="$pattern2"/>
+ <xsl:with-param name="replace2" select="$replace2"/>
+ </xsl:call-template>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="replace">
+ <xsl:with-param
+ name="input" select="$input"/>
+ <xsl:with-param name="pattern" select="$pattern2"/>
+ <xsl:with-param name="replace" select="$replace2"/>
+ </xsl:call-template>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
</xsl:transform>
diff --git a/solenv/gbuild/Configuration.mk b/solenv/gbuild/Configuration.mk
index 06aa8a1..e5b8a9a 100644
--- a/solenv/gbuild/Configuration.mk
+++ b/solenv/gbuild/Configuration.mk
@@ -85,6 +85,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(gb_Configuration_XSLTCOMMAND) --nonet \
-o $(1) \
--stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \
+ --stringparam LIBO_SHARE_HELP_FOLDER $(LIBO_SHARE_HELP_FOLDER) \
$(gb_XcsTarget_XSLT_SchemaTrim) \
$(3))
endef
@@ -122,6 +123,7 @@ $(call gb_Helper_abbreviate_dirs,\
--stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE))
\
$(gb_Configuration__stringparam_schemaRoot) \
--stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \
+ --stringparam LIBO_SHARE_HELP_FOLDER $(LIBO_SHARE_HELP_FOLDER) \
--path $(SRCDIR)/officecfg/registry \
$(gb_XcuTarget_XSLT_AllLang) \
$(3))
@@ -158,6 +160,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(gb_Configuration__stringparam_schemaRoot) \
--stringparam module $(notdir $(subst -,/,$(basename $(notdir
$(2))))) \
--stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \
+ --stringparam LIBO_SHARE_HELP_FOLDER $(LIBO_SHARE_HELP_FOLDER) \
$(gb_XcuTarget_XSLT_AllLang) \
$(3))
endef
@@ -255,6 +258,7 @@ $(call gb_Helper_abbreviate_dirs,\
$(gb_Configuration__stringparam_schemaRoot) \
--stringparam locale $(word 2,$(subst /, ,$(2))) \
--stringparam LIBO_SHARE_FOLDER $(LIBO_SHARE_FOLDER) \
+ --stringparam LIBO_SHARE_HELP_FOLDER $(LIBO_SHARE_HELP_FOLDER) \
--path $(SRCDIR)/officecfg/registry \
$(gb_XcuTarget_XSLT_AllLang) \
$(3))
diff --git a/solenv/gbuild/HelpTarget.mk b/solenv/gbuild/HelpTarget.mk
index 142f00e..a541a47 100644
--- a/solenv/gbuild/HelpTarget.mk
+++ b/solenv/gbuild/HelpTarget.mk
@@ -656,7 +656,7 @@ endef
# gb_HelpTarget__add_file target file
define gb_HelpTarget__add_file
-$(call gb_Package_add_file,$(call
gb_HelpTarget_get_packagename,$(1)),help/$(call
gb_HelpTarget__get_lang,$(1))/$(2),$(2))
+$(call gb_Package_add_file,$(call
gb_HelpTarget_get_packagename,$(1)),$(LIBO_SHARE_HELP_FOLDER)/$(call
gb_HelpTarget__get_lang,$(1))/$(2),$(2))
endef
commit edcbe70b4daf352976b5393148e34d199c8e08b8
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Sep 12 00:41:53 2014 +0300
Typo
Change-Id: I0a7d2f89fc8a01c128c65fc8708d98205072f2eb
diff --git a/Makefile.in b/Makefile.in
index c688bbf..91d3d01 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -291,7 +291,7 @@ ifeq ($(OS_FOR_BUILD),WNT)
else
@ooinstall $(TESTINSTALLDIR)
ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
- @macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELASE_BUILD),,Dev).app
+ @macosx-codesign-app-bundle $(TESTINSTALLDIR)/LibreOffice$(if
$(ENABLE_RELEASE_BUILD),,Dev).app
endif
endif
@$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR))
commit ae968b7a731e988d403507e87665d86d5d335438
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Aug 11 18:31:36 2014 +0300
Add ure/source/unorc
Change-Id: I9439a00d2186696a4891e5eefad066d50917f9c7
diff --git a/.gitignore b/.gitignore
index 0de9054..f1f6db6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -43,6 +43,7 @@
/config_build.mk
/configure
/lo.xcent
+/ure/source/unorc
/Makefile
/NEWS
/TODO
commit c35f923e1902de3beddfbcac3d4787e8e6f6d824
Author: Tor Lillqvist <t...@collabora.com>
Date: Mon Aug 11 08:10:38 2014 +0300
"fixes" needed because ure/source/unorc is now expanded at configure time
Argh, this is getting even uglier.
We cheerfully ignore for now the theoretical possibility that the URE
unorc used by build-time tools (i.e. the configure-expanded
ure/source/unorc) could be different for HOST and BUILD (in case they
use different --enable-canonical-installation-tree-structure), and use
the HOST one for the BUILD tools.
The right thing would probably be to construct the URE unorc in the
relevant Makefile, like we do for fundamentalrc? Or then to just
re-design the whole mess of rc files into some simpler (good luck).
Change-Id: I654309503d0e696778910acadcbf2f6b90ffa02a
diff --git a/configure.ac b/configure.ac
index 42bfbd3..e5b4d02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4496,7 +4496,8 @@ if test "$cross_compiling" = "yes"; then
instsetoo_native/util/openoffice.lst.in \
config_host/*.in \
sysui/desktop/macosx/Info.plist.in \
- ios/lo.xcconfig.in) \
+ ios/lo.xcconfig.in \
+ ure/source/unorc.in) \
| (cd CONF-FOR-BUILD && tar xf -)
cp configure CONF-FOR-BUILD
test -d config_build && cp -p config_build/*.h CONF-FOR-BUILD/config_host
2>/dev/null
diff --git a/sal/Library_sal.mk b/sal/Library_sal.mk
index 0df609d..501b5a8 100644
--- a/sal/Library_sal.mk
+++ b/sal/Library_sal.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Library_add_defs,sal,\
# need the "ure-link" symlink to exist in INSTDIR so it's possible to link sal
# FIXME: this creates cyclic dependency between ure and sal modules
$(eval $(call gb_Library_use_package,sal,ure_install))
+$(eval $(call gb_Library_use_package,sal,ure_builddir_install))
$(eval $(call gb_Library_use_libraries,sal,\
$(if $(filter $(OS),ANDROID), \
commit 83af58ee74f9cf9fb418cba73dd0df1b41a98e16
Author: Tor Lillqvist <t...@collabora.com>
Date: Sun Aug 10 19:41:24 2014 +0300
Ugly hack to fix build when srcdir!=builddir
The problem is that the ure/source/unorc file is now expanded by the
configure
script, and thus exists only in builddir. But a further complication is that
the uno.ini file is in srcdir. This is one way to handle it. Seems to work
for
me, let's see what the srcdir!=builddir tinderbox slaves say.
Change-Id: I6fb456cf849ce5077e2c5bd25dc9149096aab241
(cherry picked from commit 8e9487cf97d944b202d4406561b88068aaf8e386)
diff --git a/ure/Module_ure.mk b/ure/Module_ure.mk
index 88cbc71..4d8c2c0 100644
--- a/ure/Module_ure.mk
+++ b/ure/Module_ure.mk
@@ -11,6 +11,7 @@ $(eval $(call gb_Module_Module,ure))
$(eval $(call gb_Module_add_targets,ure,\
Package_install \
+ Package_builddir_install \
Rdb_ure \
))
diff --git a/ure/Package_builddir_install.mk b/ure/Package_builddir_install.mk
new file mode 100644
index 0000000..c109bd4
--- /dev/null
+++ b/ure/Package_builddir_install.mk
@@ -0,0 +1,16 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Package_Package,ure_builddir_install,$(BUILDDIR)/ure/source))
+
+$(eval $(call
gb_Package_add_files,ure_builddir_install,$(LIBO_URE_ETC_FOLDER),\
+ $(if $(filter unorc,$(call gb_Helper_get_rcfile,uno)),$(call
gb_Helper_get_rcfile,uno)) \
+))
+
+# vim:set noet sw=4 ts=4:
diff --git a/ure/Package_install.mk b/ure/Package_install.mk
index 94156b8..f4cdad3 100644
--- a/ure/Package_install.mk
+++ b/ure/Package_install.mk
@@ -28,7 +28,7 @@ endif
$(eval $(call gb_Package_add_files,ure_install,$(LIBO_URE_ETC_FOLDER),\
$(call gb_Helper_get_rcfile,jvmfwk3) \
- $(call gb_Helper_get_rcfile,uno) \
+ $(if $(filter unorc,$(call gb_Helper_get_rcfile,uno)),,$(call
gb_Helper_get_rcfile,uno)) \
))
# vim:set noet sw=4 ts=4:
commit 79f26d3b86a50a95dafd5ffcaac53adca302fdec
Author: Tor Lillqvist <t...@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
(cherry picked from commit 5e5aa9b08a39530b0b117141f0f65d1dc2dad84e)
diff --git a/instsetoo_native/CustomTarget_setup.mk
b/instsetoo_native/CustomTarget_setup.mk
index 3b73589..8ee75d6 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 f683fc7..a6e9580 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1224,7 +1224,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
@@ -1262,7 +1262,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 0f1878f55e2332744c957fa56fdbce61986cf09c
Author: Tor Lillqvist <t...@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
(cherry picked from commit e24d3ff2cd9e2da4c81105d2e9dbee6187fac55f)
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 090a8ce4ff8868fd62d125543f934b3d38e85df2
Author: Tor Lillqvist <t...@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
(cherry picked from commit d83f28a2505923a4f01237f7587bf8ede57d0bed)
diff --git a/configure.ac b/configure.ac
index f77e6dd..42bfbd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -12880,7 +12880,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}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
