summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--bin/java-set-classpath.in2
-rw-r--r--configmgr/source/components.cxx8
-rw-r--r--desktop/source/app/check_ext_deps.cxx2
-rw-r--r--desktop/source/deployment/gui/dp_gui_updatedialog.cxx2
-rw-r--r--desktop/source/deployment/misc/dp_dependencies.cxx2
-rw-r--r--desktop/source/deployment/misc/dp_misc.cxx2
-rw-r--r--extensions/source/update/check/updatecheck.cxx2
-rw-r--r--extensions/source/update/check/updatehdl.cxx2
-rw-r--r--extensions/source/update/check/updateprotocol.cxx2
-rw-r--r--extensions/source/update/feed/updatefeed.cxx13
-rw-r--r--scp2/source/ooo/common_brand.scp55
-rw-r--r--scp2/source/ooo/profile_ooo.scp15
-rw-r--r--scp2/source/ooo/profileitem_ooo.scp195
-rw-r--r--unotools/source/config/configmgr.cxx2
14 files changed, 54 insertions, 250 deletions
diff --git a/bin/java-set-classpath.in b/bin/java-set-classpath.in
index 672463e16d69..4d22a75bad2c 100644
--- a/bin/java-set-classpath.in
+++ b/bin/java-set-classpath.in
@@ -36,7 +36,7 @@ if test "z$1" = "z" ; then
exit 0;
fi
-JVM_CONFIG_FILE=@OOINSTBASE@/basis-link/program/fundamentalbasisrc
+JVM_CONFIG_FILE=@OOINSTBASE@/program/fundamentalrc
for path in $@ ; do
if test "z${path%%/*}" != "z" ; then
diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx
index 650df69836de..0b5ea7830c4d 100644
--- a/configmgr/source/components.cxx
+++ b/configmgr/source/components.cxx
@@ -548,7 +548,7 @@ Components::Components(
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
- "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno")
+ "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("uno")
":BUNDLED_EXTENSIONS_USER}/registry/"
"com.sun.star.comp.deployment.configuration."
"PackageRegistryBackend/configmgr.ini"))),
@@ -558,7 +558,7 @@ Components::Components(
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
- "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno")
+ "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("uno")
":SHARED_EXTENSIONS_USER}/registry/"
"com.sun.star.comp.deployment.configuration."
"PackageRegistryBackend/configmgr.ini"))),
@@ -568,7 +568,7 @@ Components::Components(
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
- "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno")
+ "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("uno")
":UNO_USER_PACKAGES_CACHE}/registry/"
"com.sun.star.comp.deployment.configuration."
"PackageRegistryBackend/registry"))));
@@ -579,7 +579,7 @@ Components::Components(
expand(
rtl::OUString(
RTL_CONSTASCII_USTRINGPARAM(
- "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno")
+ "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("uno")
":UNO_USER_PACKAGES_CACHE}/registry/"
"com.sun.star.comp.deployment.configuration."
"PackageRegistryBackend/configmgr.ini"))),
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index fbc5136518c3..37b1bfe41b22 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -375,7 +375,7 @@ static bool impl_needsCompatCheck()
{
bool bNeedsCheck = false;
rtl::OUString aLastCheckBuildID;
- rtl::OUString aCurrentBuildID( UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) );
+ rtl::OUString aCurrentBuildID( UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) );
rtl::Bootstrap::expandMacros( aCurrentBuildID );
try {
diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
index 33306839a72f..f0b3f41d9e09 100644
--- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
+++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx
@@ -1281,7 +1281,7 @@ IMPL_LINK(UpdateDialog, selectionHandler, void *, EMPTYARG)
sal_Int32 nPos = m_noDependencyCurVer.indexOf( sVersion );
if ( nPos >= 0 )
{
- ::rtl::OUString sCurVersion( RTL_CONSTASCII_USTRINGPARAM( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":Version:OOOPackageVersion}"));
+ ::rtl::OUString sCurVersion( RTL_CONSTASCII_USTRINGPARAM( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":Version:OOOPackageVersion}"));
::rtl::Bootstrap::expandMacros(sCurVersion);
m_noDependencyCurVer = m_noDependencyCurVer.replaceAt( nPos, sVersion.getLength(), sCurVersion );
}
diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx
index 6b937547ae93..9bbaa1f4c5b7 100644
--- a/desktop/source/deployment/misc/dp_dependencies.cxx
+++ b/desktop/source/deployment/misc/dp_dependencies.cxx
@@ -62,7 +62,7 @@ lcl_versionIsNot(dp_misc::Order i_eOrder, ::rtl::OUString const& i_rVersion)
{
::rtl::OUString aVersion(
RTL_CONSTASCII_USTRINGPARAM(
- "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version")
+ "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version")
":Version:OOOPackageVersion}"));
::rtl::Bootstrap::expandMacros(aVersion);
return ::dp_misc::compareVersions(aVersion, i_rVersion) != i_eOrder;
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx
index 2bd02540a8d3..8e47e8fb0ea8 100644
--- a/desktop/source/deployment/misc/dp_misc.cxx
+++ b/desktop/source/deployment/misc/dp_misc.cxx
@@ -82,7 +82,7 @@ struct UnoRc : public rtl::StaticWithInit<
boost::shared_ptr<rtl::Bootstrap>, UnoRc> {
const boost::shared_ptr<rtl::Bootstrap> operator () () {
OUString unorc( RTL_CONSTASCII_USTRINGPARAM(
- "$OOO_BASE_DIR/program/" SAL_CONFIGFILE("uno")) );
+ "$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("uno")) );
::rtl::Bootstrap::expandMacros( unorc );
::boost::shared_ptr< ::rtl::Bootstrap > ret(
new ::rtl::Bootstrap( unorc ) );
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 468be3e9d86c..09821ab438f8 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -116,7 +116,7 @@ namespace
static inline rtl::OUString getBuildId()
{
- rtl::OUString aPathVal(UNISTRING("${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}"));
+ rtl::OUString aPathVal(UNISTRING("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}"));
rtl::Bootstrap::expandMacros(aPathVal);
return aPathVal;
}
diff --git a/extensions/source/update/check/updatehdl.cxx b/extensions/source/update/check/updatehdl.cxx
index b25854fc64a1..7ee3aa4e8d71 100644
--- a/extensions/source/update/check/updatehdl.cxx
+++ b/extensions/source/update/check/updatehdl.cxx
@@ -895,7 +895,7 @@ void UpdateHandler::setFullVersion( rtl::OUString& rString )
sal_Int32 nVerIndex = rString.indexOf( aProductVersion );
if ( nVerIndex != -1 )
{
- rtl::OUString aPackageVersion = UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":OOOPackageVersion}" );
+ rtl::OUString aPackageVersion = UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":OOOPackageVersion}" );
rtl::Bootstrap::expandMacros( aPackageVersion );
if ( aPackageVersion.getLength() )
diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx
index a304ee3bcb7a..f20cda865ce0 100644
--- a/extensions/source/update/check/updateprotocol.cxx
+++ b/extensions/source/update/check/updateprotocol.cxx
@@ -64,7 +64,7 @@ getBootstrapData(
::rtl::OUString & rBuildID,
::rtl::OUString & rInstallSetID)
{
- rBuildID = UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":ProductBuildid}" );
+ rBuildID = UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":ProductBuildid}" );
rtl::Bootstrap::expandMacros( rBuildID );
if ( ! rBuildID.getLength() )
return false;
diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx
index 6f6ce112fea7..bb250baeea91 100644
--- a/extensions/source/update/feed/updatefeed.cxx
+++ b/extensions/source/update/feed/updatefeed.cxx
@@ -384,22 +384,9 @@ UpdateInformationProvider::UpdateInformationProvider(
}
rtl::OUString product(buf.makeStringAndClear());
- rtl::OUString aBaseBuildId( UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) );
- rtl::Bootstrap::expandMacros( aBaseBuildId );
-
- rtl::OUString aBrandBuildId( UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ) );
- rtl::Bootstrap::expandMacros( aBrandBuildId );
-
rtl::OUString aUserAgent( UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateUserAgent}" ) );
rtl::Bootstrap::expandMacros( aUserAgent );
- if ( ! aBaseBuildId.equals( aBrandBuildId ) )
- {
- sal_Int32 nIndex = aUserAgent.indexOf( aBrandBuildId, 0 );
- if ( nIndex != -1 )
- aUserAgent = aUserAgent.replaceAt( nIndex, aBrandBuildId.getLength(), aBaseBuildId );
- }
-
for (sal_Int32 i = 0;;) {
i = aUserAgent.indexOfAsciiL(
RTL_CONSTASCII_STRINGPARAM("<PRODUCT>"), i);
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index a0270cdcecab..a55af98b371e 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -1118,6 +1118,14 @@ ProfileItem gid_Brand_Profileitem_Version_Ooobaseversion
Value = "${OOOBASEVERSION}";
End
+ProfileItem gid_Brand_Profileitem_Version_Ooopackageversion
+ ProfileID = gid_Brand_Profile_Version_Ini;
+ ModuleID = gid_Module_Root_Brand;
+ Section = "Version";
+ Key = "OOOPackageVersion";
+ Value = "${OOOPACKAGEVERSION}";
+End
+
ProfileItem gid_Brand_Profileitem_Version_Extensionupdateurl
ProfileID = gid_Brand_Profile_Version_Ini;
ModuleID = gid_Module_Root_Brand;
@@ -1152,7 +1160,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions
ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap";
Key = "BUNDLED_EXTENSIONS";
- Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":BUNDLED_EXTENSIONS}";
+ Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS}";
End
ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions_User
@@ -1160,7 +1168,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions_User
ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap";
Key = "BUNDLED_EXTENSIONS_USER";
- Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":BUNDLED_EXTENSIONS_USER}";
+ Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}";
End
ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions_Prereg
@@ -1168,7 +1176,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions_Prereg
ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap";
Key = "BUNDLED_EXTENSIONS_PREREG";
- Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":BUNDLED_EXTENSIONS_PREREG}";
+ Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_PREREG}";
End
ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Packages_Cache
@@ -1176,7 +1184,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Packages_Cache
ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap";
Key = "UNO_SHARED_PACKAGES_CACHE";
- Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":UNO_SHARED_PACKAGES_CACHE}";
+ Value = "${$ORIGIN/" PROFILENAME(uno) ":UNO_SHARED_PACKAGES_CACHE}";
End
ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Extensions_User
@@ -1184,7 +1192,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Shared_Extensions_User
ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap";
Key = "SHARED_EXTENSIONS_USER";
- Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":SHARED_EXTENSIONS_USER}";
+ Value = "${$ORIGIN/" PROFILENAME(uno) ":SHARED_EXTENSIONS_USER}";
End
ProfileItem gid_Brand_Profileitem_Fundamental_Uno_User_Packages_Cache
@@ -1192,7 +1200,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_User_Packages_Cache
ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap";
Key = "UNO_USER_PACKAGES_CACHE";
- Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":UNO_USER_PACKAGES_CACHE}";
+ Value = "${$ORIGIN/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}";
End
ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Tmp_Extensions
@@ -1200,7 +1208,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Tmp_Extensions
ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap";
Key = "TMP_EXTENSIONS";
- Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":TMP_EXTENSIONS}";
+ Value = "${$ORIGIN/" PROFILENAME(uno) ":TMP_EXTENSIONS}";
End
ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Types
@@ -1208,7 +1216,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Types
ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap";
Key = "URE_MORE_TYPES";
- Value = "$ORIGIN/offapi.rdb $ORIGIN/oovbaapi.rdb ${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_TYPES}";
+ Value = "$ORIGIN/offapi.rdb $ORIGIN/oovbaapi.rdb ${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}";
End
ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Services
@@ -1216,7 +1224,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Services
ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap";
Key = "URE_MORE_SERVICES";
- Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_SERVICES} $ORIGIN/services.rdb";
+ Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_SERVICES} $ORIGIN/services.rdb";
End
ProfileItem gid_Brand_Profileitem_Fundamental_Ure_More_Java_Types
@@ -1224,7 +1232,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 ${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":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}";
End
ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_Shared_Data
@@ -1232,7 +1240,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_Shared_Data
ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap";
Key = "URE_OVERRIDE_JAVA_JFW_SHARED_DATA";
- Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_OVERRIDE_JAVA_JFW_SHARED_DATA}";
+ Value = "${BRAND_BASE_DIR}/share/config/javasettings_${_OS}_${_ARCH}.xml";
End
ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_User_Data
@@ -1240,7 +1248,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_User_Data
ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap";
Key = "URE_OVERRIDE_JAVA_JFW_USER_DATA";
- Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_OVERRIDE_JAVA_JFW_USER_DATA}";
+ Value = "${${BRAND_BASE_DIR}/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/config/javasettings_${_OS}_${_ARCH}.xml";
End
ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Classpath_Urls
@@ -1248,7 +1256,16 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Classpath_Urls
ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap";
Key = "URE_MORE_JAVA_CLASSPATH_URLS";
- Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_MORE_JAVA_CLASSPATH_URLS}";
+ Value = "";
+#ifdef SYSTEM_BSH
+ ValueList1 = BSH_JAR;
+#endif
+#ifdef SYSTEM_HSQLDB
+ ValueList2 = HSQLDB_JAR;
+#endif
+#ifdef SYSTEM_SAXON
+ ValueList3 = SAXON_JAR;
+#endif
End
ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Bin_Dir
@@ -1256,7 +1273,11 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Bin_Dir
ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap";
Key = "URE_BIN_DIR";
- Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_BIN_DIR}";
+#if defined WNT
+ Value = "${.link:${OOO_BASE_DIR}/ure-link}/bin";
+#else
+ Value = "${OOO_BASE_DIR}/ure-link/bin";
+#endif
End
ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Lib_Dir
@@ -1264,7 +1285,11 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Lib_Dir
ProfileID = gid_Brand_Profile_Fundamental_Ini;
Section = "Bootstrap";
Key = "URE_LIB_DIR";
- Value = "${${OOO_BASE_DIR}/program/" PROFILENAME(fundamentalbasis) ":URE_LIB_DIR}";
+#if defined WNT
+ Value = "${.link:${OOO_BASE_DIR}/ure-link}/bin";
+#else
+ Value = "${OOO_BASE_DIR}/ure-link/lib";
+#endif
End
#if !defined MACOSX
diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp
index a2491045caf9..899f86bc3740 100644
--- a/scp2/source/ooo/profile_ooo.scp
+++ b/scp2/source/ooo/profile_ooo.scp
@@ -34,19 +34,6 @@ Profile gid_Profile_Uno_Ini
#else
Name = "uno.ini";
#endif
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Styles = (NETWORK);
End
-
-Profile gid_Profile_Version_Ini_Basis
- ModuleID = gid_Module_Root;
- Name = PROFILENAME(version);
- Dir = gid_Dir_Program;
- Styles = ();
-End
-
-Profile gid_Profile_Fundamentalbasis_Ini
- ModuleID = gid_Module_Root;
- Name = PROFILENAME(fundamentalbasis);
- Dir = gid_Dir_Program;
-End
diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp
index 37d30a1d7784..10ab481cc688 100644
--- a/scp2/source/ooo/profileitem_ooo.scp
+++ b/scp2/source/ooo/profileitem_ooo.scp
@@ -271,198 +271,3 @@ ProfileItem gid_Profileitem_Uno_Pkg_UserUnoFile
Key = "PKG_UserUnoFile";
Value = "$UNO_USER_PACKAGES_CACHE/registry/com.sun.star.comp.deployment.component.PackageRegistryBackend/unorc";
End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Bundled_Extensions
- ModuleID = gid_Module_Root;
- ProfileID = gid_Profile_Fundamentalbasis_Ini;
- Section = "Bootstrap";
- Key = "BUNDLED_EXTENSIONS";
- Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS}";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Bundled_Extensions_User
- ModuleID = gid_Module_Root;
- ProfileID = gid_Profile_Fundamentalbasis_Ini;
- Section = "Bootstrap";
- Key = "BUNDLED_EXTENSIONS_USER";
- Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Bundled_Extensions_Prereg
- ModuleID = gid_Module_Root;
- ProfileID = gid_Profile_Fundamentalbasis_Ini;
- Section = "Bootstrap";
- Key = "BUNDLED_EXTENSIONS_PREREG";
- Value = "${$ORIGIN/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_PREREG}";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Shared_Packages_Cache
- ModuleID = gid_Module_Root;
- ProfileID = gid_Profile_Fundamentalbasis_Ini;
- Section = "Bootstrap";
- Key = "UNO_SHARED_PACKAGES_CACHE";
- Value = "${$ORIGIN/" PROFILENAME(uno) ":UNO_SHARED_PACKAGES_CACHE}";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Shared_Extensions_User
- ModuleID = gid_Module_Root;
- ProfileID = gid_Profile_Fundamentalbasis_Ini;
- Section = "Bootstrap";
- Key = "SHARED_EXTENSIONS_USER";
- Value = "${$ORIGIN/" PROFILENAME(uno) ":SHARED_EXTENSIONS_USER}";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_User_Packages_Cache
- ModuleID = gid_Module_Root;
- ProfileID = gid_Profile_Fundamentalbasis_Ini;
- Section = "Bootstrap";
- Key = "UNO_USER_PACKAGES_CACHE";
- Value = "${$ORIGIN/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Uno_Tmp_Extensions
- ModuleID = gid_Module_Root;
- ProfileID = gid_Profile_Fundamentalbasis_Ini;
- Section = "Bootstrap";
- Key = "TMP_EXTENSIONS";
- Value = "${$ORIGIN/" PROFILENAME(uno) ":TMP_EXTENSIONS}";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Types
- ModuleID = gid_Module_Root;
- ProfileID = gid_Profile_Fundamentalbasis_Ini;
- Section = "Bootstrap";
- Key = "URE_MORE_TYPES";
- Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_TYPES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_TYPES}";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Services
- ModuleID = gid_Module_Root;
- ProfileID = gid_Profile_Fundamentalbasis_Ini;
- Section = "Bootstrap";
- Key = "URE_MORE_SERVICES";
- Value = "${${$ORIGIN/" PROFILENAME(uno) ":PKG_UserUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_SharedUnoFile}:UNO_SERVICES} ${${$ORIGIN/" PROFILENAME(uno) ":PKG_BundledUnoFile}:UNO_SERVICES}";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_More_Java_Types
- ModuleID = gid_Module_Root;
- ProfileID = gid_Profile_Fundamentalbasis_Ini;
- Section = "Bootstrap";
- Key = "URE_MORE_JAVA_TYPES";
- 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
- ModuleID = gid_Module_Root;
- ProfileID = gid_Profile_Fundamentalbasis_Ini;
- Section = "Bootstrap";
- Key = "URE_OVERRIDE_JAVA_JFW_SHARED_DATA";
- Value = "${BRAND_BASE_DIR}/share/config/javasettings_${_OS}_${_ARCH}.xml";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Java_Jfw_User_Data
- ModuleID = gid_Module_Root;
- ProfileID = gid_Profile_Fundamentalbasis_Ini;
- Section = "Bootstrap";
- Key = "URE_OVERRIDE_JAVA_JFW_USER_DATA";
- Value = "${${BRAND_BASE_DIR}/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/config/javasettings_${_OS}_${_ARCH}.xml";
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Java_Classpath_Urls
- ModuleID = gid_Module_Root;
- ProfileID = gid_Profile_Fundamentalbasis_Ini;
- Section = "Bootstrap";
- Key = "URE_MORE_JAVA_CLASSPATH_URLS";
- Value = "";
-#ifdef SYSTEM_BSH
- ValueList1 = BSH_JAR;
-#endif
-#ifdef SYSTEM_HSQLDB
- ValueList2 = HSQLDB_JAR;
-#endif
-#ifdef SYSTEM_SAXON
- ValueList3 = SAXON_JAR;
-#endif
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Bin_Dir
- ModuleID = gid_Module_Root;
- ProfileID = gid_Profile_Fundamentalbasis_Ini;
- Section = "Bootstrap";
- Key = "URE_BIN_DIR";
-#if defined WNT
- Value = "${.link:$ORIGIN/../ure-link}/bin";
-#else
- Value = "$ORIGIN/../ure-link/bin";
-#endif
-End
-
-ProfileItem gid_Profileitem_Fundamentalbasis_Ure_Lib_Dir
- ModuleID = gid_Module_Root;
- ProfileID = gid_Profile_Fundamentalbasis_Ini;
- Section = "Bootstrap";
- Key = "URE_LIB_DIR";
-#if defined WNT
- Value = "${.link:$ORIGIN/../ure-link}/bin";
-#else
- Value = "$ORIGIN/../ure-link/lib";
-#endif
-End
-
-// Basis layer: gid_Profile_Version_Ini_Basis
-
-ProfileItem gid_Basis_Profileitem_Version_Buildid
- ProfileID = gid_Profile_Version_Ini_Basis;
- ModuleID = gid_Module_Root;
- Section = "Version";
- Key = "buildid";
- Value = "<buildid>";
-End
-
-ProfileItem gid_Basis_Profileitem_Version_Productsource
- ProfileID = gid_Profile_Version_Ini_Basis;
- ModuleID = gid_Module_Root;
- Section = "Version";
- Key = "ProductSource";
- Value = "<sourceid>";
-End
-
-ProfileItem gid_Basis_Profileitem_Version_Productmajor
- ProfileID = gid_Profile_Version_Ini_Basis;
- ModuleID = gid_Module_Root;
- Section = "Version";
- Key = "ProductMajor";
- Value = "<productmajor>";
-End
-
-ProfileItem gid_Basis_Profileitem_Version_Productminor
- ProfileID = gid_Profile_Version_Ini_Basis;
- ModuleID = gid_Module_Root;
- Section = "Version";
- Key = "ProductMinor";
- Value = "<productminor>";
-End
-
-ProfileItem gid_Basis_Profileitem_Version_Productbuildid
- ProfileID = gid_Profile_Version_Ini_Basis;
- ModuleID = gid_Module_Root;
- Section = "Version";
- Key = "ProductBuildid";
- Value = "<productbuildid>";
-End
-
-ProfileItem gid_Basis_Profileitem_Version_Ooobaseversion
- ProfileID = gid_Profile_Version_Ini_Basis;
- ModuleID = gid_Module_Root;
- Section = "Version";
- Key = "OOOBaseVersion";
- Value = "${OOOBASEVERSION}";
-End
-
-ProfileItem gid_Basis_Profileitem_Version_Ooopackageversion
- ProfileID = gid_Profile_Version_Ini_Basis;
- ModuleID = gid_Module_Root;
- Section = "Version";
- Key = "OOOPackageVersion";
- Value = "${OOOPACKAGEVERSION}";
-End
diff --git a/unotools/source/config/configmgr.cxx b/unotools/source/config/configmgr.cxx
index 913f809aa412..00e46145e360 100644
--- a/unotools/source/config/configmgr.cxx
+++ b/unotools/source/config/configmgr.cxx
@@ -575,7 +575,7 @@ Any ConfigManager::GetDirectConfigProperty(ConfigProperty eProp)
/*---------------------------------------------------------------------------*/
void ConfigManager::getBasisAboutBoxProductVersion( OUString& rVersion )
{
- rtl::OUString aPackageVersion = UNISTRING( "${$OOO_BASE_DIR/program/" SAL_CONFIGFILE("version") ":OOOPackageVersion}" );
+ rtl::OUString aPackageVersion = UNISTRING( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":OOOPackageVersion}" );
rtl::Bootstrap::expandMacros( aPackageVersion );
if ( aPackageVersion.getLength() )
generated by cgit (git 2.34.1) at 2025-02-04 03:58:41 +0000