[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_setup.mk scp2/source

[Samuel Mehrbrodt]

 instsetoo_native/CustomTarget_setup.mk |5 +
 scp2/source/ooo/common_brand.scp   |   18 --
 2 files changed, 1 insertion(+), 22 deletions(-)

New commits:
commit 53a3e0cd48075011e3c29070e8ff8585c02779c6
Author: Samuel Mehrbrodt 
Date:   Thu Jan 12 14:43:35 2017 +

Remove unused ini properties

Change-Id: Iea95f5975968f73e2e4aea34246c83f384341592
Reviewed-on: https://gerrit.libreoffice.org/33000
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index 2b9429c..3226cd6 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -34,10 +34,7 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
 $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call 
gb_Helper_get_rcfile,bootstrap) :
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \
-   echo '[ErrorReport]' \
-   && echo 'ErrorReportPort=80' \
-   && echo 'ErrorReportServer=report.libreoffice.org' \
-   && echo '[Bootstrap]' \
+   echo '[Bootstrap]' \
&& echo 'InstallMode=' \
&& echo 'ProductKey=$(PRODUCTNAME) $(PRODUCTVERSION)' \
$(if $(ENABLE_RELEASE_BUILD),\
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 1f88ada..7eb4e0e 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -644,15 +644,6 @@ End
 
 // ProfileItems
 
-ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Server
-ProfileID = gid_Brand_Profile_Bootstrap_Ini;
-ModuleID = gid_Module_Root_Brand;
-Section = "ErrorReport";
-Order = 8;
-Key = "ErrorReportServer";
-Value = "report.libreoffice.org";
-End
-
 ProfileItem gid_Brand_Profileitem_Bootstrap_Productkey
 ProfileID = gid_Brand_Profile_Bootstrap_Ini;
 ModuleID = gid_Module_Root_Brand;
@@ -662,15 +653,6 @@ ProfileItem gid_Brand_Profileitem_Bootstrap_Productkey
 Value = "";
 End
 
-ProfileItem gid_Brand_Profileitem_Bootstrap_Errorreport_Port
-ProfileID = gid_Brand_Profile_Bootstrap_Ini;
-ModuleID = gid_Module_Root_Brand;
-Section = "ErrorReport";
-Order = 7;
-Key = "ErrorReportPort";
-Value = "80";
-End
-
 ProfileItem gid_Brand_Profileitem_Bootstrap_Installmode
 ProfileID = gid_Brand_Profile_Bootstrap_Ini;
 ModuleID = gid_Module_Root_Brand;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_setup.mk scp2/source

[Stephan Bergmann]

 instsetoo_native/CustomTarget_setup.mk |2 +-
 scp2/source/ooo/common_brand.scp   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 94032236ba65c00ba29498a0dded42fa2f60b198
Author: Stephan Bergmann 
Date:   Thu Jul 2 15:27:26 2015 +0200

Move winreg layer past res layer, and also include it in instdir/ instset

* Looks more logical to keep share/registry/'s xcscxu and res layers 
together.

* Lets the winreg code actually get executed by developers using the 
instdir/
  instset.  (Though it doesn't enable it during in-build tests, which 
typically
  use their own CONFIGURATION_LAYERS settings.)

Change-Id: I49dd3a16773047f7d4dc372c60a58ada1970970a

diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index b020e96..4217424 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -48,7 +48,7 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'BRAND_BASE_DIR=$${ORIGIN}/..' \
&& echo 'BRAND_INI_DIR=$${ORIGIN}' \
&& echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)' \
-   && echo 
'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry 
res:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry 
bundledext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno):BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 sharedext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno):SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 userext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno):UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 user:$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/registrymodifications.xcu'
 \
+   && echo 
'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry 
res:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry $(if $(filter 
WNT,$(OS)),winreg: )bundledext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno):BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 sharedext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno):SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 userext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno):UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 user:$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/registrymodifications.xcu'
 \
&& echo 
'LO_JAVA_DIR=$${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)' \
&& echo 'LO_LIB_DIR=$${BRAND_BASE_DIR}/$(LIBO_LIB_FOLDER)' \
&& echo 'BAK_EXTENSIONS=$${$$ORIGIN/$(call 
gb_Helper_get_rcfile,louno):TMP_EXTENSIONS}' \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 2e967c7..e79dab7 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1123,7 +1123,7 @@ ProfileItem 
gid_Brand_Profileitem_Fundamental_Configuration_Layers
 Section = "Bootstrap";
 Key = "CONFIGURATION_LAYERS";
 #if defined WNT
-Value = "xcsxcu:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry winreg: 
res:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry 
bundledext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno) 
":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 sharedext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno) 
":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 userext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno) 
":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 user:${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) 
":UserInstallation}/user/registrymodifications.xcu";
+Value = "xcsxcu:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry 
res:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry winreg: 
bundledext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno) 
":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 sharedext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(louno) 
":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBacken

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_setup.mk scp2/source scripting/java scripting/source

[Stephan Bergmann]

 instsetoo_native/CustomTarget_setup.mk |   
 2 +-
 scp2/source/ooo/common_brand.scp   |   
 4 ++--
 scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java |   
 2 +-
 scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java  |   
 8 
 scripting/source/pyprov/pythonscript.py|   
 2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 27d5b5c6dd21dd123fad71cf01880299ef969b49
Author: Stephan Bergmann 
Date:   Wed Sep 17 11:45:14 2014 +0200

BRAND_BIN_SUBDIR -> BRAND_INI_DIR, to cater for new Mac OS X layout

Change-Id: Ic367545895a25a4cf6e95fc1be2f5db9f36a221b

diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index 79cf5ec..0c61a21 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -50,7 +50,7 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
( \
echo '[Bootstrap]' \
&& echo 'BRAND_BASE_DIR=$${ORIGIN}/..' \
-   && echo 'BRAND_BIN_SUBDIR=$(LIBO_BIN_FOLDER)' \
+   && echo 'BRAND_INI_DIR=$${ORIGIN}' \
&& echo 'BRAND_SHARE_SUBDIR=$(LIBO_SHARE_FOLDER)' \
&& echo 
'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry 
res:$${BRAND_BASE_DIR}/$(LIBO_SHARE_FOLDER)/registry 
bundledext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno):BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 sharedext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno):SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 userext:$${$${BRAND_BASE_DIR}/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,louno):UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini
 user:$${$$BRAND_BASE_DIR/$(LIBO_ETC_FOLDER)/$(call 
gb_Helper_get_rcfile,bootstrap):UserInstallation}/user/registrymodifications.xcu'
 \
&& echo 
'LO_JAVA_DIR=$${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)' \
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index 801a4fa..ce7bbc5 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1056,8 +1056,8 @@ ProfileItem 
gid_Brand_Profileitem_Fundamental_Brand_Bin_Subdir
 ModuleID = gid_Module_Root_Brand;
 ProfileID = gid_Brand_Profile_Fundamental_Ini;
 Section = "Bootstrap";
-Key = "BRAND_BIN_SUBDIR";
-Value = LIBO_BIN_FOLDER;
+Key = "BRAND_INI_DIR";
+Value = "${ORIGIN}";
 End
 
 ProfileItem gid_Brand_Profileitem_Fundamental_Lo_Lib_Dir
diff --git 
a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java 
b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
index 55eb560..d55b226 100644
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -95,7 +95,7 @@ public class ScriptMetaData extends ScriptEntry {
 "vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR";
 
 private static final String USER =
-"vnd.sun.star.expand:${$BRAND_BASE_DIR/BRAND_BIN_SUBDIR/" +
+"vnd.sun.star.expand:${$BRAND_INI_DIR/" +
 PathUtils.BOOTSTRAP_NAME +
 "::UserInstallation}/user";
 
diff --git 
a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java 
b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
index 2da7926..3ee02ec 100644
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -211,19 +211,19 @@ public abstract class ScriptProvider
 if ( originalContextURL.startsWith( "bundled" ) )
 {
 contextUrl = "vnd.sun.star.expand:$BUNDLED_EXTENSIONS";
-extensionDb = 
"vnd.sun.star.expand:${$BRAND_BASE_DIR/$BRAND_BIN_SUBDIR/" + 
PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
+extensionDb = "vnd.sun.star.expand:${$BRAND_INI_DIR/" 
+ PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
 extensionRepository = "bundled";
 }
 else if ( originalContextURL.startsWith( "share" ) )
 {
 contextUrl = 
"vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR";
-extensionDb = 
"vnd.sun.star.expand:${$BRAND_BASE_DIR/$BRAND_BIN_SUBDIR/" + 
PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
+extens

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_setup.mk scp2/source

[Stephan Bergmann]

 instsetoo_native/CustomTarget_setup.mk |2 +-
 scp2/source/ooo/ure.scp|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit aa888a88696f6864fd771c948d0831d53a206939
Author: Stephan Bergmann 
Date:   Tue Sep 16 20:37:56 2014 +0200

Wrong URE_INTERNAL_LIB_DIR value for MACOSX

Change-Id: I3bb7310f42ee6ddf6217326589566cf4d4781e17

diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index f201434..79cf5ec 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -155,7 +155,7 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,1)
( \
echo '[Bootstrap]' \
-   && echo 'URE_INTERNAL_LIB_DIR=$${ORIGIN}$(if $(filter 
MACOSX,$(OS)),/../../Frameworks)' \
+   && echo 'URE_INTERNAL_LIB_DIR=$${ORIGIN}$(if $(filter 
MACOSX,$(OS)),/../../../Frameworks)' \
&& echo 'URE_INTERNAL_JAVA_DIR=$${ORIGIN}/..$(if $(filter-out 
WNT,$(OS)),/$(if $(filter MACOSX,$(OS)),..,share))/java' \
&& echo 'URE_INTERNAL_JAVA_CLASSPATH=$${URE_MORE_JAVA_TYPES}' \
&& echo 'UNO_TYPES=$${ORIGIN}/../$(if $(filter-out 
WNT,$(OS)),share/)misc/types.rdb $${URE_MORE_TYPES}' \
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index b911a16..1f551ce7 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -173,7 +173,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Lib_Dir
 Section = "Bootstrap";
 Key = "URE_INTERNAL_LIB_DIR";
 #if defined MACOSX
-Value = "${ORIGIN}/../../Frameworks";
+Value = "${ORIGIN}/../../../Frameworks";
 #else
 Value = "${ORIGIN}";
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_setup.mk scp2/source

[Stephan Bergmann]

 instsetoo_native/CustomTarget_setup.mk |2 +-
 scp2/source/ooo/ure.scp|2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit e26a0ea8bf608075d044b47e3ca2182fd61e8d00
Author: Stephan Bergmann 
Date:   Tue Sep 16 20:13:01 2014 +0200

Wrong URE_INTERNAL_JAVA_DIR value for MACOSX

Change-Id: I96e7573513a14255b556b068b6df8bc619125c4c

diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index fcb7858..f201434 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -156,7 +156,7 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
( \
echo '[Bootstrap]' \
&& echo 'URE_INTERNAL_LIB_DIR=$${ORIGIN}$(if $(filter 
MACOSX,$(OS)),/../../Frameworks)' \
-   && echo 'URE_INTERNAL_JAVA_DIR=$${ORIGIN}/..$(if $(filter-out 
MACOSX WNT,$(OS)),/share)/java' \
+   && echo 'URE_INTERNAL_JAVA_DIR=$${ORIGIN}/..$(if $(filter-out 
WNT,$(OS)),/$(if $(filter MACOSX,$(OS)),..,share))/java' \
&& echo 'URE_INTERNAL_JAVA_CLASSPATH=$${URE_MORE_JAVA_TYPES}' \
&& echo 'UNO_TYPES=$${ORIGIN}/../$(if $(filter-out 
WNT,$(OS)),share/)misc/types.rdb $${URE_MORE_TYPES}' \
&& echo 'UNO_SERVICES=$${ORIGIN}/../$(if $(filter-out 
WNT,$(OS)),share/)misc/services.rdb $${URE_MORE_SERVICES}' \
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index 8654809..b911a16 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -185,7 +185,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Dir
 Section = "Bootstrap";
 Key = "URE_INTERNAL_JAVA_DIR";
 #if defined MACOSX
-Value = "${ORIGIN}/../java";
+Value = "${ORIGIN}/../../java";
 #elif defined WNT
 Value = "${ORIGIN}/../java";
 #else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: instsetoo_native/CustomTarget_setup.mk scp2/source

[Stephan Bergmann]

 instsetoo_native/CustomTarget_setup.mk |2 +-
 scp2/source/ooo/ure.scp|4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 851b5a973e04c0c9dda585dbe5ef290b78cc3951
Author: Stephan Bergmann 
Date:   Tue Sep 16 17:53:16 2014 +0200

Wrong UNO_TYPES value for MACOSX

Change-Id: I3d3a373a86f766ce517cbb85bb4b5651d91313d8

diff --git a/instsetoo_native/CustomTarget_setup.mk 
b/instsetoo_native/CustomTarget_setup.mk
index ec69b17..fcb7858 100644
--- a/instsetoo_native/CustomTarget_setup.mk
+++ b/instsetoo_native/CustomTarget_setup.mk
@@ -158,7 +158,7 @@ $(call 
gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_
&& echo 'URE_INTERNAL_LIB_DIR=$${ORIGIN}$(if $(filter 
MACOSX,$(OS)),/../../Frameworks)' \
&& echo 'URE_INTERNAL_JAVA_DIR=$${ORIGIN}/..$(if $(filter-out 
MACOSX WNT,$(OS)),/share)/java' \
&& echo 'URE_INTERNAL_JAVA_CLASSPATH=$${URE_MORE_JAVA_TYPES}' \
-   && echo 'UNO_TYPES=$${ORIGIN}/$(if $(filter-out 
MACOSX,$(OS)),$(if $(filter-out WNT,$(OS)),../share/)misc/)types.rdb 
$${URE_MORE_TYPES}' \
+   && echo 'UNO_TYPES=$${ORIGIN}/../$(if $(filter-out 
WNT,$(OS)),share/)misc/types.rdb $${URE_MORE_TYPES}' \
&& echo 'UNO_SERVICES=$${ORIGIN}/../$(if $(filter-out 
WNT,$(OS)),share/)misc/services.rdb $${URE_MORE_SERVICES}' \
) > $@
 
diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp
index cb143ae..8654809 100644
--- a/scp2/source/ooo/ure.scp
+++ b/scp2/source/ooo/ure.scp
@@ -206,9 +206,7 @@ ProfileItem gid_Profileitem_Dl_Uno_Uno_Types
 ProfileID = gid_Profile_Dl_Uno_Ini;
 Section = "Bootstrap";
 Key = "UNO_TYPES";
-#if defined MACOSX
-Value = "${ORIGIN}/types.rdb ${URE_MORE_TYPES}";
-#elif defined WNT
+#if defined WNT
 Value = "${ORIGIN}/../misc/types.rdb ${URE_MORE_TYPES}";
 #else
 Value = "${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES}";
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits