diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-08-16 11:08:32 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-08-18 21:11:16 +0300 |
| commit | c6a73009747814513ab5a7277c211449c7378870 (patch) | |
| tree | 2adc961b3c83deffcea251c41744f2626e476f38 | |
| parent | make install or install-strip hardly make sense on OS X (diff) | |
| download | core-c6a73009747814513ab5a7277c211449c7378870.tar.gz core-c6a73009747814513ab5a7277c211449c7378870.zip | |
Use subfolder names from <config_folders.h>
Change all instances of hardcoded "program", "share" etc subfolder names to
use those from <config_folders.h> instead. In normal builds, the end result
will not change.
Change-Id: I91c95cd8e482818be67307e889ae6df887763f53
99 files changed, 604 insertions, 380 deletions
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index 62577316f22d..f2e6656d684b 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -18,6 +18,7 @@ */ #include <config_features.h> +#include <config_folders.h> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XContainer.hpp> @@ -596,7 +597,7 @@ static void createVariableURL( OUString& rStr, const OUString& rLibName, } else { - rStr = OUString("$(INST)/share/basic/"); + rStr = OUString("$(INST)/" LIBO_SHARE_FOLDER "/basic/"); } rStr += rLibName; rStr += "/"; diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx index 30915a7a0a28..43f38bca37e2 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> #include "comphelper_module.hxx" @@ -303,7 +304,7 @@ void OfficeInstallationDirectories::initDirs() *m_pUserDir = xExpander->expandMacros( - OUString("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" ) ); + OUString("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" ) ":UserInstallation}" ) ); OSL_ENSURE( !m_pUserDir->isEmpty(), "Unable to obtain office user data directory!" ); diff --git a/configmgr/source/components.cxx b/configmgr/source/components.cxx index 84b45bbd49fc..4a1b71984ab7 100644 --- a/configmgr/source/components.cxx +++ b/configmgr/source/components.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include "sal/config.h" #include <algorithm> @@ -803,7 +805,7 @@ void Components::parseModificationLayer(OUString const & url) { parseFiles( Data::NO_LAYER, ".xcu", &parseXcuFile, expand( - "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") + "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/user/registry/data"), false); } diff --git a/configure.ac b/configure.ac index 6b313c7dc017..4f95412b6be6 100644 --- a/configure.ac +++ b/configure.ac @@ -2854,9 +2854,9 @@ dnl Structure of install set dnl =================================================================== if test $_os = Darwin -a "$ENABLE_MACOSX_SANDBOX" = YES; then - // For now, couple whether to use a more "Mac-like" installation tree structure - // with the choice whether to use sandboxing. Could be a separate choice, or could - // be always on for OS X. + # For now, couple whether to use a more "Mac-like" installation tree structure + # with the choice whether to use sandboxing. Could be a separate choice, or could + # be always on for OS X. LIBO_BIN_FOLDER=MacOS LIBO_ETC_FOLDER=Resources LIBO_LIBEXEC_FOLDER=MacOS diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 251a8526aa34..5f053f353430 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include "hsqldb/HDriver.hxx" #include "hsqldb/HConnection.hxx" #include <osl/diagnose.h> @@ -233,10 +235,10 @@ namespace connectivity OUString( #ifdef SYSTEM_HSQLDB HSQLDB_JAR - " vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/sdbc_hsqldb.jar" + " vnd.sun.star.expand:$BRAND_BASE_DIR/" LIBO_SHARE_JAVA_FOLDER "/sdbc_hsqldb.jar" #else - "vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/hsqldb.jar" - " vnd.sun.star.expand:$BRAND_BASE_DIR/program/classes/sdbc_hsqldb.jar" + "vnd.sun.star.expand:$BRAND_BASE_DIR/" LIBO_SHARE_JAVA_FOLDER "/hsqldb.jar" + " vnd.sun.star.expand:$BRAND_BASE_DIR/" LIBO_SHARE_JAVA_FOLDER "/sdbc_hsqldb.jar" #endif ) ); diff --git a/crashrep/source/win32/soreport.cxx b/crashrep/source/win32/soreport.cxx index 08038efe09ea..da84dfd8c783 100644 --- a/crashrep/source/win32/soreport.cxx +++ b/crashrep/source/win32/soreport.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #define UNICODE #define WIN32_LEAN_AND_MEAN #if defined _MSC_VER @@ -159,7 +161,7 @@ static FILE *_tmpfile(void) static BOOL GetCrashDataPath( LPTSTR szBuffer ) { - OUString ustrValue("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"); + OUString ustrValue("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/bootstrap.ini:UserInstallation}"); ::rtl::Bootstrap::expandMacros( ustrValue ); if ( !ustrValue.isEmpty() ) diff --git a/cui/source/options/personalization.cxx b/cui/source/options/personalization.cxx index 453fc30e131a..b9c6aeeec3f2 100644 --- a/cui/source/options/personalization.cxx +++ b/cui/source/options/personalization.cxx @@ -7,6 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <config_folders.h> + #include "personalization.hxx" #include <comphelper/processfactory.hxx> @@ -276,7 +278,7 @@ bool SvxPersonalizationTabPage::CopyPersonaToGallery( const OUString &rURL ) return false; // copy the images to the user's gallery - OUString gallery = "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"; + OUString gallery = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"; rtl::Bootstrap::expandMacros( gallery ); gallery += "/user/gallery/personas/"; osl::Directory::createPath( gallery ); diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index d6434010e1ab..24d47a6721cb 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> #include "odbcconfig.hxx" @@ -343,7 +344,7 @@ bool OOdbcManagement::manageDataSources_async() // this is done in an external process, due to #i78733# // (and note this whole functionality is supported on Windows only, ATM) - OUString sExecutableName( "$BRAND_BASE_DIR/program/odbcconfig.exe" ); + OUString sExecutableName( "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/odbcconfig.exe" ); ::rtl::Bootstrap::expandMacros( sExecutableName ); //TODO: detect failure oslProcess hProcessHandle(0); oslProcessError eError = osl_executeProcess( sExecutableName.pData, NULL, 0, 0, NULL, NULL, NULL, 0, &hProcessHandle ); diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index b436adea9dfe..c11909f9edd9 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -18,6 +18,7 @@ */ #include <config_features.h> +#include <config_folders.h> #include "sal/config.h" @@ -240,10 +241,10 @@ void removeTree(OUString const & url) { // UserInstallation can be poisoned by old junk any more. bool cleanExtensionCache() { OUString buildId( - "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}"); + "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":buildid}"); rtl::Bootstrap::expandMacros(buildId); //TODO: detect failure OUString extDir( - "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") + "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}/user/extensions"); rtl::Bootstrap::expandMacros(extDir); //TODO: detect failure OUString buildIdFile(extDir + "/buildid"); diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx index fbaf3e1eae63..4f834d32c6f4 100644 --- a/desktop/source/app/check_ext_deps.cxx +++ b/desktop/source/app/check_ext_deps.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include "osl/file.hxx" #include "osl/mutex.hxx" @@ -346,7 +348,7 @@ static bool impl_needsCompatCheck() { bool bNeedsCheck = false; OUString aLastCheckBuildID; - OUString aCurrentBuildID( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}" ); + OUString aCurrentBuildID( "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":buildid}" ); rtl::Bootstrap::expandMacros( aCurrentBuildID ); try { diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index 4b50f844f7c2..817c9b4684c1 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include "sal/config.h" #include "com/sun/star/uno/Reference.hxx" @@ -60,7 +62,7 @@ OUString getLibreOfficeMajorMinorMicro() { OUString getReferenceOpenOfficeOrgMajorMinor() { OUString v( - "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") + "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":Version:ReferenceOOoMajorMinor}"); rtl::Bootstrap::expandMacros(v); //TODO: check for failure return v; diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index dadfe234e284..2f8eb55c679c 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include "dp_misc.h" #include "dp_version.hxx" #include "dp_interact.h" @@ -68,7 +70,7 @@ namespace { struct UnoRc : public rtl::StaticWithInit< boost::shared_ptr<rtl::Bootstrap>, UnoRc> { const boost::shared_ptr<rtl::Bootstrap> operator () () { - OUString unorc( "$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("uno") ); + OUString unorc( "$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("uno") ); ::rtl::Bootstrap::expandMacros( unorc ); ::boost::shared_ptr< ::rtl::Bootstrap > ret( new ::rtl::Bootstrap( unorc ) ); diff --git a/desktop/source/deployment/misc/dp_update.cxx b/desktop/source/deployment/misc/dp_update.cxx index 0a078fd3e499..fd4a76a8f9ea 100644 --- a/desktop/source/deployment/misc/dp_update.cxx +++ b/desktop/source/deployment/misc/dp_update.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include "dp_update.hxx" #include "dp_version.hxx" #include "dp_identifier.hxx" @@ -215,7 +217,7 @@ bool onlyBundledExtensions( OUString getExtensionDefaultUpdateURL() { OUString sUrl( - "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") + "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":Version:ExtensionUpdateURL}"); ::rtl::Bootstrap::expandMacros(sUrl); return sUrl; diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index db958cbe831f..5d7e8c0b38a0 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -7,6 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <config_folders.h> + #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -260,12 +262,12 @@ initialize_uno( const OUString &aAppURL ) rtl::Bootstrap::setIniFilename( aAppURL + "/fundamentalrc" ); rtl::Bootstrap::set( "CONFIGURATION_LAYERS", - "xcsxcu:${BRAND_BASE_DIR}/share/registry " - "res:${BRAND_BASE_DIR}/share/registry " -// "bundledext:${${BRAND_BASE_DIR}/program/unorc:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini " ); -// "sharedext:${${BRAND_BASE_DIR}/program/unorc:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini " -// "userext:${${BRAND_BASE_DIR}/program/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini " -// "user:${$BRAND_BASE_DIR/program/bootstraprc:UserInstallation}/user/registrymodifications.xcu" + "xcsxcu:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry " + "res:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry " +// "bundledext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/unorc:BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini " ); +// "sharedext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/unorc:SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini " +// "userext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/unorc:UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini " +// "user:${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/bootstraprc:UserInstallation}/user/registrymodifications.xcu" ); xContext = cppu::defaultBootstrap_InitialComponentContext(); diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index d79161eb8d89..2a72df64d377 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> #include "deployment.hrc" #include "unopkg_shared.h" @@ -421,7 +422,7 @@ Reference<XComponentContext> connectToOffice( OUString getLockFilePath() { OUString ret; - OUString sBootstrap("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}"); + OUString sBootstrap("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}"); rtl::Bootstrap::expandMacros(sBootstrap); OUString sAbs; if (::osl::File::E_None == ::osl::File::getAbsoluteFileURL( diff --git a/extensions/source/nsplugin/source/so_env.cxx b/extensions/source/nsplugin/source/so_env.cxx index b275ad4c7c09..b09f11ceb870 100644 --- a/extensions/source/nsplugin/source/so_env.cxx +++ b/extensions/source/nsplugin/source/so_env.cxx @@ -26,6 +26,8 @@ * ************************************************************************/ +#include <config_folders.h> + #include "sal/config.h" #include "nsp_func.hxx" @@ -179,7 +181,7 @@ int nspluginOOoModuleHook (void** aResult) char *clobber; static char realFileName[NPP_PATH_MAX] = {0}; -# define SEARCH_SUFFIX "/program/libnpsoplug" +# define SEARCH_SUFFIX "/" LIBO_LIB_FOLDER "/libnpsoplug" if (!(clobber = strstr (libFileName, SEARCH_SUFFIX))) { @@ -262,10 +264,10 @@ int findReadSversion(void** aResult, int /*bWnt*/, const char* /*tag*/, const ch } realFileName[len] = '\0'; - if (NULL == (pTempZero = strstr(realFileName, "/program/libnpsoplugin" SAL_DLLEXTENSION))) + if (NULL == (pTempZero = strstr(realFileName, "/" LIBO_LIB_FOLDER "/libnpsoplugin" SAL_DLLEXTENSION))) #else // LINUX if ((0 > readlink(lnkFileName, realFileName, NPP_PATH_MAX)) || - (NULL == (pTempZero = strstr(realFileName, "/program/libnpsoplugin" SAL_DLLEXTENSION)))) + (NULL == (pTempZero = strstr(realFileName, "/" LIBO_LIB_FOLDER "/libnpsoplugin" SAL_DLLEXTENSION)))) #endif // LINUX { *realFileName = 0; @@ -334,7 +336,7 @@ const char* findProgramDir() static char sProgram[NPP_BUFFER_SIZE] = {0}; if (!sProgram[0]) { - sprintf(sProgram, "%s/program", findInstallDir()); + sprintf(sProgram, "%s/" LIBO_BIN_FOLDER, findInstallDir()); #ifdef WNT UnixToDosPath(sProgram); #endif diff --git a/extensions/source/plugin/unx/sysplug.cxx b/extensions/source/plugin/unx/sysplug.cxx index d7140f1d3fb4..e20caa491c75 100644 --- a/extensions/source/plugin/unx/sysplug.cxx +++ b/extensions/source/plugin/unx/sysplug.cxx @@ -26,6 +26,7 @@ * ************************************************************************/ +#include <config_folders.h> #ifdef AIX #define _LINUX_SOURCE_COMPAT @@ -136,7 +137,7 @@ UnxPluginComm::~UnxPluginComm() bool UnxPluginComm::getPluginappPath(OString * path) { OSL_ASSERT(path != NULL); - OUString p("$BRAND_BASE_DIR/program/pluginapp.bin"); + OUString p("$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/pluginapp.bin"); rtl::Bootstrap::expandMacros(p); return (osl::FileBase::getSystemPathFromFileURL(p, p) == diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx index 52e0e628d998..782374fec1c9 100644 --- a/extensions/source/update/check/updatecheck.cxx +++ b/extensions/source/update/check/updatecheck.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> #include "updatecheck.hxx" @@ -99,7 +100,7 @@ namespace static inline OUString getBuildId() { - OUString aPathVal("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}"); + OUString aPathVal("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":buildid}"); rtl::Bootstrap::expandMacros(aPathVal); return aPathVal; } diff --git a/extensions/source/update/check/updateprotocol.cxx b/extensions/source/update/check/updateprotocol.cxx index 7ad265189832..7ef271aa1d40 100644 --- a/extensions/source/update/check/updateprotocol.cxx +++ b/extensions/source/update/check/updateprotocol.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <com/sun/star/xml/xpath/XPathAPI.hpp> #include "updateprotocol.hxx" @@ -50,17 +52,17 @@ getBootstrapData( OUString & rGitID, OUString & rInstallSetID) { - rGitID = "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":buildid}"; + rGitID = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":buildid}"; rtl::Bootstrap::expandMacros( rGitID ); if ( rGitID.isEmpty() ) return false; - rInstallSetID = "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateID}"; + rInstallSetID = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":UpdateID}"; rtl::Bootstrap::expandMacros( rInstallSetID ); if ( rInstallSetID.isEmpty() ) return false; - OUString aValue( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateURL}" ); + OUString aValue( "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":UpdateURL}" ); rtl::Bootstrap::expandMacros( aValue ); if( !aValue.isEmpty() ) diff --git a/extensions/source/update/feed/updatefeed.cxx b/extensions/source/update/feed/updatefeed.cxx index 82e4427283a9..961893055ec3 100644 --- a/extensions/source/update/feed/updatefeed.cxx +++ b/extensions/source/update/feed/updatefeed.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> #include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase3.hxx> @@ -348,7 +349,7 @@ UpdateInformationProvider::UpdateInformationProvider( } OUString product(buf.makeStringAndClear()); - OUString aUserAgent( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("version") ":UpdateUserAgent}" ); + OUString aUserAgent( "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ":UpdateUserAgent}" ); rtl::Bootstrap::expandMacros( aUserAgent ); for (sal_Int32 i = 0;;) { diff --git a/framework/inc/services/substitutepathvars.hxx b/framework/inc/services/substitutepathvars.hxx index 7604a879a2a4..085a99cb9e10 100644 --- a/framework/inc/services/substitutepathvars.hxx +++ b/framework/inc/services/substitutepathvars.hxx @@ -179,6 +179,7 @@ enum PreDefVariable PREDEFVAR_BASEINSTURL, PREDEFVAR_USERDATAURL, PREDEFVAR_BRANDBASEURL, + PREDEFVAR_SHARE_SUBDIR_NAME, PREDEFVAR_COUNT }; diff --git a/framework/source/services/license.cxx b/framework/source/services/license.cxx index 0d5a874256c6..86b2defa9226 100644 --- a/framework/source/services/license.cxx +++ b/framework/source/services/license.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <services/license.hxx> #include <threadhelp/resetableguard.hxx> #include <macros/debug.hxx> @@ -68,7 +70,7 @@ using ::Time; using ::DateTime; // license file name -static const char *szLicensePath = "/share/readme"; +static const char *szLicensePath = "/" LIBO_SHARE_FOLDER "/readme"; #ifdef UNX static const char *szUNXLicenseName = "/LICENSE"; static const char *szUNXLicenseExt = ""; diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index f47ed7bf9f7c..f1c4add2fd0a 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include "services/substitutepathvars.hxx" #include <threadhelp/resetableguard.hxx> #include <helper/networkdomain.hxx> @@ -102,6 +104,7 @@ #define VARIABLE_BASEINSTURL "$(baseinsturl)" #define VARIABLE_USERDATAURL "$(userdataurl)" #define VARIABLE_BRANDBASEURL "$(brandbaseurl)" +#define VARIABLE_SHARE_SUBDIR_NAME "$(share_subdir_name)" using namespace com::sun::star::uno; using namespace com::sun::star::beans; @@ -191,7 +194,8 @@ static const FixedVariable aFixedVarTable[] = // New variable of hierachy service (#i32656#) { VARIABLE_BASEINSTURL, PREDEFVAR_BASEINSTURL, REPLACELENGTH_BASEINSTURL,true }, { VARIABLE_USERDATAURL, PREDEFVAR_USERDATAURL, REPLACELENGTH_USERDATAURL,true }, - { VARIABLE_BRANDBASEURL,PREDEFVAR_BRANDBASEURL, RTL_CONSTASCII_LENGTH(VARIABLE_BRANDBASEURL), true } + { VARIABLE_BRANDBASEURL,PREDEFVAR_BRANDBASEURL, RTL_CONSTASCII_LENGTH(VARIABLE_BRANDBASEURL), true }, + { VARIABLE_SHARE_SUBDIR_NAME,PREDEFVAR_SHARE_SUBDIR_NAME, RTL_CONSTASCII_LENGTH(VARIABLE_SHARE_SUBDIR_NAME), false } }; //_________________________________________________________________________________________________________________ @@ -1113,6 +1117,8 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable rtl::Bootstrap::expandMacros( aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL]); + aPreDefPathVariables.m_FixedVar[PREDEFVAR_SHARE_SUBDIR_NAME] = rtl::OUString(LIBO_SHARE_FOLDER); + Any aAny; // Get inspath and userpath from bootstrap mechanism in every case as file URL @@ -1145,7 +1151,7 @@ void SubstitutePathVariables::SetPredefinedPathVariables( PredefinedPathVariable // Set $(prog), $(progpath), $(progurl) INetURLObject aProgObj( aPreDefPathVariables.m_FixedVar[PREDEFVAR_BRANDBASEURL] ); - if ( !aProgObj.HasError() && aProgObj.insertName( OUString("program") ) ) + if ( !aProgObj.HasError() && aProgObj.insertName( OUString(LIBO_BIN_FOLDER) ) ) { aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ] = aProgObj.GetMainURL(INetURLObject::NO_DECODE); aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGURL ] = aPreDefPathVariables.m_FixedVar[ PREDEFVAR_PROGPATH ]; diff --git a/i18nlangtag/source/languagetag/languagetag.cxx b/i18nlangtag/source/languagetag/languagetag.cxx index e4380357f5bd..585929bdbade 100644 --- a/i18nlangtag/source/languagetag/languagetag.cxx +++ b/i18nlangtag/source/languagetag/languagetag.cxx @@ -7,6 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <config_folders.h> + #include "i18nlangtag/languagetag.hxx" #include "i18nlangtag/mslangid.hxx" #include <rtl/ustrbuf.hxx> @@ -117,7 +119,7 @@ void LiblantagDataRef::teardown() void LiblantagDataRef::setupDataPath() { // maDataPath is assumed to be empty here. - OUString aURL("$BRAND_BASE_DIR/share/liblangtag"); + OUString aURL("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/liblangtag"); rtl::Bootstrap::expandMacros(aURL); //TODO: detect failure // Check if data is in our own installation, else assume system diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx index d1c26205d690..0e323cfb9f96 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> +#include <config_folders.h> #include "util.hxx" @@ -154,6 +156,9 @@ namespace static OUString sIni; OUStringBuffer buf( 255); buf.append( getLibraryLocation()); +#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE + buf.appendAscii( "/../" LIBO_ETC_FOLDER ); +#endif buf.appendAscii( SAL_CONFIGFILE("/sunjavaplugin") ); sIni = buf.makeStringAndClear(); JFW_TRACE2("[Java framework] sunjavaplugin: " diff --git a/jvmfwk/source/fwkutil.hxx b/jvmfwk/source/fwkutil.hxx index 0411869f8b72..4c9ac047d130 100644 --- a/jvmfwk/source/fwkutil.hxx +++ b/jvmfwk/source/fwkutil.hxx @@ -19,6 +19,9 @@ #ifndef INCLUDED_JVMFWK_FWKUTIL_HXX #define INCLUDED_JVMFWK_FWKUTIL_HXX +#include <config_features.h> +#include <config_folders.h> + #include "sal/config.h" #include "osl/mutex.hxx" #include "rtl/bootstrap.hxx" @@ -47,6 +50,9 @@ struct Bootstrap : const rtl::Bootstrap * operator () () { OUStringBuffer buf(256); buf.append(getLibraryLocation()); +#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE + buf.appendAscii( "/../" LIBO_ETC_FOLDER ); +#endif buf.appendAscii(SAL_CONFIGFILE("/jvmfwk3")); OUString sIni = buf.makeStringAndClear(); ::rtl::Bootstrap * bootstrap = new ::rtl::Bootstrap(sIni); diff --git a/liblangtag/ExternalPackage_langtag_data.mk b/liblangtag/ExternalPackage_langtag_data.mk index fde8eee39641..499223ae297e 100644 --- a/liblangtag/ExternalPackage_langtag_data.mk +++ b/liblangtag/ExternalPackage_langtag_data.mk @@ -9,8 +9,8 @@ $(eval $(call gb_ExternalPackage_ExternalPackage,langtag_data,langtag)) -$(eval $(call gb_ExternalPackage_add_files,langtag_data,unittest/install/share/liblangtag,data/language-subtag-registry.xml)) -$(eval $(call gb_ExternalPackage_add_files,langtag_data,unittest/install/share/liblangtag/common/bcp47,\ +$(eval $(call gb_ExternalPackage_add_files,langtag_data,unittest/install/$(LIBO_SHARE_FOLDER)/liblangtag,data/language-subtag-registry.xml)) +$(eval $(call gb_ExternalPackage_add_files,langtag_data,unittest/install/$(LIBO_SHARE_FOLDER)/liblangtag/common/bcp47,\ data/common/bcp47/calendar.xml \ data/common/bcp47/collation.xml \ data/common/bcp47/currency.xml \ @@ -23,6 +23,6 @@ $(eval $(call gb_ExternalPackage_add_files,langtag_data,unittest/install/share/l data/common/bcp47/transform_private_use.xml \ data/common/bcp47/variant.xml \ )) -$(eval $(call gb_ExternalPackage_add_files,langtag_data,unittest/install/share/liblangtag/common/supplemental,data/common/supplemental/likelySubtags.xml)) +$(eval $(call gb_ExternalPackage_add_files,langtag_data,unittest/install/$(LIBO_SHARE_FOLDER)/liblangtag/common/supplemental,data/common/supplemental/likelySubtags.xml)) # vim: set shiftwidth=4 tabstop=4 noexpandtab: diff --git a/officecfg/registry/data/org/openoffice/Office/Addons.xcu b/officecfg/registry/data/org/openoffice/Office/Addons.xcu index b01deb962e60..cecba99e6f20 100644 --- a/officecfg/registry/data/org/openoffice/Office/Addons.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Addons.xcu @@ -166,10 +166,10 @@ </prop> <node oor:name="UserDefinedImages"> <prop oor:name="ImageSmallURL"> - <value>vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/sc_arrowshapes.up-arrow.png</value> + <value>vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/sc_arrowshapes.up-arrow.png</value> </prop> <prop oor:name="ImageBigURL"> - <value>vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/lc_arrowshapes.up-arrow.png</value> + <value>vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/lc_arrowshapes.up-arrow.png</value> </prop> </node> </node> @@ -179,10 +179,10 @@ </prop> <node oor:name="UserDefinedImages"> <prop oor:name="ImageSmallURL"> - <value>vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/sc_arrowshapes.down-arrow.png</value> + <value>vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/sc_arrowshapes.down-arrow.png</value> </prop> <prop oor:name="ImageBigURL"> - <value>vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/lc_arrowshapes.down-arrow.png</value> + <value>vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/lc_arrowshapes.down-arrow.png</value> </prop> </node> </node> @@ -192,10 +192,10 @@ </prop> <node oor:name="UserDefinedImages"> <prop oor:name="ImageSmallURL"> - <value>vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/sc_arrowshapes.circular-leftarrow.png</value> + <value>vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/sc_arrowshapes.circular-leftarrow.png</value> </prop> <prop oor:name="ImageBigURL"> - <value>vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/lc_arrowshapes.circular-leftarrow.png</value> + <value>vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/lc_arrowshapes.circular-leftarrow.png</value> </prop> </node> </node> @@ -205,10 +205,10 @@ </prop> <node oor:name="UserDefinedImages"> <prop oor:name="ImageSmallURL"> - <value>vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/sc_arrowshapes.circular-arrow.png</value> + <value>vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/sc_arrowshapes.circular-arrow.png</value> </prop> <prop oor:name="ImageBigURL"> - <value>vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/lc_arrowshapes.circular-arrow.png</value> + <value>vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/lc_arrowshapes.circular-arrow.png</value> </prop> </node> </node> @@ -218,10 +218,10 @@ </prop> <node oor:name="UserDefinedImages"> <prop oor:name="ImageSmallURL"> - <value>vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/sc_runbasic.png</value> + <value>vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/sc_runbasic.png</value> </prop> <prop oor:name="ImageBigURL"> - <value>vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/lc_runbasic.png</value> + <value>vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/lc_runbasic.png</value> </prop> </node> </node> @@ -231,10 +231,10 @@ </prop> <node oor:name="UserDefinedImages"> <prop oor:name="ImageSmallURL"> - <value>vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/sc_basicstop.png</value> + <value>vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/sc_basicstop.png</value> </prop> <prop oor:name="ImageBigURL"> - <value>vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/lc_basicstop.png</value> + <value>vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/lc_basicstop.png</value> </prop> </node> </node> @@ -244,10 +244,10 @@ </prop> <node oor:name="UserDefinedImages"> <prop oor:name="ImageSmallURL"> - <value>vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/sc_navigationbarleft.png</value> + <value>vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/sc_navigationbarleft.png</value> </prop> <prop oor:name="ImageBigURL"> - <value>vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/lc_navigationbarleft.png</value> + <value>vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/lc_navigationbarleft.png</value> </prop> </node> </node> @@ -257,10 +257,10 @@ </prop> <node oor:name="UserDefinedImages"> <prop oor:name="ImageSmallURL"> - <value>vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/sc_newdoc.png</value> + <value>vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/sc_newdoc.png</value> </prop> <prop oor:name="ImageBigURL"> - <value>vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/lc_newdoc.png</value> + <value>vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/lc_newdoc.png</value> </prop> </node> </node> @@ -270,10 +270,10 @@ </prop> <node oor:name="UserDefinedImages"> <prop oor:name="ImageSmallURL"> - <value>vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/sc_editglossary.png</value> + <value>vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/sc_editglossary.png</value> </prop> <prop oor:name="ImageBigURL"> - <value>vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python/LibreLogo/icons/lc_editglossary.png</value> + <value>vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python/LibreLogo/icons/lc_editglossary.png</value> </prop> </node> </node> diff --git a/officecfg/registry/data/org/openoffice/Office/Impress.xcu b/officecfg/registry/data/org/openoffice/Office/Impress.xcu index ad5cbd9b1559..3f2e9a43debb 100644 --- a/officecfg/registry/data/org/openoffice/Office/Impress.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Impress.xcu @@ -202,7 +202,7 @@ </node> <node oor:name="Misc"> <prop oor:name="TransitionFiles" install:module="ogltrans"> - <value oor:separator=";">vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$BRAND_BASE_DIR/share/config/soffice.cfg/simpress/transitions-ogl.xml</value> + <value oor:separator=";">vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/simpress/transitions.xml;vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config/soffice.cfg/simpress/transitions-ogl.xml</value> </prop> </node> <node oor:name="Pictures" oor:op="fuse" oor:mandatory="true"> diff --git a/officecfg/registry/data/org/openoffice/Office/Paths.xcu b/officecfg/registry/data/org/openoffice/Office/Paths.xcu index a5c438da4dce..ace000205363 100644 --- a/officecfg/registry/data/org/openoffice/Office/Paths.xcu +++ b/officecfg/registry/data/org/openoffice/Office/Paths.xcu @@ -26,7 +26,7 @@ </node> <node oor:name="AutoCorrect" oor:op="fuse" oor:mandatory="true"> <node oor:name="InternalPaths"> - <node oor:name="$(insturl)/share/autocorr" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/autocorr" oor:op="fuse"/> </node> <prop oor:name="WritePath"> <value>$(userurl)/autocorr</value> @@ -34,7 +34,7 @@ </node> <node oor:name="AutoText" oor:op="fuse" oor:mandatory="true"> <node oor:name="InternalPaths"> - <node oor:name="$(insturl)/share/autotext/$(vlang)" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/autotext/$(vlang)" oor:op="fuse"/> </node> <prop oor:name="WritePath"> <value>$(userurl)/autotext</value> @@ -52,7 +52,7 @@ </node> <node oor:name="Basic" oor:op="fuse" oor:mandatory="true"> <node oor:name="InternalPaths"> - <node oor:name="$(insturl)/share/basic" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/basic" oor:op="fuse"/> </node> <prop oor:name="WritePath"> <value>$(userurl)/basic</value> @@ -60,12 +60,12 @@ </node> <node oor:name="Bitmap" oor:op="fuse" oor:mandatory="true"> <node oor:name="InternalPaths"> - <node oor:name="$(insturl)/share/config/symbol" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/config/symbol" oor:op="fuse"/> </node> </node> <node oor:name="Config" oor:op="fuse" oor:mandatory="true"> <node oor:name="InternalPaths"> - <node oor:name="$(insturl)/share/config" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/config" oor:op="fuse"/> </node> </node> <node oor:name="Favorite" oor:op="fuse" oor:mandatory="true"> @@ -80,7 +80,7 @@ </node> <node oor:name="Gallery" oor:op="fuse" oor:mandatory="true"> <node oor:name="InternalPaths"> - <node oor:name="$(insturl)/share/gallery" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/gallery" oor:op="fuse"/> </node> <prop oor:name="WritePath"> <value>$(userurl)/gallery</value> @@ -103,8 +103,8 @@ </node> <node oor:name="Linguistic" oor:op="fuse" oor:mandatory="true"> <node oor:name="InternalPaths"> - <node oor:name="$(insturl)/share/dict" oor:op="fuse"/> - <node oor:name="$(insturl)/share/dict/ooo" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/dict" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/dict/ooo" oor:op="fuse"/> </node> <prop oor:name="UserPaths"> <value>$(userurl)/wordbook</value> @@ -112,7 +112,7 @@ </node> <node oor:name="Dictionary" oor:op="fuse" oor:mandatory="true"> <node oor:name="InternalPaths"> - <node oor:name="$(insturl)/share/wordbook" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/wordbook" oor:op="fuse"/> </node> <prop oor:name="WritePath"> <value>$(userurl)/wordbook</value> @@ -135,7 +135,7 @@ </node> <node oor:name="Fingerprint" oor:op="fuse" oor:mandatory="true"> <node oor:name="InternalPaths"> - <node install:module="internallibexttextcatdata" oor:name="$(insturl)/share/fingerprint" oor:op="fuse"/> + <node install:module="internallibexttextcatdata" oor:name="$(insturl)/$(share_subdir_name)/fingerprint" oor:op="fuse"/> <node install:module="externallibexttextcatdata" oor:name="${SYSTEM_LIBEXTTEXTCAT_DATA}" oor:op="fuse"/> </node> </node> @@ -158,7 +158,7 @@ </node> <node oor:name="Template" oor:op="fuse" oor:mandatory="true"> <node oor:name="InternalPaths"> - <node oor:name="$(insturl)/share/template/$(vlang)" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/template/$(vlang)" oor:op="fuse"/> </node> <prop oor:name="WritePath"> <value>$(userurl)/template</value> @@ -166,7 +166,7 @@ </node> <node oor:name="UIConfig" oor:op="fuse" oor:mandatory="true"> <node oor:name="InternalPaths"> - <node oor:name="$(insturl)/share/config" oor:op="fuse"/> + <node oor:name="$(insturl)/$(share_subdir_name)/config" oor:op="fuse"/> </node> </node> <node oor:name="UserConfig" oor:op="fuse" oor:mandatory="true"> diff --git a/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu b/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu index 9484f0aa4ba8..70f0f097d9f2 100644 --- a/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu +++ b/officecfg/registry/data/org/openoffice/Office/WebWizard.xcu @@ -1241,12 +1241,12 @@ <node oor:name="BackgroundImages"> <node oor:name="1" oor:op="replace"> <prop oor:name="Href"> - <value>$(inst)/share/gallery/www-back/</value> + <value>$(inst)/$(share_subdir_name)/gallery/www-back/</value> </prop> </node> <node oor:name="2" oor:op="replace"> <prop oor:name="Href"> - <value>$(inst)/share/gallery/surface</value> + <value>$(inst)/$(share_subdir_name)/gallery/surface</value> </prop> </node> <node oor:name="3" oor:op="replace"> diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index 64661b5cd923..c1e96a153a22 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -1529,7 +1529,7 @@ <desc>Specifies the settings of the AutoCorrect dialog.</desc> </info> <value> - <it>$(insturl)/share/autocorr</it> + <it>$(insturl)/$(share_subdir_name)/autocorr</it> <it>$(userurl)/autocorr</it> </value> </prop> @@ -1539,7 +1539,7 @@ modules.</desc> </info> <value> - <it>$(insturl)/share/autotext/$(vlang)</it> + <it>$(insturl)/$(share_subdir_name)/autotext/$(vlang)</it> <it>$(userurl)/autotext</it> </value> </prop> @@ -1555,7 +1555,7 @@ AutoPilots.</desc> </info> <value> - <it>$(insturl)/share/basic</it> + <it>$(insturl)/$(share_subdir_name)/basic</it> <it>$(userurl)/basic</it> </value> </prop> @@ -1564,20 +1564,20 @@ <desc>Contains the bitmap files which can be used for menu and toolbar icons.</desc> </info> - <value>$(insturl)/share/config/symbol</value> + <value>$(insturl)/$(share_subdir_name)/config/symbol</value> </prop> <prop oor:name="Config" oor:type="xs:string" oor:nillable="false"> <info> <desc>Contains the configuration files. This value cannot be changed through the user interface.</desc> </info> - <value>$(insturl)/share/config</value> + <value>$(insturl)/$(share_subdir_name)/config</value> </prop> <prop oor:name="Dictionary" oor:type="xs:string" oor:nillable="false"> <info> <desc>Contains the provided dictionaries.</desc> </info> - <value>$(insturl)/share/wordbook</value> + <value>$(insturl)/$(share_subdir_name)/wordbook</value> </prop> <prop oor:name="Favorite" oor:type="xs:string" oor:nillable="false"> <info> @@ -1598,7 +1598,7 @@ and multimedia files.</desc> </info> <value> - <it>$(insturl)/share/gallery</it> + <it>$(insturl)/$(share_subdir_name)/gallery</it> <it>$(userurl)/gallery</it> </value> </prop> @@ -1620,7 +1620,7 @@ <desc>Contains the files that are necessary for the spellcheck.</desc> </info> - <value>$(insturl)/share/dict</value> + <value>$(insturl)/$(share_subdir_name)/dict</value> </prop> <prop oor:name="Module" oor:type="xs:string" oor:nillable="false"> <info> @@ -1665,8 +1665,8 @@ sub-folders.</desc> </info> <value> - <it>$(insturl)/share/template/$(vlang)</it> - <it>$(insturl)/share/template/common</it> + <it>$(insturl)/$(share_subdir_name)/template/$(vlang)</it> + <it>$(insturl)/$(share_subdir_name)/template/common</it> <it>$(userurl)/template</it> </value> </prop> @@ -1677,7 +1677,7 @@ merged from UserConfig and from these folders.</desc> </info> <value> - <it>$(insturl)/share/config</it> + <it>$(insturl)/$(share_subdir_name)/config</it> </value> </prop> <prop oor:name="UserConfig" oor:type="xs:string" oor:nillable="false"> @@ -1720,7 +1720,7 @@ AutoCorrect dialog.</desc> </info> <value> - <it>$(insturl)/share/autocorr</it> + <it>$(insturl)/$(share_subdir_name)/autocorr</it> <it>$(userurl)/autocorr</it> </value> </prop> @@ -1730,7 +1730,7 @@ located.</desc> </info> <value> - <it>$(insturl)/share/autotext/$(vlang)</it> + <it>$(insturl)/$(share_subdir_name)/autotext/$(vlang)</it> <it>$(userurl)/autotext</it> </value> </prop> @@ -1747,7 +1747,7 @@ the AutoPilots, are located.</desc> </info> <value> - <it>$(insturl)/share/basic</it> + <it>$(insturl)/$(share_subdir_name)/basic</it> <it>$(userurl)/basic</it> </value> </prop> @@ -1756,21 +1756,21 @@ <desc>Specifies the default directory where the bitmap files, which can be used for the menu and toolbar icons, are located.</desc> </info> - <value>$(insturl)/share/config/symbol</value> + <value>$(insturl)/$(share_subdir_name)/config/symbol</value> </prop> <prop oor:name="Config" oor:type="xs:string" oor:nillable="false"> <info> <desc>Specifies the default directory where the configuration files are stored.</desc> </info> - <value>$(insturl)/share/config</value> + <value>$(insturl)/$(share_subdir_name)/config</value> </prop> <prop oor:name="Dictionary" oor:type="xs:string" oor:nillable="false"> <info> <desc>Specifies the default directory where the provided dictionaries are located.</desc> </info> - <value>$(insturl)/share/wordbook/$(vlang)</value> + <value>$(insturl)/$(share_subdir_name)/wordbook/$(vlang)</value> </prop> <prop oor:name="Favorite" oor:type="xs:string" oor:nillable="false"> <info> @@ -1792,7 +1792,7 @@ multimedia files are located.</desc> </info> <value> - <it>$(insturl)/share/gallery</it> + <it>$(insturl)/$(share_subdir_name)/gallery</it> <it>$(userurl)/gallery</it> </value> </prop> @@ -1815,7 +1815,7 @@ <desc>Specifies the default directory where the files that are necessary for the spellcheck are saved.</desc> </info> - <value>$(insturl)/share/dict</value> + <value>$(insturl)/$(share_subdir_name)/dict</value> </prop> <prop oor:name="Module" oor:type="xs:string" oor:nillable="false"> <info> @@ -1853,8 +1853,8 @@ are located in folders and sub-folders.</desc> </info> <value> - <it>$(insturl)/share/template/$(vlang)</it> - <it>$(insturl)/share/template/common</it> + <it>$(insturl)/$(share_subdir_name)/template/$(vlang)</it> + <it>$(insturl)/$(share_subdir_name)/template/common</it> <it>$(userurl)/template</it> </value> </prop> diff --git a/pyuno/source/loader/pyuno_loader.cxx b/pyuno/source/loader/pyuno_loader.cxx index b9b53657ce04..375ea21d4562 100644 --- a/pyuno/source/loader/pyuno_loader.cxx +++ b/pyuno/source/loader/pyuno_loader.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <pyuno/pyuno.hxx> #include <osl/process.h> @@ -181,7 +183,7 @@ Reference< XInterface > CreateInstance( const Reference< XComponentContext > & c { OUString pythonPath; OUString pythonHome; - OUString path( "$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("pythonloader.uno" )); + OUString path( "$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("pythonloader.uno" )); rtl::Bootstrap::expandMacros(path); //TODO: detect failure rtl::Bootstrap bootstrap(path); diff --git a/pyuno/source/module/pyuno_module.cxx b/pyuno/source/module/pyuno_module.cxx index 1e812d1e28b3..fc6868ab70a4 100644 --- a/pyuno/source/module/pyuno_module.cxx +++ b/pyuno/source/module/pyuno_module.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> +#include <config_folders.h> + #include "pyuno_impl.hxx" #include <boost/unordered_map.hpp> @@ -268,6 +271,9 @@ static PyObject* getComponentContext( OUStringBuffer iniFileName; iniFileName.append( path ); +#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE + iniFileName.appendAscii( "/../" LIBO_ETC_FOLDER ); +#endif iniFileName.appendAscii( "/" ); iniFileName.appendAscii( SAL_CONFIGFILE( "pyuno" ) ); iniFile = iniFileName.makeStringAndClear(); diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx index 00252180764f..a7bb1f28dc35 100644 --- a/pyuno/source/module/pyuno_runtime.cxx +++ b/pyuno/source/module/pyuno_runtime.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> +#include <config_folders.h> + #include "pyuno_impl.hxx" #include <osl/thread.h> @@ -175,6 +178,9 @@ static void readLoggingConfig( sal_Int32 *pLevel, FILE **ppFile ) reinterpret_cast< oslGenericFunction >(readLoggingConfig), (rtl_uString **) &fileName ); fileName = OUString( fileName.getStr(), fileName.lastIndexOf( '/' )+1 ); +#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE + fileName += "../" LIBO_ETC_FOLDER "/"; +#endif fileName += OUString( SAL_CONFIGFILE("pyuno" )); rtl::Bootstrap bootstrapHandle( fileName ); diff --git a/sal/rtl/bootstrap.cxx b/sal/rtl/bootstrap.cxx index c6a2f74801f8..59529eef9dd9 100644 --- a/sal/rtl/bootstrap.cxx +++ b/sal/rtl/bootstrap.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> +#include <config_folders.h> #include "rtl/bootstrap.h" #include "rtl/bootstrap.hxx" @@ -287,6 +289,13 @@ static OUString & getIniFileName_Impl() // append config file suffix fileName += OUString(SAL_CONFIGFILE("")); + +#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE + // We keep only executables in the MacOS folder, and all + // rc files in LIBO_ETC_FOLDER (typically "Resources"). + sal_Int32 p = fileName.lastIndexOf( "/MacOS/" ); + fileName = fileName.replaceAt( p+1, strlen("MacOS"), LIBO_ETC_FOLDER ); +#endif } #endif diff --git a/scp2/InstallModule_base.mk b/scp2/InstallModule_base.mk index d9561421fd45..9449d805c251 100644 --- a/scp2/InstallModule_base.mk +++ b/scp2/InstallModule_base.mk @@ -11,10 +11,10 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/base)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/base,base)) -# Not sure about that? -#$(eval $(call gb_InstallModule_define_if_set,scp2/base,\ -# ENABLE_REPORTBUILDER \ -#)) +$(eval $(call gb_InstallModule_define_if_set,scp2/base,\ + ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ + ENABLE_MACOSX_SANDBOX \ +)) $(eval $(call gb_InstallModule_add_templates,scp2/base,\ scp2/source/templates/module_langpack_base \ diff --git a/scp2/InstallModule_calc.mk b/scp2/InstallModule_calc.mk index acb100942246..bb3b137dbed2 100644 --- a/scp2/InstallModule_calc.mk +++ b/scp2/InstallModule_calc.mk @@ -13,6 +13,8 @@ $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/calc,calc)) $(eval $(call gb_InstallModule_define_if_set,scp2/calc,\ ENABLE_LPSOLVE \ + ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ + ENABLE_MACOSX_SANDBOX \ SYSTEM_LPSOLVE \ )) diff --git a/scp2/InstallModule_draw.mk b/scp2/InstallModule_draw.mk index 63a29f823d0d..84359c99dc8c 100644 --- a/scp2/InstallModule_draw.mk +++ b/scp2/InstallModule_draw.mk @@ -9,6 +9,11 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/draw)) +$(eval $(call gb_InstallModule_define_if_set,scp2/draw,\ + ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ + ENABLE_MACOSX_SANDBOX \ +)) + $(eval $(call gb_InstallModule_add_templates,scp2/draw,\ scp2/source/templates/module_langpack_draw \ )) diff --git a/scp2/InstallModule_impress.mk b/scp2/InstallModule_impress.mk index 48b786da109a..d57dc3f34eca 100644 --- a/scp2/InstallModule_impress.mk +++ b/scp2/InstallModule_impress.mk @@ -12,6 +12,8 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/impress)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/impress,impress)) $(eval $(call gb_InstallModule_define_if_set,scp2/impress,\ + ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ + ENABLE_MACOSX_SANDBOX \ ENABLE_OPENGL \ )) diff --git a/scp2/InstallModule_math.mk b/scp2/InstallModule_math.mk index e25c25e3f388..5c9d214bbd60 100644 --- a/scp2/InstallModule_math.mk +++ b/scp2/InstallModule_math.mk @@ -11,6 +11,11 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/math)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/math,math)) +$(eval $(call gb_InstallModule_define_if_set,scp2/math,\ + ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ + ENABLE_MACOSX_SANDBOX \ +)) + $(eval $(call gb_InstallModule_add_templates,scp2/math,\ scp2/source/templates/module_langpack_math \ )) diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk index 611e252dc6c9..b21e7a2bb9ff 100644 --- a/scp2/InstallModule_ooo.mk +++ b/scp2/InstallModule_ooo.mk @@ -30,6 +30,8 @@ $(eval $(call gb_InstallModule_define_if_set,scp2/ooo,\ ENABLE_KDE4 \ ENABLE_LIBLANGTAG \ ENABLE_LPSOLVE \ + ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ + ENABLE_MACOSX_SANDBOX \ ENABLE_NPAPI_FROM_BROWSER \ ENABLE_NPAPI_INTO_BROWSER \ ENABLE_ONLINE_UPDATE \ diff --git a/scp2/InstallModule_ure.mk b/scp2/InstallModule_ure.mk index 621e103ca6a4..6e5534f8db4e 100644 --- a/scp2/InstallModule_ure.mk +++ b/scp2/InstallModule_ure.mk @@ -12,6 +12,7 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/ure)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/ure,ure)) $(eval $(call gb_InstallModule_define_if_set,scp2/ure,\ + ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ SYSTEM_LIBXML \ )) diff --git a/scp2/InstallModule_writer.mk b/scp2/InstallModule_writer.mk index afb0c06f8f75..26b94af649a8 100644 --- a/scp2/InstallModule_writer.mk +++ b/scp2/InstallModule_writer.mk @@ -11,6 +11,11 @@ $(eval $(call gb_InstallModule_InstallModule,scp2/writer)) $(eval $(call gb_InstallModule_use_auto_install_libs,scp2/writer,writer)) +$(eval $(call gb_InstallModule_define_if_set,scp2/writer,\ + ENABLE_MACOSX_MACLIKE_APP_STRUCTURE \ + ENABLE_MACOSX_SANDBOX \ +)) + $(eval $(call gb_InstallModule_add_templates,scp2/writer,\ scp2/source/templates/module_langpack_writer \ )) diff --git a/scp2/inc/macros.inc b/scp2/inc/macros.inc index 6a4b19a8d6a5..fabb82ddb4d8 100755 --- a/scp2/inc/macros.inc +++ b/scp2/inc/macros.inc @@ -75,6 +75,26 @@ #define SPECIAL_COMPONENT_LIB_NAME(name) STRING(CONCAT2(name,.dll)) #endif +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + #define GID_BRAND_DIR_ETC gid_Brand_Dir_Share + #define GID_DIR_PY gid_Brand_Dir_Share + #define GID_DIR_URE gid_Dir_Bundle_Contents + #define GID_DIR_URE_BIN gid_Brand_Dir_Program + #define GID_DIR_URE_JAVA gid_Dir_Classes + #define GID_DIR_URE_LIB gid_Dir_Frameworks + #define GID_DIR_URE_SHARE gid_Brand_Dir_Share_Ure + #define GID_DIR_URE_SHARE_MISC gid_Brand_Dir_Share_Ure +#else + #define GID_BRAND_DIR_ETC gid_Brand_Dir_Program + #define GID_DIR_PY gid_Brand_Dir_Program + #define GID_DIR_URE gid_Dir_Common_Ure + #define GID_DIR_URE_BIN gid_Dir_Ure_Bin + #define GID_DIR_URE_JAVA gid_Dir_Ure_Java + #define GID_DIR_URE_LIB gid_Dir_Ure_Lib + #define GID_DIR_URE_SHARE gid_Dir_Ure_Share + #define GID_DIR_URE_SHARE_MISC gid_Dir_Ure_Misc +#endif + #define RESFILENAME(name,lang) STRING(CONCAT3(name,lang,.res)) #define READMETXTFILENAME(name,lang,ext) STRING(CONCAT4(name,lang,.,ext)) #define READMEFILENAME(name,lang) STRING(CONCAT2(name,lang)) @@ -84,6 +104,12 @@ #define SCP2_OOO_BIN_DIR gid_Brand_Dir_Program +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + #define SCP2_OOO_LIB_DIR gid_Dir_Frameworks +#else + #define SCP2_OOO_LIB_DIR SCP2_OOO_BIN_DIR +#endif + #define BIN_FILE_BODY \ UnixRights = 755 @@ -117,7 +143,7 @@ #define PACKED_LIB_FILE_BODY \ LIB_FILE_BODY; \ Styles = (PACKED); \ - Dir = SCP2_OOO_BIN_DIR + Dir = SCP2_OOO_LIB_DIR #define LIBO_LIB_FILE(id,name) \ File id \ @@ -190,6 +216,13 @@ PACKED_LIB_FILE_BODY; \ End +#define STD_PY_FILE(id,name) \ + File id \ + PACKED_TXT_FILE_BODY; \ + Dir = GID_DIR_PY; \ + Name = name; \ + End + // --------------------------------------- #define CONDITIONAL_MODULE_ENTRY(name,modid) \ Module gid_Module_Root_Reg_##name \ @@ -396,7 +429,7 @@ End #define SCP2_URE_DL_UNO_COMID_VER(n, v) n v STRING(COMID) ".dll" #define SCP2_URE_SHARE_DIR gid_Dir_Common_Ure #else -#define SCP2_URE_DL_DIR gid_Dir_Ure_Lib +#define SCP2_URE_DL_DIR GID_DIR_URE_LIB #define SCP2_URE_DL_NORMAL(n) "lib" n STRING(UNXSUFFIX) #define SCP2_URE_DL_BARE(n) n STRING(UNXSUFFIX) #define SCP2_URE_DL_VER(n, v) "lib" n STRING(UNXSUFFIX) "." v @@ -410,7 +443,7 @@ End "libuno_" n STRING(COMID) STRING(UNXSUFFIX) "." v #define SCP2_URE_DL_UNO_COMID_NORMAL(n) \ "libuno_" n STRING(COMID) STRING(UNXSUFFIX) -#define SCP2_URE_SHARE_DIR gid_Dir_Ure_Share +#define SCP2_URE_SHARE_DIR GID_DIR_URE_SHARE #endif #if defined MACOSX #define SCP2_URE_JDL_NORMAL(n) "lib" n ".jnilib" diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp index a6b8f12dcde9..8ea797982a77 100644 --- a/scp2/source/ooo/common_brand.scp +++ b/scp2/source/ooo/common_brand.scp @@ -27,6 +27,8 @@ #include "macros.inc" +#include "config_folders.h" + Module gid_Module_Root_Brand ParentID = gid_Module_Root; InstallOrder = "150"; @@ -42,6 +44,7 @@ Module gid_Module_Root_Brand gid_Brand_Dir_Share_Extensions, gid_Brand_Dir_Share_Uno_Packages, gid_Brand_Dir_Share_Uno_Packages_Cache, + gid_Brand_Dir_Share_Ure, gid_Brand_Dir_Share_Glade, gid_Brand_Dir_Share_Labels, gid_Brand_Dir_Share_Registry, @@ -87,9 +90,11 @@ Module gid_Module_Root_Brand git_License_Odt, gid_Credits_Odt, gid_Apache_Notice); +#if defined MACOSX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE Unixlinks = (gid_Brand_Unixlink_Program, gid_Brand_Unixlink_Unopkg, gid_Brand_Unixlink_Urelibs); +#endif End // Language specific brand module @@ -121,7 +126,11 @@ Directory gid_Brand_Dir_Program End Directory gid_Brand_Dir_Program_Shell +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + ParentID = gid_Brand_Dir_Share; +#else ParentID = gid_Brand_Dir_Program; +#endif DosName = "shell"; End @@ -140,7 +149,7 @@ Directory gid_Brand_Dir_Share #else ParentID = gid_Dir_Brand_Root; #endif - DosName = "share"; + DosName = LIBO_SHARE_FOLDER; End Directory gid_Brand_Dir_Share_Config @@ -431,6 +440,15 @@ Directory gid_Brand_Dir_Share_Labels DosName = "labels"; End +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + +Directory gid_Brand_Dir_Share_Ure + ParentID = gid_Brand_Dir_Share; + DosName = "ure"; +End + +#endif + Directory gid_Brand_Dir_Share_Registry ParentID = gid_Brand_Dir_Share; DosName = "registry"; @@ -445,7 +463,7 @@ End // UnixLinks -#if defined MACOSX +#if defined MACOSX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE Unixlink gid_Brand_Unixlink_Urelibs Dir = gid_Brand_Dir_Program; Name = "urelibs"; @@ -453,7 +471,7 @@ Unixlink gid_Brand_Unixlink_Urelibs End #endif -#if defined MACOSX +#if defined MACOSX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE Unixlink gid_Brand_Unixlink_Program BIN_FILE_BODY; Dir = gid_Dir_Bundle_Contents; @@ -476,7 +494,7 @@ File gid_Brand_File_Html_Thirdpartylicensereadme TXT_FILE_BODY; End -#if defined UNX +#if defined UNX && !defined ENABLE_MACOSX_SANDBOX File gid_Brand_File_Gdb_Trace TXT_FILE_BODY; @@ -573,7 +591,7 @@ File gid_Brand_File_Script_Unopkg End #endif -#if defined MACOSX +#if defined MACOSX && !defined ENABLE_MACOSX_SANDBOX Unixlink gid_Brand_Unixlink_Unopkg BIN_FILE_BODY; Dir = gid_Brand_Dir_Program; @@ -745,35 +763,35 @@ End Profile gid_Brand_Profile_Bootstrap_Ini ModuleID = gid_Module_Root_Brand; Name = PROFILENAME(bootstrap); - Dir = gid_Brand_Dir_Program; + Dir = GID_BRAND_DIR_ETC; Styles = (NETWORK); End Profile gid_Brand_Profile_Soffice_Ini ModuleID = gid_Module_Root_Brand; Name = PROFILENAME(soffice); - Dir = gid_Brand_Dir_Program; + Dir = GID_BRAND_DIR_ETC; Styles = (NETWORK); End Profile gid_Brand_Profile_Setup_Ini ModuleID = gid_Module_Root_Brand; Name = PROFILENAME(setup); - Dir = gid_Brand_Dir_Program; + Dir = GID_BRAND_DIR_ETC; Styles = (NETWORK); End Profile gid_Brand_Profile_Version_Ini ModuleID = gid_Module_Root_Brand; Name = PROFILENAME(version); - Dir = gid_Brand_Dir_Program; + Dir = GID_BRAND_DIR_ETC; Styles = (NETWORK); End Profile gid_Brand_Profile_Fundamental_Ini ModuleID = gid_Module_Root_Brand; Name = PROFILENAME(fundamental); - Dir = gid_Brand_Dir_Program; + Dir = GID_BRAND_DIR_ETC; End #if !defined MACOSX @@ -1084,12 +1102,28 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir Value = "${ORIGIN}/.."; End +ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Share_Subdir + ModuleID = gid_Module_Root_Brand; + ProfileID = gid_Brand_Profile_Fundamental_Ini; + Section = "Bootstrap"; + Key = "BRAND_SHARE_SUBDIR"; + Value = LIBO_SHARE_FOLDER; +End + +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; +End + ProfileItem gid_Brand_Profileitem_Fundamental_Lo_Lib_Dir ModuleID = gid_Module_Root_Brand; ProfileID = gid_Brand_Profile_Fundamental_Ini; Section = "Bootstrap"; Key = "LO_LIB_DIR"; - Value = "${BRAND_BASE_DIR}/program"; + Value = "${BRAND_BASE_DIR}/" LIBO_LIB_FOLDER; End ProfileItem gid_Brand_Profileitem_Fundamental_Lo_Java_Dir @@ -1097,7 +1131,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Lo_Java_Dir ProfileID = gid_Brand_Profile_Fundamental_Ini; Section = "Bootstrap"; Key = "LO_JAVA_DIR"; - Value = "${BRAND_BASE_DIR}/program/classes"; + Value = "${BRAND_BASE_DIR}/" LIBO_SHARE_JAVA_FOLDER; End ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions @@ -1185,7 +1219,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 = "${BRAND_BASE_DIR}/share/config/javasettings_${_OS}_${_ARCH}.xml"; + Value = "${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/config/javasettings_${_OS}_${_ARCH}.xml"; End ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Jfw_User_Data @@ -1193,7 +1227,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 = "${${BRAND_BASE_DIR}/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/config/javasettings_${_OS}_${_ARCH}.xml"; + Value = "${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/config/javasettings_${_OS}_${_ARCH}.xml"; End ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Java_Classpath_Urls @@ -1236,7 +1270,7 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Configuration_Layers ModuleID = gid_Module_Root_Brand; Section = "Bootstrap"; Key = "CONFIGURATION_LAYERS"; - Value = "xcsxcu:${BRAND_BASE_DIR}/share/registry res:${BRAND_BASE_DIR}/share/registry bundledext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini userext:${${BRAND_BASE_DIR}/program/" PROFILENAME(uno) ":UNO_USER_PACKAGES_CACHE}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini user:${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/registrymodifications.xcu"; + Value = "xcsxcu:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry res:${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/registry bundledext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(uno) ":BUNDLED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini sharedext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(uno) ":SHARED_EXTENSIONS_USER}/registry/com.sun.star.comp.deployment.configuration.PackageRegistryBackend/configmgr.ini userext:${${BRAND_BASE_DIR}/" LIBO_ETC_FOLDER "/" PROFILENAME(uno) ":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"; End #if !defined MACOSX diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp index 26475611a666..3a099a25293e 100644 --- a/scp2/source/ooo/directory_ooo.scp +++ b/scp2/source/ooo/directory_ooo.scp @@ -69,7 +69,11 @@ End Directory gid_Dir_Wizards Styles = (CREATE); +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + ParentID = gid_Brand_Dir_Share; +#else ParentID = gid_Brand_Dir_Program; +#endif DosName = "wizards"; End @@ -80,13 +84,22 @@ Directory gid_Dir_Wizards_Ui End Directory gid_Dir_Resource +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + ParentID = gid_Brand_Dir_Share; +#else ParentID = gid_Brand_Dir_Program; +#endif DosName = "resource"; End Directory gid_Dir_Classes +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + ParentID = gid_Brand_Dir_Share; + DosName = "java"; +#else ParentID = gid_Brand_Dir_Program; DosName = "classes"; +#endif End #ifdef WNT @@ -592,11 +605,19 @@ Directory gid_Dir_Template_Common_Presnt End Directory gid_Brand_Dir_Program_Services +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + ParentID = gid_Brand_Dir_Share; +#else ParentID = gid_Brand_Dir_Program; +#endif DosName = "services"; End Directory gid_Brand_Dir_Program_Types +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + ParentID = gid_Brand_Dir_Share; +#else ParentID = gid_Brand_Dir_Program; +#endif DosName = "types"; End diff --git a/scp2/source/ooo/directory_ooo_macosx.scp b/scp2/source/ooo/directory_ooo_macosx.scp index fdc51f102b91..6cd14ab17cf2 100644 --- a/scp2/source/ooo/directory_ooo_macosx.scp +++ b/scp2/source/ooo/directory_ooo_macosx.scp @@ -30,4 +30,9 @@ Directory gid_Dir_Bundle_Contents HostName = "Contents"; Styles = (OFFICEDIRECTORY); End + +Directory gid_Dir_Frameworks + ParentID = gid_Dir_Bundle_Contents; + DosName = "Frameworks"; +End #endif diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp index b0be7e147ebe..c53de33e7bf8 100644 --- a/scp2/source/ooo/file_library_ooo.scp +++ b/scp2/source/ooo/file_library_ooo.scp @@ -28,18 +28,14 @@ #if defined SOLAR_JAVA && defined WNT File gid_File_Lib_Accessbridge - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; Name = "java_uno_accessbridge.dll"; End #endif #ifndef SYSTEM_CLUCENE File gid_File_Lib_CLucene - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; #ifdef UNX Name = STRING(CONCAT2(libclucene,UNXSUFFIX)); #else @@ -124,9 +120,7 @@ End #ifdef WNT File gid_File_Lib_Dnd - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; Name = "dnd.dll"; End @@ -135,10 +129,8 @@ End #ifdef WNT File gid_File_Lib_Dtrans - LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; Name = "dtrans.dll"; - Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED); End #endif @@ -151,9 +143,7 @@ SPECIAL_LIB_FILE(gid_File_Lib_Emboleobj,emboleobj) #if defined(WNT) && !defined(DISABLE_ATL) File gid_File_Lib_Inprocserv - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; Name = "inprocserv.dll"; End @@ -163,16 +153,12 @@ End #ifdef MACOSX File gid_File_Lib_Macab_1 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; Name = STRING(CONCAT2(libmacab1,UNXSUFFIX)); End File gid_File_Lib_Macab_Drv_1 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; Name = STRING(CONCAT2(libmacabdrv1,UNXSUFFIX)); End #endif // #ifdef MACOSX @@ -182,9 +168,7 @@ End #ifdef WNT File gid_File_Lib_Fps - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; Name = "fps.dll"; End @@ -213,10 +197,8 @@ End #ifdef MACOSX #ifndef X86_64 File gid_File_Lib_avmediaQuickTime - LIB_FILE_BODY; - Styles = (PACKED); + PACKED_LIB_FILE_BODY; Name = LIBNAME(avmediaQuickTime); - Dir = SCP2_OOO_BIN_DIR; End #endif #endif @@ -224,9 +206,7 @@ End #ifndef SYSTEM_LCMS2 File gid_File_Lib_Lcms2 - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; #ifdef UNX #ifdef MACOSX Name = STRING(CONCAT3(liblcms2,.2,UNXSUFFIX)); @@ -247,9 +227,7 @@ End #ifdef NEED_CAIRO File gid_File_Lib_Cairo - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; #ifdef UNX #ifdef MACOSX Name = STRING(CONCAT3(libcairo,.2,UNXSUFFIX)); @@ -268,9 +246,7 @@ End #ifndef WNT File gid_File_Lib_Pixman - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; #ifdef UNX #ifdef MACOSX Name = STRING(CONCAT2(libpixman-1,UNXSUFFIX)); @@ -287,9 +263,7 @@ End #ifdef WNT File gid_File_Lib_Ftransl - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; Name = "ftransl.dll"; End @@ -298,7 +272,7 @@ End #ifndef SYSTEM_ICU File gid_File_Lib_Icudata - LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; #ifdef UNX Name = STRING(CONCAT6(libicudata,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); #else @@ -308,12 +282,10 @@ File gid_File_Lib_Icudata Name = STRING(CONCAT3(icudt,ICU_MAJOR,.dll)); #endif // MSVC_PKG_DEBUG_RUNTIME #endif - Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED); End File gid_File_Lib_Icui18n - LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; #ifdef UNX Name = STRING(CONCAT6(libicui18n,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); #else @@ -323,12 +295,10 @@ File gid_File_Lib_Icui18n Name = STRING(CONCAT3(icuin,ICU_MAJOR,.dll)); #endif // MSVC_PKG_DEBUG_RUNTIME #endif - Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED); End File gid_File_Lib_Icuuc - LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; #ifdef UNX Name = STRING(CONCAT6(libicuuc,UNXSUFFIX,.,ICU_MAJOR,.,ICU_MINOR)); #else @@ -338,8 +308,6 @@ File gid_File_Lib_Icuuc Name = STRING(CONCAT3(icuuc,ICU_MAJOR,.dll)); #endif // MSVC_PKG_DEBUG_RUNTIME #endif - Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED); End #endif @@ -349,7 +317,7 @@ End File gid_File_Lib_sn_tools LIB_FILE_BODY; Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY, DONTRENAMEINPATCH); - Dir = SCP2_OOO_BIN_DIR; + Dir = SCP2_OOO_LIB_DIR; Name = "sn_tools.dll"; End @@ -365,9 +333,7 @@ STD_LIB_FILE(gid_File_Lib_Mozabdrv,mozabdrv) #else File gid_File_Lib_Mozbootstrap - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; Name = "mozbootstrap.dll"; End @@ -386,7 +352,7 @@ SPECIAL_LIB_FILE(gid_File_Lib_Mozbootstrap,mozbootstrap) File gid_File_Lib_Officebean TXT_FILE_BODY; Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + Dir = SCP2_OOO_LIB_DIR; #ifdef UNX Name = STRING(CONCAT2(libofficebean,UNXSUFFIX)); #else @@ -405,25 +371,19 @@ STD_LIB_FILE( gid_File_Lib_Pl , pl) #ifdef ENABLE_TDE File gid_File_Lib_Vclplug_Tde Name = LIBNAME(vclplug_tde); - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; End #endif #ifdef ENABLE_KDE File gid_File_Lib_Vclplug_Kde Name = LIBNAME(vclplug_kde); - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; End #endif #ifdef ENABLE_KDE4 File gid_File_Lib_Vclplug_Kde4 Name = LIBNAME(vclplug_kde4); - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; End #endif #endif @@ -431,9 +391,7 @@ End #if defined(MACOSX) File gid_File_Lib_Basebmp Name = LIBNAME(basebmp); - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; End #endif @@ -447,9 +405,7 @@ STD_LIB_FILE( gid_File_Lib_BaseBmp, basebmp ) #if defined UNX && ! defined MACOSX File gid_File_Lib_Recentfile - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; Name = STRING(CONCAT2(librecentfile,UNXSUFFIX)); End @@ -471,7 +427,6 @@ File gid_File_Lib_Qslnkmsi Name = "qslnkmsi.dll"; End - File gid_File_Lib_Sdqsmsi LIB_FILE_BODY; Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY); @@ -498,18 +453,14 @@ End File gid_File_Lib_Spa Name = LIBNAME(spa); - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; End #endif File gid_File_Lib_Spell - LIB_FILE_BODY; - Styles = (PACKED); + PACKED_LIB_FILE_BODY; Name = LIBNAME(spell); - Dir = SCP2_OOO_BIN_DIR; End #if defined UNX && !defined MACOSX && !defined LIBO_HEADLESS @@ -518,9 +469,7 @@ STD_LIB_FILE( gid_File_Lib_Spl_Unx, spl_unx) #if ! defined UNX File gid_File_Lib_Sysdtrans - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; Name = "sysdtrans.dll"; End #endif @@ -559,23 +508,19 @@ SPECIAL_LIB_FILE(gid_File_Lib_Ssl3,ssl3) #endif //SYSTEM_NSS File gid_File_Lib_XSec_XmlSec - LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; #ifdef UNX Name = STRING(CONCAT2(libxsec_xmlsec,UNXSUFFIX)); #else Name = "xsec_xmlsec.dll"; #endif - Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED); End #endif #ifndef SYSTEM_LIBXSLT File gid_File_Lib_Xslt - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; #ifdef UNX #ifdef MACOSX Name = STRING(CONCAT4(libxslt,.,LIBXSLT_MAJOR,UNXSUFFIX)); @@ -591,9 +536,7 @@ File gid_File_Lib_Xslt #endif End File gid_File_Lib_eXslt - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; #ifdef UNX #ifdef MACOSX Name = STRING(CONCAT4(libexslt,.,0,UNXSUFFIX)); @@ -612,46 +555,38 @@ End #ifdef WNT File gid_File_Lib_LibXMLSec_xmlseccore - LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; #ifdef _gcc3 Name = "libxmlsec1.dll"; #else Name = "libxmlsec.dll"; #endif - Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED); End #ifdef CROSS_COMPILING File gid_File_Lib_LibXMLSec_xmlsecnss - LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; #ifdef _gcc3 Name = "libxmlsec1-nss.dll"; #else Name = "libxmlsec-nss.dll"; #endif - Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED); End #else File gid_File_Lib_LibXMLSec_xmlsecmscrypto - LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; #ifdef _gcc3 Name = "libxmlsec1-mscrypto.dll"; #else Name = "libxmlsec-mscrypto.dll"; #endif - Dir = SCP2_OOO_BIN_DIR; - Styles = (PACKED); End #endif #endif #ifndef SYSTEM_OPENSSL File gid_File_Lib_Openssl - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; #ifdef WNT Name = "ssleay32.dll"; #endif @@ -660,9 +595,7 @@ End #ifndef SYSTEM_OPENSSL File gid_File_Lib_Crypto - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; #ifdef WNT Name = "libeay32.dll"; @@ -695,9 +628,7 @@ End #ifndef SYSTEM_REDLAND File gid_File_Lib_Raptor - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; #ifdef UNX #ifdef MACOSX Name = STRING(CONCAT4(libraptor2-lo,.,RAPTOR_MAJOR,UNXSUFFIX)); @@ -714,9 +645,7 @@ File gid_File_Lib_Raptor End File gid_File_Lib_Rasqal - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; #ifdef UNX #ifdef MACOSX Name = STRING(CONCAT4(librasqal-lo,.,RASQAL_MAJOR,UNXSUFFIX)); @@ -733,9 +662,7 @@ File gid_File_Lib_Rasqal End File gid_File_Lib_Rdf - LIB_FILE_BODY; - Styles = (PACKED); - Dir = SCP2_OOO_BIN_DIR; + PACKED_LIB_FILE_BODY; #ifdef UNX #ifdef MACOSX Name = STRING(CONCAT4(librdf-lo,.,REDLAND_MAJOR,UNXSUFFIX)); diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp index f51f0a6e45c2..8972d34f4f3f 100644 --- a/scp2/source/ooo/file_ooo.scp +++ b/scp2/source/ooo/file_ooo.scp @@ -139,7 +139,7 @@ File gid_File_Bin_UIPreviewer #endif End -#ifdef UNX +#if defined UNX && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE File gid_File_Script_Gengal BIN_FILE_BODY; diff --git a/scp2/source/ooo/profile_ooo.scp b/scp2/source/ooo/profile_ooo.scp index 791952d95bdc..a5bb3e896d7e 100644 --- a/scp2/source/ooo/profile_ooo.scp +++ b/scp2/source/ooo/profile_ooo.scp @@ -20,11 +20,7 @@ Profile gid_Profile_Uno_Ini ModuleID = gid_Module_Root; - #ifdef UNX - Name = "unorc"; - #else - Name = "uno.ini"; - #endif - Dir = gid_Brand_Dir_Program; + Name = PROFILENAME(uno); + Dir = GID_BRAND_DIR_ETC; Styles = (NETWORK); End diff --git a/scp2/source/ooo/profileitem_ooo.scp b/scp2/source/ooo/profileitem_ooo.scp index 03943690a5d5..5709a7378c67 100644 --- a/scp2/source/ooo/profileitem_ooo.scp +++ b/scp2/source/ooo/profileitem_ooo.scp @@ -18,6 +18,8 @@ #include "macros.inc" +#include "config_folders.h" + ProfileItem gid_Profileitem_Setup_Uno_Services ProfileID = gid_Profile_Setup_Ini; ModuleID = gid_Module_Root; @@ -100,7 +102,7 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions Section = "Bootstrap"; Order = 1; Key = "BUNDLED_EXTENSIONS"; - Value = "$BRAND_BASE_DIR/share/extensions"; + Value = "$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/extensions"; End ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_User @@ -109,7 +111,7 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Extensions_User Section = "Bootstrap"; Order = 1; Key = "BUNDLED_EXTENSIONS_USER"; - Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bundled"; + Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bundled"; End ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages @@ -118,7 +120,7 @@ ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages Section = "Bootstrap"; Order = 1; Key = "UNO_SHARED_PACKAGES"; - Value = "$BRAND_BASE_DIR/share/uno_packages"; + Value = "$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/uno_packages"; End ProfileItem gid_Profileitem_Uno_Uno_Shared_Packages_Cache @@ -136,7 +138,7 @@ ProfileItem gid_Profileitem_Uno_Uno_Shared_Extensions_User Section = "Bootstrap"; Order = 1; Key = "SHARED_EXTENSIONS_USER"; - Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/shared"; + Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/shared"; End ProfileItem gid_Profileitem_Uno_Uno_User_Packages @@ -145,7 +147,7 @@ ProfileItem gid_Profileitem_Uno_Uno_User_Packages Section = "Bootstrap"; Order = 3; Key = "UNO_USER_PACKAGES"; - Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/uno_packages"; + Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/uno_packages"; End ProfileItem gid_Profileitem_Uno_Uno_Bundled_Tmp_Extensions @@ -154,7 +156,7 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Tmp_Extensions Section = "Bootstrap"; Order = 1; Key = "TMP_EXTENSIONS"; - Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/tmp"; + Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/tmp"; End ProfileItem gid_Profileitem_Uno_Uno_Bundled_Bak_Extensions @@ -163,7 +165,7 @@ ProfileItem gid_Profileitem_Uno_Uno_Bundled_Bak_Extensions Section = "Bootstrap"; Order = 1; Key = "BAK_EXTENSIONS"; - Value = "${$BRAND_BASE_DIR/program/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bak"; + Value = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" PROFILENAME(bootstrap) ":UserInstallation}/user/extensions/bak"; End ProfileItem gid_Profileitem_Uno_Uno_User_Packages_Cache diff --git a/scp2/source/ooo/shortcut_ooo.scp b/scp2/source/ooo/shortcut_ooo.scp index 963bf9c41e93..99e65909239f 100644 --- a/scp2/source/ooo/shortcut_ooo.scp +++ b/scp2/source/ooo/shortcut_ooo.scp @@ -19,11 +19,12 @@ #include "macros.inc" #ifdef UNX +#ifndef ENABLE_MACOSX_MACLIKE_APP_STRUCTURE #ifndef SYSTEM_ICU Shortcut gid_Shortcut_Lib_Icudata FileID = gid_File_Lib_Icudata; - Dir = SCP2_OOO_BIN_DIR; + Dir = SCP2_OOO_LIB_DIR; #ifndef AIX Name = STRING(CONCAT4(libicudata,UNXSUFFIX,.,ICU_MAJOR)); #else @@ -34,7 +35,7 @@ End Shortcut gid_Shortcut_Lib_Icui18n FileID = gid_File_Lib_Icui18n; - Dir = SCP2_OOO_BIN_DIR; + Dir = SCP2_OOO_LIB_DIR; #ifndef AIX Name = STRING(CONCAT4(libicui18n,UNXSUFFIX,.,ICU_MAJOR)); #else @@ -45,7 +46,7 @@ End Shortcut gid_Shortcut_Lib_Icuuc FileID = gid_File_Lib_Icuuc; - Dir = SCP2_OOO_BIN_DIR; + Dir = SCP2_OOO_LIB_DIR; #ifndef AIX Name = STRING(CONCAT4(libicuuc,UNXSUFFIX,.,ICU_MAJOR)); #else @@ -58,6 +59,8 @@ End #endif +#endif + #ifdef MACOSX #ifdef SOLAR_JAVA @@ -65,7 +68,7 @@ End // auto_ooo_lib_hsqldb defined in gbuild ($(WORKDIR)/AutoInstall/ooo) Shortcut gid_Shortcut_Lib_Hsqldb_2 FileID = auto_ooo_lib_hsqldb; - Dir = SCP2_OOO_BIN_DIR; + Dir = SCP2_OOO_LIB_DIR; Name = "libhsqldb.jnilib"; Styles = (NETWORK, RELATIVE); End diff --git a/scp2/source/ooo/ure.scp b/scp2/source/ooo/ure.scp index 0ce9a7316bfb..939bd3caf395 100644 --- a/scp2/source/ooo/ure.scp +++ b/scp2/source/ooo/ure.scp @@ -18,6 +18,8 @@ #include "macros.inc" +#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + #include "AutoInstall/ure" Directory gid_Dir_Ure_Bin @@ -63,9 +65,11 @@ Directory gid_Dir_Ure_Misc DosName = "misc"; End +#endif // !ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + // Public Executables: -#ifndef WNT +#if !defined WNT && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE Shortcut gid_Shortcut_Exe_Uno FileID = gid_File_Exe_StartupSh; Dir = gid_Dir_Ure_Bin; @@ -76,7 +80,7 @@ End // Private Executables: -#if !defined WNT +#if !defined WNT && !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE File gid_File_Exe_StartupSh BIN_FILE_BODY; Dir = gid_Dir_Ure_Bin; @@ -180,12 +184,77 @@ End // Private Dynamic Libraries: -File gid_File_Dl_Profile_Uno - LIB_FILE_BODY; +// We set up the URE unorc/uno.ini in scp2 because then it is easy to +// get the platform differences into it compared to constructing it in +// Makefiles etc. With ENABLE_MACOSX_MACLIKE_APP_STRUCTURE it goes into +// .app/Contents/Resources/ure/unorc, on Unix into .../ure/lib/unorc +// and on Windows into .../ure/bin/unorc. The latter two locations +// are factored out as SCP2_URE_DL_DIR. + +Profile gid_Profile_Dl_Uno_Ini + ModuleID = gid_Module_Root_Ure_Hidden; +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + Dir = gid_Brand_Dir_Share_Ure; +#else Dir = SCP2_URE_DL_DIR; - Name = PROFILENAME(/ure/uno); - Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); - // CompID = "4681F5C1-8F64-486F-B804-03B4D8CEB41F"; +#endif + Name = PROFILENAME(uno); +End + +ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Lib_Dir + ModuleID = gid_Module_Root_Ure_Hidden; + ProfileID = gid_Profile_Dl_Uno_Ini; + Section = "Bootstrap"; + Key = "URE_INTERNAL_LIB_DIR"; +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + Value = "${ORIGIN}/../../Frameworks"; +#else + Value = "${ORIGIN}"; +#endif +End + +ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Dir + ModuleID = gid_Module_Root_Ure_Hidden; + ProfileID = gid_Profile_Dl_Uno_Ini; + Section = "Bootstrap"; + Key = "URE_INTERNAL_JAVA_DIR"; +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + Value = "${ORIGIN}/../java"; +#else + Value = "${ORIGIN}/../share/java"; +#endif +End + +ProfileItem gid_Profileitem_Dl_Uno_Ure_Internal_Java_Classpath + ModuleID = gid_Module_Root_Ure_Hidden; + ProfileID = gid_Profile_Dl_Uno_Ini; + Section = "Bootstrap"; + Key = "URE_INTERNAL_JAVA_CLASSPATH"; + Value = "${URE_MORE_JAVA_TYPES}"; +End + +ProfileItem gid_Profileitem_Dl_Uno_Uno_Types + ModuleID = gid_Module_Root_Ure_Hidden; + ProfileID = gid_Profile_Dl_Uno_Ini; + Section = "Bootstrap"; + Key = "UNO_TYPES"; +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + Value = "${ORIGIN}/types.rdb ${URE_MORE_TYPES}"; +#else + Value = "${ORIGIN}/../share/misc/types.rdb ${URE_MORE_TYPES}"; +#endif +End + +ProfileItem gid_Profileitem_Dl_Uno_Uno_Services + ModuleID = gid_Module_Root_Ure_Hidden; + ProfileID = gid_Profile_Dl_Uno_Ini; + Section = "Bootstrap"; + Key = "UNO_SERVICES"; +#if defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE + Value = "${ORIGIN}/services.rdb ${URE_MORE_SERVICES}"; +#else + Value = "${ORIGIN}/../share/misc/services.rdb ${URE_MORE_SERVICES}"; +#endif End #ifdef AIX @@ -495,7 +564,7 @@ End #if defined SOLAR_JAVA File gid_File_Java_UnoloaderJar TXT_FILE_BODY; - Dir = gid_Dir_Ure_Java; + Dir = GID_DIR_URE_JAVA; Name = "unoloader.jar"; Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "90F99ED3-814C-4B45-894B-D9248848CEB4"; @@ -505,7 +574,7 @@ End #if defined SOLAR_JAVA File gid_File_Java_JuhJar TXT_FILE_BODY; - Dir = gid_Dir_Ure_Java; + Dir = GID_DIR_URE_JAVA; Name = "juh.jar"; Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "E77CC8B5-0345-4B7F-ABED-5EB9DC94E492"; @@ -515,7 +584,7 @@ End #if defined SOLAR_JAVA File gid_File_Java_JurtJar TXT_FILE_BODY; - Dir = gid_Dir_Ure_Java; + Dir = GID_DIR_URE_JAVA; Name = "jurt.jar"; Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "EA63EDCC-9152-4560-AB7A-BFC367442E50"; @@ -525,7 +594,7 @@ End #if defined SOLAR_JAVA File gid_File_Java_RidlJar TXT_FILE_BODY; - Dir = gid_Dir_Ure_Java; + Dir = GID_DIR_URE_JAVA; Name = "ridl.jar"; Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "4A915C83-6BE3-41B9-BAF9-13AA27034955"; @@ -537,7 +606,7 @@ End #if defined SOLAR_JAVA File gid_File_Java_JavaUnoJar TXT_FILE_BODY; - Dir = gid_Dir_Ure_Java; + Dir = GID_DIR_URE_JAVA; Name = "java_uno.jar"; Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "ABDC8DDA-5D2B-424C-ABD8-FD22D59658FE"; @@ -548,7 +617,7 @@ End File gid_File_Misc_TypesRdb TXT_FILE_BODY; - Dir = gid_Dir_Ure_Misc; + Dir = GID_DIR_URE_SHARE_MISC; Name = "udkapi.rdb"; InstallName = "types.rdb"; Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID, SUBST_FILENAME); @@ -557,7 +626,7 @@ End File gid_File_Misc_ServicesRdb TXT_FILE_BODY; - Dir = gid_Dir_Ure_Misc; + Dir = GID_DIR_URE_SHARE_MISC; Name = "/ure/services.rdb"; Styles = (PACKED); End @@ -567,21 +636,13 @@ End #if defined SOLAR_JAVA File gid_File_Misc_JavavendorsXml TXT_FILE_BODY; - Dir = gid_Dir_Ure_Misc; + Dir = GID_DIR_URE_SHARE_MISC; Name = "javavendors.xml"; Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID); // CompID = "403FCCFE-545B-44F6-91D1-5C75F846E587"; End #endif -#if defined MACOSX -Unixlink gid_Unixlink_Ure_Bin_Urelibs - Dir = gid_Dir_Ure_Bin; - Name = "urelibs"; - Target = "../lib"; -End -#endif - //Module Module gid_Module_Root_Ure_Hidden diff --git a/scp2/source/ooo/ure_into_ooo.scp b/scp2/source/ooo/ure_into_ooo.scp index bc6f3cfe2d6f..70c48d9599d9 100644 --- a/scp2/source/ooo/ure_into_ooo.scp +++ b/scp2/source/ooo/ure_into_ooo.scp @@ -42,10 +42,12 @@ File gid_File_UreLink Styles = (PACKED); End #elif defined MACOSX +#if !defined ENABLE_MACOSX_MACLIKE_APP_STRUCTURE Directory gid_Dir_UreLink ParentID = gid_Dir_Bundle_Contents; DosName = "ure-link"; End +#endif #else Unixlink gid_Unixlink_UreLink BIN_FILE_BODY; diff --git a/scp2/source/python/file_python.scp b/scp2/source/python/file_python.scp index dbf59e670efd..e53763f89795 100644 --- a/scp2/source/python/file_python.scp +++ b/scp2/source/python/file_python.scp @@ -28,7 +28,7 @@ File gid_File_scriptproviderforpython End File gid_File_Lib_Pyuno - LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; #ifdef UNX Name = STRING(CONCAT2(libpyuno,UNXSUFFIX)); #else @@ -38,8 +38,6 @@ File gid_File_Lib_Pyuno Name = "pyuno.pyd"; #endif // MSVC_PKG_DEBUG_RUNTIME #endif - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); End STD_LIB_FILE( gid_File_Lib_Pythonloader, pythonloader ) @@ -51,26 +49,9 @@ File gid_File_Pyuno_Rdb Styles = (PACKED); End -File gid_File_Py_Unohelper - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "pyuno/unohelper.py"; - Styles = (PACKED); -End - -File gid_File_Py_Uno - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "pyuno/uno.py"; - Styles = (PACKED); -End - -File gid_File_Py_Pythonloader - TXT_FILE_BODY; - Dir = gid_Brand_Dir_Program; - Name = "pyuno/pythonloader.py"; - Styles = (PACKED); -End +STD_PY_FILE(gid_File_Py_Unohelper, "pyuno/unohelper.py") +STD_PY_FILE(gid_File_Py_Uno, "pyuno/uno.py") +STD_PY_FILE(gid_File_Py_Pythonloader, "pyuno/pythonloader.py") #ifndef SYSTEM_PYTHON File gid_File_Py_Bin_Python @@ -130,10 +111,8 @@ End // pyuno.so even on Mac OS X, because it is a python module File gid_File_Pyuno - LIB_FILE_BODY; + PACKED_LIB_FILE_BODY; Name = "pyuno.so"; - Dir = gid_Brand_Dir_Program; - Styles = (PACKED); End #endif diff --git a/scp2/source/python/profileitem_python.scp b/scp2/source/python/profileitem_python.scp index 0bc2a86651d1..ee4dac62b9fa 100644 --- a/scp2/source/python/profileitem_python.scp +++ b/scp2/source/python/profileitem_python.scp @@ -27,7 +27,7 @@ Profile gid_Profile_Pythonloader_Uno_Ini #else Name = "pythonloader.uno.ini"; #endif - Dir = gid_Brand_Dir_Program; + Dir = GID_BRAND_DIR_ETC; Styles = (NETWORK); End @@ -39,7 +39,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonhome Order = 1; Key = "PYUNO_LOADER_PYTHONHOME"; #ifdef MACOSX - Value = CONCAT2($ORIGIN,/LibreOfficePython.framework); + Value = "$ORIGIN/../Frameworks/LibreOfficePython.framework"; #else Value = CONCAT2($ORIGIN/python-core-,PYVERSION); #endif @@ -57,7 +57,7 @@ ProfileItem gid_Profileitem_Pythonloader_Pythonpath #else #ifdef UNX #ifdef MACOSX - #define FRAMEWORKLIB CONCAT3($ORIGIN,/LibreOfficePython.framework/Versions/Current/lib/python,PYMAJMIN) + #define FRAMEWORKLIB CONCAT3($ORIGIN,/../Frameworks/LibreOfficePython.framework/Versions/Current/lib/python,PYMAJMIN) Value = CONCAT4(FRAMEWORKLIB FRAMEWORKLIB, /lib-dynload FRAMEWORKLIB, /lib-tk FRAMEWORKLIB, diff --git a/scripting/examples/beanshell/Highlight/ShowDialog.bsh b/scripting/examples/beanshell/Highlight/ShowDialog.bsh index e4d335d22a04..95ccc32bbe32 100755 --- a/scripting/examples/beanshell/Highlight/ShowDialog.bsh +++ b/scripting/examples/beanshell/Highlight/ShowDialog.bsh @@ -55,7 +55,7 @@ boolean tryLoadingLibrary( xmcf, context, name ) } libURL = xme.expandMacros( - "$BRAND_BASE_DIR/share/basic/ScriptBindingLibrary/" + + "$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/basic/ScriptBindingLibrary/" + name.toLowerCase() + ".xlb/"); System.err.println("libURL is: " + libURL); diff --git a/scripting/examples/java/Highlight/HighlightText.java b/scripting/examples/java/Highlight/HighlightText.java index 176b185b5064..99af06f25468 100644 --- a/scripting/examples/java/Highlight/HighlightText.java +++ b/scripting/examples/java/Highlight/HighlightText.java @@ -223,7 +223,7 @@ public class HighlightText implements com.sun.star.awt.XActionListener { } String libURL = xme.expandMacros( - "$BRAND_BASE_DIR/share/basic/ScriptBindingLibrary/" + + "$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/basic/ScriptBindingLibrary/" + name.toLowerCase() + ".xlb/"); System.err.println("libURL is: " + libURL); diff --git a/scripting/examples/javascript/Highlight/ShowDialog.js b/scripting/examples/javascript/Highlight/ShowDialog.js index 7b2012870c15..0f3ccefb836b 100755 --- a/scripting/examples/javascript/Highlight/ShowDialog.js +++ b/scripting/examples/javascript/Highlight/ShowDialog.js @@ -49,7 +49,7 @@ function tryLoadingLibrary( xmcf, context, name ) } libURL = xme.expandMacros( - "$BRAND_BASE_DIR/share/basic/ScriptBindingLibrary/" + + "$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/basic/ScriptBindingLibrary/" + name.toLowerCase() + ".xlb/"); System.err.println("libURL is: " + libURL); 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 eb1e560355c2..9c9edba73f6b 100644 --- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java +++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java @@ -125,10 +125,10 @@ public class ScriptMetaData extends ScriptEntry implements Cloneable { // to be exposed at all private static final String SHARE = - "vnd.sun.star.expand:$BRAND_BASE_DIR/share"; + "vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR"; private static final String USER = - "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + + "vnd.sun.star.expand:${$BRAND_BASE_DIR/BRAND_BIN_SUBDIR/" + 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 c0d960008263..e14e27a7ee3b 100644 --- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java +++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java @@ -133,7 +133,7 @@ public abstract class ScriptProvider new Type(XMacroExpander.class), serviceObj); XMLParserFactory.setOfficeDTDURL(me.expandMacros( - "$BRAND_BASE_DIR/share/dtd/officedocument/1_0/")); + "$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/dtd/officedocument/1_0/")); } catch ( Exception e ) @@ -211,20 +211,20 @@ public abstract class ScriptProvider if ( originalContextURL.startsWith( "bundled" ) ) { contextUrl = "vnd.sun.star.expand:$BUNDLED_EXTENSIONS"; - extensionDb = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user"; + extensionDb = "vnd.sun.star.expand:${$BRAND_BASE_DIR/$BRAND_BIN_SUBDIR/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user"; extensionRepository = "bundled"; } if ( originalContextURL.startsWith( "share" ) ) { - contextUrl = "vnd.sun.star.expand:$BRAND_BASE_DIR/share"; - extensionDb = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user"; + 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"; extensionRepository = "shared"; } else if ( originalContextURL.startsWith( "user" ) ) { - contextUrl = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user"; - extensionDb = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user"; + contextUrl = "vnd.sun.star.expand:${$BRAND_BASE_DIR/$BRAND_BIN_SUBDIR/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user"; + extensionDb = "vnd.sun.star.expand:${$BRAND_BASE_DIR/$BRAND_BIN_SUBDIR/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user"; extensionRepository = "user"; } diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx index e0f42336b335..6a6d0b7fc48c 100644 --- a/scripting/source/provider/URIHelper.cxx +++ b/scripting/source/provider/URIHelper.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> #include <com/sun/star/uri/XVndSunStarScriptUrl.hpp> #include <com/sun/star/uri/UriReferenceFactory.hpp> @@ -41,7 +42,7 @@ static const char SHARE_UNO_PACKAGES_URI[] = static const char USER[] = "user"; static const char USER_URI[] = - "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"; + "vnd.sun.star.expand:${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"; static const char USER_UNO_PACKAGES[] = "user:uno_packages"; static const char USER_UNO_PACKAGES_DIR[] = diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py index d2e90ba1a5c1..a405ca4b11df 100755 --- a/scripting/source/pyprov/pythonscript.py +++ b/scripting/source/pyprov/pythonscript.py @@ -174,9 +174,9 @@ class MyUriHelper: def __init__( self, ctx, location ): self.s_UriMap = \ - { "share" : "vnd.sun.star.expand:$BRAND_BASE_DIR/share/Scripts/python" , \ + { "share" : "vnd.sun.star.expand:$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/Scripts/python" , \ "share:uno_packages" : "vnd.sun.star.expand:$UNO_SHARED_PACKAGES_CACHE/uno_packages", \ - "user" : "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + toIniName( "bootstrap") + "::UserInstallation}/user/Scripts/python" , \ + "user" : "vnd.sun.star.expand:${$BRAND_BASE_DIR/$BRAND_BIN_SUBDIR/" + toIniName( "bootstrap") + "::UserInstallation}/user/Scripts/python" , \ "user:uno_packages" : "vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages" } self.m_uriRefFac = ctx.ServiceManager.createInstanceWithContext("com.sun.star.uri.UriReferenceFactory",ctx) if location.startswith( "vnd.sun.star.tdoc" ): diff --git a/sdext/source/pdfimport/wrapper/wrapper.cxx b/sdext/source/pdfimport/wrapper/wrapper.cxx index 98c39e2e62bd..f2c97388ace7 100644 --- a/sdext/source/pdfimport/wrapper/wrapper.cxx +++ b/sdext/source/pdfimport/wrapper/wrapper.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> #include "contentsink.hxx" #include "pdfparse.hxx" @@ -1043,11 +1044,11 @@ bool xpdf_ImportFromFile( const OUString& rURL, } // Determine xpdfimport executable URL: - OUString converterURL("$BRAND_BASE_DIR/program/xpdfimport"); + OUString converterURL("$BRAND_BASE_DIR/" LIBO_BIN_FOLDER "/xpdfimport"); rtl::Bootstrap::expandMacros(converterURL); //TODO: detect failure // Determine pathname of xpdfimport_err.pdf: - OUString errPathname("$BRAND_BASE_DIR/share/xpdfimport/xpdfimport_err.pdf"); + OUString errPathname("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/xpdfimport/xpdfimport_err.pdf"); rtl::Bootstrap::expandMacros(errPathname); //TODO: detect failure if (osl::FileBase::getSystemPathFromFileURL(errPathname, errPathname) != osl::FileBase::E_None) diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index da6a2188df32..581404b7b489 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <shutdownicon.hxx> #include <app.hrc> #include <sfx2/app.hxx> @@ -860,7 +862,7 @@ void ShutdownIcon::SetAutostart( bool bActivate ) #else // UNX getAutostartDir( true ); - OUString aPath( "${BRAND_BASE_DIR}/share/xdg/qstart.desktop" ); + OUString aPath( "${BRAND_BASE_DIR}/" LIBO_SHARE_FOLDER "/xdg/qstart.desktop" ); Bootstrap::expandMacros( aPath ); OUString aDesktopFile; diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 3b09a22f4e0b..0e37c5d989d6 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -18,6 +18,7 @@ */ #include <config_features.h> +#include <config_folders.h> #include <tools/inetmsg.hxx> #include <tools/diagnose_ex.h> @@ -2074,11 +2075,11 @@ void SfxObjectShell::StoreLog() if ( pImp->m_xLogRing.is() ) { - OUString aFileURL = OUString( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}" ); + OUString aFileURL = OUString( "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap") ":UserInstallation}" ); ::rtl::Bootstrap::expandMacros( aFileURL ); - OUString aBuildID = OUString( "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("setup") ":buildid}" ); + OUString aBuildID = OUString( "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("setup") ":buildid}" ); ::rtl::Bootstrap::expandMacros( aBuildID ); diff --git a/shell/source/cmdmail/cmdmailsuppl.cxx b/shell/source/cmdmail/cmdmailsuppl.cxx index 05b16f2dc42f..90f5e8af051a 100644 --- a/shell/source/cmdmail/cmdmailsuppl.cxx +++ b/shell/source/cmdmail/cmdmailsuppl.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <osl/diagnose.h> #include <osl/thread.h> @@ -122,7 +124,7 @@ void SAL_CALL CmdMailSuppl::sendSimpleMailMessage( const Reference< XSimpleMailM } - OUString aProgramURL("$BRAND_BASE_DIR/program/senddoc"); + OUString aProgramURL("$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/senddoc"); rtl::Bootstrap::expandMacros(aProgramURL); OUString aProgram; diff --git a/shell/source/unix/exec/shellexec.cxx b/shell/source/unix/exec/shellexec.cxx index b962f8a58172..3f97806d33c5 100644 --- a/shell/source/unix/exec/shellexec.cxx +++ b/shell/source/unix/exec/shellexec.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <osl/diagnose.h> #include <osl/thread.h> #include <osl/process.h> @@ -161,14 +163,14 @@ void SAL_CALL ShellExec::execute( const OUString& aCommand, const OUString& aPar // the CWD) on stderr and SystemShellExecuteException. aBuffer.append("open --"); #else - // The url launchers are expected to be in the $BRAND_BASE_DIR/program + // The url launchers are expected to be in the $BRAND_BASE_DIR/LIBO_LIBEXEC_FOLDER // directory: com::sun::star::uno::Reference< com::sun::star::util::XMacroExpander > exp = com::sun::star::util::theMacroExpander::get(m_xContext); OUString aProgramURL; try { aProgramURL = exp->expandMacros( - OUString( "$BRAND_BASE_DIR/program/")); + OUString( "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/")); } catch (com::sun::star::lang::IllegalArgumentException &) { throw SystemShellExecuteException( diff --git a/shell/source/win32/simplemail/smplmailclient.cxx b/shell/source/win32/simplemail/smplmailclient.cxx index 5a9b30de840f..a3a91338eecc 100644 --- a/shell/source/win32/simplemail/smplmailclient.cxx +++ b/shell/source/win32/simplemail/smplmailclient.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <osl/diagnose.h> #include <osl/process.h> #include <rtl/bootstrap.hxx> @@ -101,7 +103,7 @@ namespace /* private */ if (senddocUrl.getLength() == 0) { - senddocUrl = OUString( "$BRAND_BASE_DIR/program/senddoc.exe"); + senddocUrl = OUString( "$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/senddoc.exe"); rtl::Bootstrap::expandMacros(senddocUrl); //TODO: detect failure } return senddocUrl; diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl index cd76e80681b0..b31924447193 100644 --- a/solenv/bin/macosx-change-install-names.pl +++ b/solenv/bin/macosx-change-install-names.pl @@ -45,20 +45,22 @@ sub action($$$) # comment telling that this library is supposed to have been found # by the dynamic linker already in DYLD_LIBRARY_PATH. + my $OLD = $ENV{ENABLE_MACOSX_MACLIKE_APP_STRUCTURE} ne 'YES'; + my %action = - ('app/UREBIN/URELIB' => '@executable_path/../lib', - 'app/OOO/URELIB' => '@executable_path/../ure-link/lib', - 'app/OOO/OOO' => '@executable_path', - 'app/SDKBIN/URELIB' => '@executable_path/../../ure-link/lib', + ('app/UREBIN/URELIB' => ($OLD ? '@executable_path/../lib' : '@executable_path/../Frameworks'), + 'app/OOO/URELIB' => ($OLD ? '@executable_path/../ure-link/lib' : '@executable_path/../Frameworks'), + 'app/OOO/OOO' => ($OLD ? '@executable_path' : '@executable_path/../Frameworks'), + 'app/SDKBIN/URELIB' => ($OLD ? '@executable_path/../../ure-link/lib' : '@executable_path/../Frameworks'), 'app/NONE/URELIB' => '@__VIA_LIBRARY_PATH__', 'app/NONE/OOO' => '@__VIA_LIBRARY_PATH__', 'app/NONE/NONE' => '@__VIA_LIBRARY_PATH__', 'shl/URELIB/URELIB' => '@loader_path', - 'shl/OOO/URELIB' => '@loader_path/../ure-link/lib', + 'shl/OOO/URELIB' => ($OLD ? '@loader_path/../ure-link/lib' : '@loader_path'), 'shl/OOO/OOO' => '@loader_path', - 'fb/OOO/URELIB' => '@rpath/../ure-link/lib', + 'fb/OOO/URELIB' => ($OLD ? '@rpath/../ure-link/lib' : '@executable_path/../Frameworks'), 'fb/OOO/OOO' => '@rpath', - 'shl/OXT/URELIB' => '@executable_path/urelibs', + 'shl/OXT/URELIB' => ($OLD ? '@executable_path/urelibs' : '@executable_path/../Frameworks'), 'shl/NONE/URELIB' => '@__VIA_LIBRARY_PATH__', 'shl/NONE/OOO' => '@__VIA_LIBRARY_PATH__', 'shl/NONE/NONE' => '@__VIA_LIBRARY_PATH__'); diff --git a/solenv/gbuild/InstallModuleTarget.mk b/solenv/gbuild/InstallModuleTarget.mk index d7c74d7b3176..d8bc254d58d9 100644 --- a/solenv/gbuild/InstallModuleTarget.mk +++ b/solenv/gbuild/InstallModuleTarget.mk @@ -215,7 +215,7 @@ $(call gb_InstallModuleTarget_get_external_target,$(1)) :| \ $(call gb_InstallModuleTarget_get_target,$(1)) : SCP_FILES := $(call gb_InstallModuleTarget_get_target,$(1)) : SCP_DEFS := -$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_INCLUDE := -I$(SRCDIR)/scp2/inc -I$(WORKDIR) +$(call gb_InstallModuleTarget_get_target,$(1)) : SCP_INCLUDE := -I$(SRCDIR)/scp2/inc -I$(WORKDIR) -I$(BUILDDIR)/config_$(gb_Side) $(call gb_InstallModuleTarget_get_target,$(1)) : SCP_TEMPLATE_INCLUDE := $(call gb_InstallModuleTarget_use_custom_headers,$(1),scp2/macros) diff --git a/solenv/gbuild/TargetLocations.mk b/solenv/gbuild/TargetLocations.mk index 9f8ce63780b7..ed9246355f57 100644 --- a/solenv/gbuild/TargetLocations.mk +++ b/solenv/gbuild/TargetLocations.mk @@ -39,7 +39,7 @@ gb_Rdb_get_outdir_target = $(OUTDIR)/xml/$(1).rdb gb_Rdb_get_outdir_target_for_build = $(OUTDIR_FOR_BUILD)/xml/$(1).rdb gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res gb_ResTarget_get_unittest_target = \ - $(OUTDIR)/unittest/install/program/resource/$(1).res + $(OUTDIR)/unittest/install/$(LIBO_SHARE_RESOURCE_FOLDER)/$(1).res gb_UnoApi_get_target = $(OUTDIR)/bin/$(1).rdb gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar gb_Configuration_registry = $(OUTDIR)/xml/registry @@ -88,7 +88,7 @@ gb_ComponentTarget_get_target_for_build = $(WORKDIR_FOR_BUILD)/ComponentTarget/$ gb_Configuration_get_preparation_target = $(WORKDIR)/Configuration/$(1).prepared gb_CppunitTest_get_target = $(WORKDIR)/CppunitTest/$(1).test gb_CppunitTestFakeExecutable_get_target = \ - $(OUTDIR)/unittest/install/program/$(1) + $(OUTDIR)/unittest/install/$(LIBO_BIN_FOLDER)/$(1) gb_CustomPackage_get_target = $(WORKDIR)/CustomPackage/$(1).filelist gb_CustomTarget_get_repo_target = $(WORKDIR)/CustomTarget/$(2)_$(1).done gb_CustomTarget_get_target = $(WORKDIR)/CustomTarget/$(1).done diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index ec99e649f140..848be896b262 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include "templwin.hxx" #include <svtools/templdlg.hxx> #include <svtools/svtresid.hxx> @@ -156,7 +158,7 @@ SvtIconWindow_Impl::SvtIconWindow_Impl( Window* pParent ) : aNewDocumentRootURL( "private:newdoc" ), aMyDocumentsRootURL( SvtPathOptions().GetWorkPath() ), aSamplesFolderRootURL( SvtPathOptions(). - SubstituteVariable( String( "$(insturl)/share/samples/$(vlang)" ) ) ), + SubstituteVariable( String( "$(insturl)/" LIBO_SHARE_FOLDER "/samples/$(vlang)" ) ) ), nMaxTextLength( 0 ) { diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 7de9b71e96eb..88c1c89657d5 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <tools/stream.hxx> #include <vcl/builder.hxx> #include <vcl/svapp.hxx> @@ -1120,7 +1122,7 @@ void FontNameBox::LoadMRUEntries( const String& aFontMRUEntriesFile, sal_Unicode void FontNameBox::InitFontMRUEntriesFile() { - OUString sUserConfigDir("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"); + OUString sUserConfigDir("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"); rtl::Bootstrap::expandMacros(sUserConfigDir); maFontMRUEntriesFile = sUserConfigDir; diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx index 9d59e82b0b62..76ebd368f3f9 100644 --- a/svx/source/dialog/docrecovery.cxx +++ b/svx/source/dialog/docrecovery.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> #include <sal/macros.h> @@ -1925,7 +1926,7 @@ void BrokenRecoveryDialog::impl_askForSavePath() { #if defined(WNT) - OUString ustrValue = OUString("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"); + OUString ustrValue = OUString("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/bootstrap.ini:UserInstallation}"); #elif defined( MACOSX ) OUString ustrValue = OUString("~"); #else diff --git a/svx/source/dialog/sendreportunx.cxx b/svx/source/dialog/sendreportunx.cxx index 3271f6803f9c..9a058ad54fc6 100644 --- a/svx/source/dialog/sendreportunx.cxx +++ b/svx/source/dialog/sendreportunx.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> #include "docrecovery.hxx" #include "osl/file.hxx" @@ -223,7 +224,7 @@ namespace svx{ } int ret = -1; - OUString path1("$BRAND_BASE_DIR/program/crashrep"); + OUString path1("$BRAND_BASE_DIR/" LIBO_LIBEXEC_FOLDER "/crashrep"); rtl::Bootstrap::expandMacros(path1); OString path2; if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) == diff --git a/svx/source/unodraw/recoveryui.cxx b/svx/source/unodraw/recoveryui.cxx index 21c1ac4f0fea..e1da634b103a 100644 --- a/svx/source/unodraw/recoveryui.cxx +++ b/svx/source/unodraw/recoveryui.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include "recoveryui.hxx" #include "docrecovery.hxx" #include <com/sun/star/lang/XInitialization.hpp> @@ -175,7 +177,7 @@ static OUString GetCrashConfigDir() { #if defined(WNT) - OUString ustrValue = OUString("${$BRAND_BASE_DIR/program/bootstrap.ini:UserInstallation}"); + OUString ustrValue = OUString("${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/bootstrap.ini:UserInstallation}"); #elif defined(MACOSX) OUString ustrValue = OUString("~"); #else diff --git a/sw/source/ui/envelp/labelcfg.cxx b/sw/source/ui/envelp/labelcfg.cxx index 81f49f3922b8..d7b9f8a0d4a6 100644 --- a/sw/source/ui/envelp/labelcfg.cxx +++ b/sw/source/ui/envelp/labelcfg.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <swtypes.hxx> #include <labelcfg.hxx> #include <labimp.hxx> @@ -72,7 +74,7 @@ static Sequence<OUString> lcl_CreatePropertyNames(const OUString& rPrefix) SwLabelConfig::SwLabelConfig() : ConfigItem("Office.Labels/Manufacturer") { - OUString uri("$BRAND_BASE_DIR/share/labels/labels.xml"); + OUString uri("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/labels/labels.xml"); rtl::Bootstrap::expandMacros(uri); xmlreader::XmlReader reader(uri); int nsId; diff --git a/tools/source/misc/extendapplicationenvironment.cxx b/tools/source/misc/extendapplicationenvironment.cxx index e8b3ff8686b9..33c40ab9cddd 100644 --- a/tools/source/misc/extendapplicationenvironment.cxx +++ b/tools/source/misc/extendapplicationenvironment.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> +#include <config_folders.h> + #include "sal/config.h" #include <stdlib.h> @@ -70,6 +73,9 @@ void extendApplicationEnvironment() { uri = uri.copy(0, i + 1); } env.append(rtl::Bootstrap::encode(uri)); +#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE + env.append("../" LIBO_SHARE_FOLDER "/"); +#endif env.append(SAL_CONFIGFILE("fundamental")); } OUString envValue(env.makeStringAndClear()); diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index d734242ed5ec..cc28f7de6350 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include "sal/config.h" #include <cassert> @@ -179,7 +181,7 @@ void ResMgrContainer::init() assert( m_aResFiles.empty() ); // get resource path - OUString uri("$BRAND_BASE_DIR/program/resource/"); + OUString uri("$BRAND_BASE_DIR/" LIBO_SHARE_RESOURCE_FOLDER "/"); rtl::Bootstrap::expandMacros(uri); //TODO: detect failure // collect all possible resource files diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx index 1a9df9c3b749..e83eb4f92c99 100644 --- a/unotools/source/config/bootstrap.cxx +++ b/unotools/source/config/bootstrap.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> #include <stdio.h> @@ -70,7 +71,7 @@ namespace utl { OUString uri; rtl::Bootstrap::get( OUString("BRAND_BASE_DIR"), uri); - return uri + "/program/" SAL_CONFIGFILE("bootstrap"); + return uri + "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("bootstrap"); } } @@ -783,7 +784,7 @@ sal_Bool Bootstrap::Impl::getVersionValue(OUString const& _sName, OUString& _rVa // try to open version.ini (versionrc) OUString uri; rtl::Bootstrap::get( OUString("BRAND_BASE_DIR"), uri); - rtl::Bootstrap aData( uri + "/program/" SAL_CONFIGFILE("version") ); + rtl::Bootstrap aData( uri + "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("version") ); if ( aData.getHandle() == NULL ) // version.ini (versionrc) doesn't exist return sal_False; diff --git a/ure/source/uno.ini b/ure/source/uno.ini index 6c04cae9a38c..33138e497578 100644 --- a/ure/source/uno.ini +++ b/ure/source/uno.ini @@ -15,6 +15,8 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # +# This is the uno.ini file from ure/source +# [Bootstrap] URE_INTERNAL_LIB_DIR=${ORIGIN} URE_INTERNAL_JAVA_DIR=${ORIGIN}/../java diff --git a/ure/source/unorc b/ure/source/unorc index 1efbfe206271..208b1d9ff96f 100644 --- a/ure/source/unorc +++ b/ure/source/unorc @@ -15,6 +15,11 @@ # except in compliance with the License. You may obtain a copy of # the License at http://www.apache.org/licenses/LICENSE-2.0 . # +# This is the unorc file from ure/source. Note that this file is +# copied into solver, but no longer copied into the installset, but +# used in solver only during build. The URE unorc in the installset is +# constructed from scp stanzas in scp2/source/ooo/ure.scp. +# [Bootstrap] URE_INTERNAL_LIB_DIR=${ORIGIN} URE_INTERNAL_JAVA_DIR=${ORIGIN}/../share/java diff --git a/uui/source/newerverwarn.cxx b/uui/source/newerverwarn.cxx index 8e4877a58b9c..5f96cdb2d94f 100644 --- a/uui/source/newerverwarn.cxx +++ b/uui/source/newerverwarn.cxx @@ -17,6 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> +#include <config_folders.h> + #include "newerverwarn.hxx" #include "newerverwarn.hrc" #include "ids.hrc" @@ -78,7 +81,10 @@ IMPL_LINK_NOARG(NewerVersionWarningDialog, UpdateHdl) // read keys from soffice.ini (sofficerc) OUString sIniFileName = sProgramPath; - sIniFileName += OUString( SAL_CONFIGFILE( "version" ) ); +#if HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE + sIniFileName += "../" LIBO_ETC_FOLDER "/"; +#endif + sIniFileName += SAL_CONFIGFILE( "version" ); ::rtl::Bootstrap aIniFile( sIniFileName ); OUString sNotifyURL; aIniFile.getFrom( OUString( "ODFNotifyURL" ), sNotifyURL ); diff --git a/vcl/aqua/source/gdi/atsui/salgdi.cxx b/vcl/aqua/source/gdi/atsui/salgdi.cxx index 7a6ce9595d8a..0fc22dc5f6b5 100644 --- a/vcl/aqua/source/gdi/atsui/salgdi.cxx +++ b/vcl/aqua/source/gdi/atsui/salgdi.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include "sal/config.h" #include "osl/file.hxx" @@ -435,7 +437,7 @@ static bool AddLocalTempFontDirs( void ) OStringBuffer aBrandFontDir( aBrandSysPath.getLength()*2 ); aBrandFontDir.append( OUStringToOString( aBrandSysPath, RTL_TEXTENCODING_UTF8 ) ); - aBrandFontDir.append( "/share/fonts/truetype/" ); + aBrandFontDir.append( "/" LIBO_SHARE_FOLDER "/fonts/truetype/" ); return AddTempFontDir( aBrandFontDir.getStr() ); } diff --git a/vcl/coretext/salgdi2.cxx b/vcl/coretext/salgdi2.cxx index 96617e2205a4..778f0426ceaf 100644 --- a/vcl/coretext/salgdi2.cxx +++ b/vcl/coretext/salgdi2.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include "sal/config.h" #include "osl/file.hxx" @@ -379,7 +381,7 @@ static bool AddLocalTempFontDirs( void ) OStringBuffer aBrandFontDir( aBrandSysPath.getLength()*2 ); aBrandFontDir.append( OUStringToOString( aBrandSysPath, RTL_TEXTENCODING_UTF8 ) ); - aBrandFontDir.append( "/share/fonts/truetype/" ); + aBrandFontDir.append( "/" LIBO_SHARE_FOLDER "/fonts/truetype/" ); return AddTempFontDir( aBrandFontDir.getStr() ); } diff --git a/vcl/generic/app/gensys.cxx b/vcl/generic/app/gensys.cxx index d07f6bea12cc..611ea333ff98 100644 --- a/vcl/generic/app/gensys.cxx +++ b/vcl/generic/app/gensys.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <generic/gensys.h> #include <vcl/msgbox.hxx> @@ -193,7 +195,7 @@ const char* SalGenericSystem::getFrameClassName() { OUString aIni, aProduct; rtl::Bootstrap::get( "BRAND_BASE_DIR", aIni ); - aIni += "/program/" SAL_CONFIGFILE( "bootstrap" ); + aIni += "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" ); rtl::Bootstrap aBootstrap( aIni ); aBootstrap.getFrom( "ProductKey", aProduct ); diff --git a/vcl/generic/fontmanager/helper.cxx b/vcl/generic/fontmanager/helper.cxx index fc582bdf01e2..1d131a6c41e9 100644 --- a/vcl/generic/fontmanager/helper.cxx +++ b/vcl/generic/fontmanager/helper.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> #include <cstring> #include <sys/stat.h> @@ -48,7 +49,7 @@ OUString getOfficePath( enum whichOfficePath ePath ) bOnce = true; OUString aIni; Bootstrap::get( "BRAND_BASE_DIR", aInstallationRootPath ); - aIni = aInstallationRootPath + "/program/" + SAL_CONFIGFILE( "bootstrap" ); + aIni = aInstallationRootPath + "/" LIBO_ETC_FOLDER "/" + SAL_CONFIGFILE( "bootstrap" ); Bootstrap aBootstrap( aIni ); aBootstrap.getFrom( "CustomDataUrl", aConfigPath ); aBootstrap.getFrom( "UserInstallation", aUserPath ); @@ -117,7 +118,7 @@ void psp::getPrinterPathList( std::list< OUString >& rPathList, const char* pSub aPathBuffer.append( getOfficePath( psp::InstallationRootPath ) ); if( !aPathBuffer.isEmpty() ) { - aPathBuffer.appendAscii( "/share/psprint" ); + aPathBuffer.appendAscii( "/" LIBO_SHARE_FOLDER "/psprint" ); if( pSubDir ) { aPathBuffer.append( sal_Unicode('/') ); @@ -199,7 +200,7 @@ OUString psp::getFontPath() // #i53530# Path from CustomDataUrl will completely // replace net and user paths if the path exists aPathBuffer.append(aConfigPath); - aPathBuffer.appendAscii("/share/fonts"); + aPathBuffer.appendAscii("/" LIBO_SHARE_FOLDER "/fonts"); // check existance of config path struct stat aStat; if( 0 != stat( OUStringToOString( aPathBuffer.makeStringAndClear(), osl_getThreadTextEncoding() ).getStr(), &aStat ) @@ -208,7 +209,7 @@ OUString psp::getFontPath() else { aPathBuffer.append(aConfigPath); - aPathBuffer.appendAscii("/share/fonts"); + aPathBuffer.appendAscii("/" LIBO_SHARE_FOLDER "/fonts"); } } if( aConfigPath.isEmpty() ) @@ -216,9 +217,9 @@ OUString psp::getFontPath() if( !aInstallationRootPath.isEmpty() ) { aPathBuffer.append( aInstallationRootPath ); - aPathBuffer.appendAscii( "/share/fonts/truetype;"); + aPathBuffer.appendAscii( "/" LIBO_SHARE_FOLDER "/fonts/truetype;"); aPathBuffer.append( aInstallationRootPath ); - aPathBuffer.appendAscii( "/share/fonts/type1;" ); + aPathBuffer.appendAscii( "/" LIBO_SHARE_FOLDER "/fonts/type1;" ); } if( !aUserPath.isEmpty() ) { diff --git a/vcl/source/app/brand.cxx b/vcl/source/app/brand.cxx index fb2cd0192af7..0cf0a92d89f2 100644 --- a/vcl/source/app/brand.cxx +++ b/vcl/source/app/brand.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <rtl/ustring.hxx> #include <rtl/bootstrap.hxx> #include <osl/process.h> @@ -41,7 +43,7 @@ namespace { } static bool tryLoadPng( const OUString& rBaseDir, const OUString& rName, BitmapEx& rBitmap ) { - return loadPng( rBaseDir + "/program" + rName, rBitmap); + return loadPng( rBaseDir + "/" LIBO_ETC_FOLDER + rName, rBitmap); } } diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx index 0bd41d8c68d7..4cbc50247e53 100644 --- a/vcl/source/app/settings.cxx +++ b/vcl/source/app/settings.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <officecfg/Office/Common.hxx> #include <svsys.h> @@ -790,7 +792,7 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFoot if ( !aName.isEmpty() ) { // try the gallery first, then the program path: - OUString gallery = "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"; + OUString gallery = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"; rtl::Bootstrap::expandMacros( gallery ); gallery += "/user/gallery/personas/"; @@ -798,7 +800,7 @@ static void setupPersonaHeaderFooter( WhichPersona eWhich, OUString& rHeaderFoot rHeaderFooterBitmap = readBitmapEx( gallery + aName ); if ( rHeaderFooterBitmap.IsEmpty() ) - rHeaderFooterBitmap = readBitmapEx( "$BRAND_BASE_DIR/program/" + aName ); + rHeaderFooterBitmap = readBitmapEx( "$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" + aName ); } } diff --git a/vcl/source/filter/graphicfilter.cxx b/vcl/source/filter/graphicfilter.cxx index 5dd57b4a2147..651a881774d2 100644 --- a/vcl/source/filter/graphicfilter.cxx +++ b/vcl/source/filter/graphicfilter.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <osl/mutex.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/string.hxx> @@ -1131,7 +1133,7 @@ void GraphicFilter::ImplInit() if( bUseConfig ) { - OUString url("$BRAND_BASE_DIR/program"); + OUString url("$BRAND_BASE_DIR/" LIBO_LIB_FOLDER); rtl::Bootstrap::expandMacros(url); //TODO: detect failure utl::LocalFileHelper::ConvertURLToPhysicalName(url, aFilterPath); } diff --git a/vcl/source/gdi/embeddedfontshelper.cxx b/vcl/source/gdi/embeddedfontshelper.cxx index a147ea3a419c..3460f7835f88 100644 --- a/vcl/source/gdi/embeddedfontshelper.cxx +++ b/vcl/source/gdi/embeddedfontshelper.cxx @@ -7,6 +7,8 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <config_folders.h> + #include <vcl/embeddedfontshelper.hxx> #include <osl/file.hxx> @@ -43,7 +45,7 @@ static void clearDir( const OUString& path ) void EmbeddedFontsHelper::clearTemporaryFontFiles() { - OUString path = "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"; + OUString path = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"; rtl::Bootstrap::expandMacros( path ); path += "/user/temp/embeddedfonts/"; clearDir( path + "fromdocs/" ); @@ -111,7 +113,7 @@ bool EmbeddedFontsHelper::addEmbeddedFont( uno::Reference< io::XInputStream > st OUString EmbeddedFontsHelper::fileUrlForTemporaryFont( const OUString& fontName, const char* extra ) { - OUString path = "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"; + OUString path = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"; rtl::Bootstrap::expandMacros( path ); path += "/user/temp/embeddedfonts/fromdocs/"; osl::Directory::createPath( path ); @@ -163,7 +165,7 @@ bool EmbeddedFontsHelper::sufficientFontRights( const void* data, long size, Fon OUString EmbeddedFontsHelper::fontFileUrl( const OUString& familyName, FontFamily family, FontItalic italic, FontWeight weight, FontPitch pitch, rtl_TextEncoding, FontRights rights ) { - OUString path = "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"; + OUString path = "${$BRAND_BASE_DIR/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap") "::UserInstallation}"; rtl::Bootstrap::expandMacros( path ); path += "/user/temp/embeddedfonts/fromsystem/"; osl::Directory::createPath( path ); diff --git a/vcl/source/gdi/impimagetree.cxx b/vcl/source/gdi/impimagetree.cxx index 6e60d0edeb5a..cc32190a6594 100644 --- a/vcl/source/gdi/impimagetree.cxx +++ b/vcl/source/gdi/impimagetree.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> #include "sal/config.h" @@ -238,7 +239,7 @@ void ImplImageTree::setStyle(OUString const & style) { } void ImplImageTree::resetPaths() { - OUString url( "$BRAND_BASE_DIR/share/config/" ); + OUString url( "$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/config/" ); rtl::Bootstrap::expandMacros(url); if ( m_style != "default" ) { diff --git a/vcl/win/source/gdi/salgdi3.cxx b/vcl/win/source/gdi/salgdi3.cxx index aa049dad43bd..d8e578271fd7 100644 --- a/vcl/win/source/gdi/salgdi3.cxx +++ b/vcl/win/source/gdi/salgdi3.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> #include <string.h> #include <malloc.h> @@ -2183,7 +2184,7 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) osl_getExecutableFile( &aPath.pData ); aPath = aPath.copy( 0, aPath.lastIndexOf('/') ); String aFontDirUrl = aPath.copy( 0, aPath.lastIndexOf('/') ); - aFontDirUrl += String( RTL_CONSTASCII_USTRINGPARAM("/Basis/share/fonts/truetype") ); + aFontDirUrl += String( RTL_CONSTASCII_USTRINGPARAM("/Basis/" LIBO_SHARE_FOLDER "/fonts/truetype") ); // collect fonts in font path that could not be registered osl::Directory aFontDir( aFontDirUrl ); @@ -2195,7 +2196,7 @@ void WinSalGraphics::GetDevFontList( ImplDevFontList* pFontList ) OUString aBootStrap; rtl::Bootstrap::get( String( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ), aBootStrap ); - aBootStrap += String( RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE( "bootstrap" ) ) ); + aBootStrap += String( RTL_CONSTASCII_USTRINGPARAM( "/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE( "bootstrap" ) ) ); rtl::Bootstrap aBootstrap( aBootStrap ); OUString aUserPath; aBootstrap.getFrom( OUString( "UserInstallation" ), aUserPath ); diff --git a/wizards/source/configshare/dialog.xlc b/wizards/source/configshare/dialog.xlc index 297b562dec80..60ab31e7d743 100644 --- a/wizards/source/configshare/dialog.xlc +++ b/wizards/source/configshare/dialog.xlc @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE library:libraries PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "libraries.dtd"> <library:libraries xmlns:library="http://openoffice.org/2000/library" xmlns:xlink="http://www.w3.org/1999/xlink"> - <library:library library:name="FormWizard" xlink:href="$(INST)/share/basic/FormWizard/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> - <library:library library:name="Template" xlink:href="$(INST)/share/basic/Template/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> - <library:library library:name="Tools" xlink:href="$(INST)/share/basic/Tools/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> - <library:library library:name="Gimmicks" xlink:href="$(INST)/share/basic/Gimmicks/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> - <library:library library:name="ImportWizard" xlink:href="$(INST)/share/basic/ImportWizard/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> - <library:library library:name="Euro" xlink:href="$(INST)/share/basic/Euro/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> - <library:library library:name="Depot" xlink:href="$(INST)/share/basic/Depot/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> - <library:library library:name="ScriptBindingLibrary" xlink:href="$(INST)/share/basic/ScriptBindingLibrary/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> + <library:library library:name="FormWizard" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/FormWizard/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> + <library:library library:name="Template" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Template/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> + <library:library library:name="Tools" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Tools/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> + <library:library library:name="Gimmicks" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Gimmicks/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> + <library:library library:name="ImportWizard" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/ImportWizard/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> + <library:library library:name="Euro" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Euro/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> + <library:library library:name="Depot" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Depot/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> + <library:library library:name="ScriptBindingLibrary" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/ScriptBindingLibrary/dialog.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> </library:libraries> diff --git a/wizards/source/configshare/script.xlc b/wizards/source/configshare/script.xlc index 13330d288e20..a88496229958 100644 --- a/wizards/source/configshare/script.xlc +++ b/wizards/source/configshare/script.xlc @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE library:libraries PUBLIC "-//OpenOffice.org//DTD OfficeDocument 1.0//EN" "libraries.dtd"> <library:libraries xmlns:library="http://openoffice.org/2000/library" xmlns:xlink="http://www.w3.org/1999/xlink"> - <library:library library:name="FormWizard" xlink:href="$(INST)/share/basic/FormWizard/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> - <library:library library:name="Template" xlink:href="$(INST)/share/basic/Template/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> - <library:library library:name="Tools" xlink:href="$(INST)/share/basic/Tools/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> - <library:library library:name="Gimmicks" xlink:href="$(INST)/share/basic/Gimmicks/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> - <library:library library:name="ImportWizard" xlink:href="$(INST)/share/basic/ImportWizard/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> - <library:library library:name="Euro" xlink:href="$(INST)/share/basic/Euro/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> - <library:library library:name="Depot" xlink:href="$(INST)/share/basic/Depot/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> - <library:library library:name="ScriptBindingLibrary" xlink:href="$(INST)/share/basic/ScriptBindingLibrary/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> + <library:library library:name="FormWizard" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/FormWizard/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> + <library:library library:name="Template" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Template/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> + <library:library library:name="Tools" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Tools/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> + <library:library library:name="Gimmicks" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Gimmicks/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> + <library:library library:name="ImportWizard" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/ImportWizard/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> + <library:library library:name="Euro" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Euro/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> + <library:library library:name="Depot" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/Depot/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> + <library:library library:name="ScriptBindingLibrary" xlink:href="$(INST)/$(SHARE_SUBDIR_NAME)/basic/ScriptBindingLibrary/script.xlb/" xlink:type="simple" library:link="true" library:readonly="false"/> </library:libraries> diff --git a/xmlhelp/source/cxxhelp/provider/provider.cxx b/xmlhelp/source/cxxhelp/provider/provider.cxx index 892d8a78cad7..40206dba33f7 100644 --- a/xmlhelp/source/cxxhelp/provider/provider.cxx +++ b/xmlhelp/source/cxxhelp/provider/provider.cxx @@ -301,7 +301,7 @@ void ContentProvider::init() subst( aPath ); aImagesZipPaths[ 0 ] = aPath; - aPath = OUString("$BRAND_BASE_DIR/share/config"); + aPath = OUString("$BRAND_BASE_DIR/$BRAND_SHARE_SUBDIR/config"); rtl::Bootstrap::expandMacros(aPath); aImagesZipPaths[ 1 ] = aPath; diff --git a/xmlscript/test/imexp.cxx b/xmlscript/test/imexp.cxx index 9df967d6447d..9678ef3239d5 100644 --- a/xmlscript/test/imexp.cxx +++ b/xmlscript/test/imexp.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_folders.h> + #include <stdio.h> #include "osl/file.h" @@ -65,7 +67,7 @@ Reference< XComponentContext > createInitialComponentContext( inst_dir.pData, &file_url.pData ); OSL_ASSERT( osl_File_E_None == rc ); - OUString unorc = file_url + OUString("/program/" SAL_CONFIGFILE("uno") ); + OUString unorc = file_url + OUString("/" LIBO_ETC_FOLDER "/" SAL_CONFIGFILE("uno") ); return defaultBootstrap_InitialComponentContext( unorc ); } |