diff options
| -rw-r--r-- | connectivity/source/drivers/hsqldb/HDriver.cxx | 6 | ||||
| -rw-r--r-- | scp2/source/ooo/common_brand.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/directory_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/profileitem_ooo.scp | 11 | ||||
| -rw-r--r-- | solenv/gbuild/Jar.mk | 2 | ||||
| -rw-r--r-- | solenv/inc/settings.mk | 3 |
6 files changed, 9 insertions, 17 deletions
diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 3973cf5833b1..7d2623a31452 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -242,10 +242,10 @@ namespace connectivity ::rtl::OUString( #ifdef SYSTEM_HSQLDB RTL_CONSTASCII_USTRINGPARAM(HSQLDB_JAR - " vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/sdbc_hsqldb.jar" ) + " vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/sdbc_hsqldb.jar" ) #else - RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/hsqldb.jar" - " vnd.sun.star.expand:$OOO_BASE_DIR/program/classes/sdbc_hsqldb.jar" ) + RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/hsqldb.jar" + " vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/sdbc_hsqldb.jar" ) #endif ) ); diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index 830f7eaad68f..52611adc1a2a 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -1231,7 +1231,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types ProfileID = gid_Brand_Profile_Fundamental_Ini; Section = "Bootstrap"; Key = "URE_MORE_JAVA_TYPES"; - Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_JAVA_TYPES}"; + Value = "$ORIGIN/classes/unoil.jar $ORIGIN/classes/ScriptFramework.jar ${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_JAVA_TYPES}"; End ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_Shared_Data diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index 2d523951c7e5..726834a85025 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -152,7 +152,7 @@ Directory gid_Dir_Httphome End Directory gid_Dir_Classes - ParentID = gid_Dir_Program; + ParentID = gid_Brand_Dir_Program; DosName = "classes"; End diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp index 3c6dfefc1286..78b960685163 100644 --- a/scp2/source/ooo/profileitem_ooo.scp +++ b/scp2/source/ooo/profileitem_ooo.scp @@ -27,15 +27,6 @@ #include "macros.inc" -ProfileItem gid_Profileitem_Setup_Uno_Java_Comppath - ProfileID = gid_Profile_Setup_Ini; - ModuleID = gid_Module_Root; - Section = "Bootstrap"; - Order = 1; - Key = "UNO_JAVA_COMPPATH"; - Value = "$ORIGIN/classes"; -End - ProfileItem gid_Profileitem_Setup_Uno_Services ProfileID = gid_Profile_Setup_Ini; ModuleID = gid_Module_Root; @@ -358,7 +349,7 @@ ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Java_Types ProfileID = gid_Profile_Fundamentalbasis_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 = "${${$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_Profileitem_Fundamentalbasis_Ure_Java_Jfw_Shared_Data diff --git a/solenv/gbuild/Jar.mk b/solenv/gbuild/Jar.mk index 244e7e8c8846..18e03d426a4e 100644 --- a/solenv/gbuild/Jar.mk +++ b/solenv/gbuild/Jar.mk @@ -164,7 +164,7 @@ endef # possible directories for jar files containing UNO services gb_Jar_COMPONENTPREFIXES := \ - OOO:vnd.sun.star.expand:\dOOO_BASE_DIR/program/classes/ \ + OOO:vnd.sun.star.expand:\dBRAND_BASE_DIR/program/classes/ \ URE:vnd.sun.star.expand:\dURE_INTERNAL_JAVA_DIR/ \ INTERN:vnd.sun.star.expand:\dOOO_INBUILD_JAVA_DIR/ diff --git a/solenv/inc/settings.mk b/solenv/inc/settings.mk index 595dcdb10c30..0d791e5d04e8 100644 --- a/solenv/inc/settings.mk +++ b/solenv/inc/settings.mk @@ -1360,7 +1360,8 @@ CPPUNIT_CFLAGS = COMPONENTPREFIX_URE_NATIVE = vnd.sun.star.expand:$$URE_INTERNAL_LIB_DIR/ COMPONENTPREFIX_URE_JAVA = vnd.sun.star.expand:$$URE_INTERNAL_JAVA_DIR/ COMPONENTPREFIX_BASIS_NATIVE = vnd.sun.star.expand:$$BRAND_BASE_DIR/program/ -COMPONENTPREFIX_BASIS_JAVA = vnd.sun.star.expand:$$OOO_BASE_DIR/program/classes/ +COMPONENTPREFIX_BASIS_JAVA = \ + vnd.sun.star.expand:$$BRAND_BASE_DIR/program/classes/ COMPONENTPREFIX_BASIS_PYTHON = vnd.openoffice.pymodule: COMPONENTPREFIX_INBUILD_NATIVE = \ vnd.sun.star.expand:$$OOO_INBUILD_SHAREDLIB_DIR/ |