diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-11-25 14:10:43 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-11-25 14:10:43 +0100 |
| commit | 2fc4952bd0123de06bf281733597b3f9fc487d75 (patch) | |
| tree | 4d071edde62254ee718c75399bcb730d16d627c3 | |
| parent | 411bd6e440266a0db95907ad73a3a5be92bd1827 (diff) | |
Remove unused URE_LIB_DIR
(which now had a bogus value on Mac OS X anyway)
Change-Id: I5bf233506d6c658560dfadddf79a9ed8605c2a20
| -rw-r--r-- | android/Bootstrap/Makefile.shared | 1 | ||||
| -rw-r--r-- | instsetoo_native/CustomTarget_setup.mk | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 12 |
3 files changed, 0 insertions, 14 deletions
diff --git a/android/Bootstrap/Makefile.shared b/android/Bootstrap/Makefile.shared index 7ec1419f5ab9..a3b8ade2c9a2 100644 --- a/android/Bootstrap/Makefile.shared +++ b/android/Bootstrap/Makefile.shared @@ -157,7 +157,6 @@ copy-stuff: # Set up fundamentalrc echo '[Bootstrap]' > assets/program/fundamentalrc echo 'LO_LIB_DIR=file://$$APP_DATA_DIR/lib/' >> assets/program/fundamentalrc - echo 'URE_LIB_DIR=file://$$APP_DATA_DIR/lib/' >> assets/program/fundamentalrc # checkme - is this used to find configs ? echo 'BRAND_BASE_DIR=file:///assets' >> assets/program/fundamentalrc echo 'CONFIGURATION_LAYERS=xcsxcu:$${BRAND_BASE_DIR}/share/registry res:$${BRAND_BASE_DIR}/share/registry' >> assets/program/fundamentalrc echo 'URE_BIN_DIR=file:///assets/ure/bin/dir/nothing-here/we-can/exec-anyway' >> assets/program/fundamentalrc diff --git a/instsetoo_native/CustomTarget_setup.mk b/instsetoo_native/CustomTarget_setup.mk index 0c61a2109121..f3ecebd5634d 100644 --- a/instsetoo_native/CustomTarget_setup.mk +++ b/instsetoo_native/CustomTarget_setup.mk @@ -66,7 +66,6 @@ $(call gb_CustomTarget_get_workdir,instsetoo_native/setup)/$(call gb_Helper_get_ && 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=$${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)/unoil.jar $${BRAND_BASE_DIR}/$(LIBO_SHARE_JAVA_FOLDER)/ScriptFramework.jar $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_UserUnoFile}:UNO_JAVA_CLASSPATH} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_SharedUnoFile}:UNO_JAVA_CLASSPATH} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_BundledUnoFile}:UNO_JAVA_CLASSPATH}' \ && echo 'URE_MORE_SERVICES=$${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_UserUnoFile}:UNO_SERVICES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_SharedUnoFile}:UNO_SERVICES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_BundledUnoFile}:UNO_SERVICES} <$$ORIGIN/services>*' \ && echo 'URE_MORE_TYPES=<$$ORIGIN/types>* $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_UserUnoFile}:UNO_TYPES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_SharedUnoFile}:UNO_TYPES} $${$${$$ORIGIN/$(call gb_Helper_get_rcfile,louno):PKG_BundledUnoFile}:UNO_TYPES}' \ diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index a8669295b2f9..e331f6c6ca2a 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1151,18 +1151,6 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Bin_Dir #endif End -ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Lib_Dir - ModuleID = gid_Module_Root_Brand; - ProfileID = gid_Brand_Profile_Fundamental_Ini; - Section = "Bootstrap"; - Key = "URE_LIB_DIR"; -#if defined WNT - Value = "${.link:${BRAND_BASE_DIR}/ure-link}/bin"; -#else - Value = "${BRAND_BASE_DIR}/ure-link/lib"; -#endif -End - ProfileItem gid_Brand_Profileitem_Fundamental_Configuration_Layers ProfileID = gid_Brand_Profile_Fundamental_Ini; ModuleID = gid_Module_Root_Brand; |