[Libreoffice-commits] .: 13 commits - bin/distro-install-sdk cli_ure/source comphelper/source configmgr/qa connectivity/source dbaccess/source desktop/Package_scripts.mk desktop/Pagein_common.mk desktop/scripts desktop/unx desktop/win32 extensions/source odk/cfgWin.js odk/configure.pl odk/examples odk/setsdkenv_unix.csh.in odk/setsdkenv_unix.sh.in odk/setsdkenv_windows.template odk/settings padmin/source pyuno/zipcore scp2/source scripting/examples scripting/java scripting/source setup_native/source solenv/bin solenv/gbuild solenv/inc svl/qa svtools/source testautomation/global testautomation/tools toolkit/workben vcl/unx xmlsecurity/source
Stephan Bergmann
sbergmann at kemper.freedesktop.org
Mon Oct 24 05:01:01 PDT 2011
bin/distro-install-sdk | 1
cli_ure/source/native/native_bootstrap.cxx | 44 +---
comphelper/source/officeinstdir/officeinstallationdirectories.cxx | 49 ----
comphelper/source/officeinstdir/officeinstallationdirectories.hxx | 1
configmgr/qa/unit/makefile.mk | 2
configmgr/qa/unit/urebootstrap.ini | 1
connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx | 7
dbaccess/source/ui/dlg/odbcconfig.cxx | 2
desktop/Package_scripts.mk | 1
desktop/Pagein_common.mk | 2
desktop/scripts/basis-link | 1
desktop/scripts/soffice.sh.in | 6
desktop/scripts/unoinfo.sh | 10 -
desktop/scripts/unopkg.sh | 12 -
desktop/scripts/ure-link | 1
desktop/unx/source/start.c | 2
desktop/win32/source/extendloaderenvironment.cxx | 57 +----
desktop/win32/source/unoinfo.cxx | 24 --
extensions/source/nsplugin/source/npshell.cxx | 99 ++++------
extensions/source/nsplugin/source/so_main.cxx | 10 -
extensions/source/plugin/unx/sysplug.cxx | 2
extensions/source/update/check/updatecheck.cxx | 2
odk/cfgWin.js | 35 ---
odk/configure.pl | 18 -
odk/examples/cpp/DocumentLoader/DocumentLoader.cxx | 2
odk/examples/cpp/counter/countermain.cxx | 1
odk/setsdkenv_unix.csh.in | 10 -
odk/setsdkenv_unix.sh.in | 15 -
odk/setsdkenv_windows.template | 17 -
odk/settings/std.mk | 6
padmin/source/spadmin.sh | 14 -
pyuno/zipcore/python.cxx | 12 -
pyuno/zipcore/python.sh | 2
scp2/source/base/file_base.scp | 2
scp2/source/base/folderitem_base.scp | 2
scp2/source/calc/folderitem_calc.scp | 2
scp2/source/draw/folderitem_draw.scp | 2
scp2/source/impress/folderitem_impress.scp | 2
scp2/source/math/folderitem_math.scp | 2
scp2/source/onlineupdate/file_onlineupdate.scp | 2
scp2/source/ooo/common_brand.scp | 72 +------
scp2/source/ooo/directory_ooo.scp | 37 ---
scp2/source/ooo/file_library_ooo.scp | 36 ---
scp2/source/ooo/file_ooo.scp | 8
scp2/source/ooo/folderitem_ooo.scp | 4
scp2/source/ooo/module_hidden_ooo.scp | 2
scp2/source/ooo/starregistry_ooo.scp | 34 ---
scp2/source/ooo/ure_into_ooo.scp | 8
scp2/source/sdkoo/sdkoo.scp | 48 +---
scp2/source/winexplorerext/file_winexplorerext.scp | 2
scp2/source/winexplorerext/registryitem_winexplorerext.scp | 24 +-
scp2/source/writer/folderitem_writer.scp | 2
scripting/examples/beanshell/Highlight/ShowDialog.bsh | 3
scripting/examples/java/Highlight/HighlightText.java | 3
scripting/examples/javascript/Highlight/ShowDialog.js | 3
scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java | 4
scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java | 4
scripting/source/provider/URIHelper.cxx | 3
scripting/source/pyprov/pythonscript.py | 2
setup_native/source/packinfo/packinfo_brand.txt | 1
setup_native/source/packinfo/shellscripts_brand.txt | 69 ------
setup_native/source/win32/customactions/patch/swappatchfiles.cxx | 8
setup_native/source/win32/customactions/shellextensions/layerlinks.cxx | 74 +------
solenv/bin/install-gdb-printers | 6
solenv/bin/linkoo | 8
solenv/bin/macosx-change-install-names.pl | 4
solenv/gbuild/CppunitTest.mk | 2
solenv/gbuild/RdbTarget.mk | 1
solenv/gbuild/platform/solaris.mk | 4
solenv/gbuild/platform/unxgcc.mk | 4
solenv/inc/unxaigppc.mk | 4
solenv/inc/unxgcc.mk | 4
solenv/inc/unxsoli4.mk | 4
solenv/inc/unxsols4.mk | 4
solenv/inc/unxsolu4.mk | 4
svl/qa/unit/makefile.mk | 1
svtools/source/filter/filter.cxx | 4
testautomation/global/system/includes/iniinfo.inc | 42 ----
testautomation/tools/run_tests/run_tests.sh | 2
toolkit/workben/layout/README | 4
toolkit/workben/layout/TEST | 2
toolkit/workben/layout/testrc.in | 8
vcl/unx/generic/fontmanager/helper.cxx | 5
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 2
84 files changed, 252 insertions(+), 800 deletions(-)
New commits:
commit c73dce072584fa58382c8158c2bc80bf0a7421c5
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Mon Oct 24 13:51:06 2011 +0200
lost }
diff --git a/odk/examples/cpp/counter/countermain.cxx b/odk/examples/cpp/counter/countermain.cxx
index e1ab0a1..008af0d 100644
--- a/odk/examples/cpp/counter/countermain.cxx
+++ b/odk/examples/cpp/counter/countermain.cxx
@@ -100,5 +100,6 @@ SAL_IMPLEMENT_MAIN()
OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US).getStr());
exit(1);
}
+}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit b786a33cfdca2e8a4114ddef0340e0e0628dd09c
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Oct 21 17:18:13 2011 +0200
Undo basis/brand split: Move SDK and ure-link, remove OOO_BASE_DIR and BaseInstallation.
diff --git a/bin/distro-install-sdk b/bin/distro-install-sdk
index 05175f6..e694aeb 100755
--- a/bin/distro-install-sdk
+++ b/bin/distro-install-sdk
@@ -66,7 +66,6 @@ if test -d $DESTDIR$INSTALLDIR/basis$PRODUCTVERSION/sdk ; then
sed -e "s, at OO_SDK_NAME@,openoffice.org${PRODUCTVERSION}_sdk," \
-e "s, at OO_SDK_HOME@,$INSTALLDIR/basis$PRODUCTVERSION/sdk," \
-e "s, at OFFICE_HOME@,$INSTALLDIR," \
- -e "s, at OFFICE_BASE_HOME@,$INSTALLDIR/basis$PRODUCTVERSION," \
-e "s, at OO_SDK_URE_HOME@,$INSTALLDIR/basis$PRODUCTVERSION/ure-link," \
-e "s, at OO_SDK_MAKE_HOME@,/usr/bin," \
-e "s, at OO_SDK_ZIP_HOME@,/usr/bin," \
diff --git a/cli_ure/source/native/native_bootstrap.cxx b/cli_ure/source/native/native_bootstrap.cxx
index 4c6be73..88c911a 100644
--- a/cli_ure/source/native/native_bootstrap.cxx
+++ b/cli_ure/source/native/native_bootstrap.cxx
@@ -58,7 +58,6 @@ namespace cli_ure {
}
#define INSTALL_PATH L"Software\\LibreOffice\\UNO\\InstallPath"
-#define BASIS_LINK L"\\basis-link"
#define URE_LINK L"\\ure-link"
#define URE_BIN L"\\bin"
#define UNO_PATH L"UNO_PATH"
@@ -178,37 +177,22 @@ WCHAR* getUnoPath()
WCHAR * szInstallPath = getInstallPath();
if (szInstallPath)
{
- //build the path tho the basis-link file
oneDirUp(szInstallPath);
- int sizeLinkPath = lstrlen(szInstallPath) + lstrlen(INSTALL_PATH) + 1;
- if (sizeLinkPath < MAX_PATH)
- sizeLinkPath = MAX_PATH;
- szLinkPath = new WCHAR[sizeLinkPath];
- szLinkPath[0] = L'\0';
- lstrcat(szLinkPath, szInstallPath);
- lstrcat(szLinkPath, BASIS_LINK);
-
- //get the path to the actual Basis folder
- if (cli_ure::resolveLink(szLinkPath))
+
+ //build the path to the ure-link file
+ szUrePath = new WCHAR[MAX_PATH];
+ szUrePath[0] = L'\0';
+ lstrcat(szUrePath, szInstallPath);
+ lstrcat(szUrePath, URE_LINK);
+
+ //get the path to the actual Ure folder
+ if (cli_ure::resolveLink(szUrePath))
{
- //build the path to the ure-link file
- int sizeUrePath = lstrlen(szLinkPath) + lstrlen(URE_LINK) + 1;
- if (sizeUrePath < MAX_PATH)
- sizeUrePath = MAX_PATH;
- szUrePath = new WCHAR[sizeUrePath];
- szUrePath[0] = L'\0';
- lstrcat(szUrePath, szLinkPath);
- lstrcat(szUrePath, URE_LINK);
-
- //get the path to the actual Ure folder
- if (cli_ure::resolveLink(szUrePath))
- {
- //build the path to the URE/bin directory
- szUreBin = new WCHAR[lstrlen(szUrePath) + lstrlen(URE_BIN) + 1];
- szUreBin[0] = L'\0';
- lstrcat(szUreBin, szUrePath);
- lstrcat(szUreBin, URE_BIN);
- }
+ //build the path to the URE/bin directory
+ szUreBin = new WCHAR[lstrlen(szUrePath) + lstrlen(URE_BIN) + 1];
+ szUreBin[0] = L'\0';
+ lstrcat(szUreBin, szUrePath);
+ lstrcat(szUreBin, URE_BIN);
}
}
#if OSL_DEBUG_LEVEL >=2
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
index 35bcfec..0e5c081 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx
@@ -107,7 +107,6 @@ OfficeInstallationDirectories::OfficeInstallationDirectories(
m_aUserDirMacro( RTL_CONSTASCII_USTRINGPARAM( "$(userdataurl)" ) ),
m_xCtx( xCtx ),
m_pOfficeBrandDir( 0 ),
- m_pOfficeBaseDir( 0 ),
m_pUserDir( 0 )
{
}
@@ -117,7 +116,6 @@ OfficeInstallationDirectories::OfficeInstallationDirectories(
OfficeInstallationDirectories::~OfficeInstallationDirectories()
{
delete m_pOfficeBrandDir;
- delete m_pOfficeBaseDir;
delete m_pUserDir;
}
@@ -168,24 +166,13 @@ OfficeInstallationDirectories::makeRelocatableURL( const rtl::OUString& URL )
}
else
{
- nIndex = aCanonicalURL.indexOf( *m_pOfficeBaseDir );
+ nIndex = aCanonicalURL.indexOf( *m_pUserDir );
if ( nIndex != -1 )
{
return rtl::OUString(
aCanonicalURL.replaceAt( nIndex,
- m_pOfficeBaseDir->getLength(),
- m_aOfficeBaseDirMacro ) );
- }
- else
- {
- nIndex = aCanonicalURL.indexOf( *m_pUserDir );
- if ( nIndex != -1 )
- {
- return rtl::OUString(
- aCanonicalURL.replaceAt( nIndex,
- m_pUserDir->getLength(),
- m_aUserDirMacro ) );
- }
+ m_pUserDir->getLength(),
+ m_aUserDirMacro ) );
}
}
}
@@ -212,28 +199,15 @@ OfficeInstallationDirectories::makeAbsoluteURL( const rtl::OUString& URL )
}
else
{
- nIndex = URL.indexOf( m_aOfficeBaseDirMacro );
+ nIndex = URL.indexOf( m_aUserDirMacro );
if ( nIndex != -1 )
{
initDirs();
return rtl::OUString(
URL.replaceAt( nIndex,
- m_aOfficeBaseDirMacro.getLength(),
- *m_pOfficeBaseDir ) );
- }
- else
- {
- nIndex = URL.indexOf( m_aUserDirMacro );
- if ( nIndex != -1 )
- {
- initDirs();
-
- return rtl::OUString(
- URL.replaceAt( nIndex,
- m_aUserDirMacro.getLength(),
- *m_pUserDir ) );
- }
+ m_aUserDirMacro.getLength(),
+ *m_pUserDir ) );
}
}
}
@@ -331,7 +305,6 @@ void OfficeInstallationDirectories::initDirs()
if ( m_pOfficeBrandDir == 0 )
{
m_pOfficeBrandDir = new rtl::OUString;
- m_pOfficeBaseDir = new rtl::OUString;
m_pUserDir = new rtl::OUString;
uno::Reference< util::XMacroExpander > xExpander;
@@ -355,16 +328,6 @@ void OfficeInstallationDirectories::initDirs()
makeCanonicalFileURL( *m_pOfficeBrandDir );
- *m_pOfficeBaseDir =
- xExpander->expandMacros(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap" ) ":BaseInstallation}" ) ) );
-
- OSL_ENSURE( m_pOfficeBaseDir->getLength() > 0,
- "Unable to obtain office base installation directory!" );
-
- makeCanonicalFileURL( *m_pOfficeBaseDir );
-
*m_pUserDir =
xExpander->expandMacros(
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
index 00f5b81..86e8537 100644
--- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
+++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx
@@ -101,7 +101,6 @@ private:
com::sun::star::uno::Reference<
com::sun::star::uno::XComponentContext > m_xCtx;
rtl::OUString * m_pOfficeBrandDir;
- rtl::OUString * m_pOfficeBaseDir;
rtl::OUString * m_pUserDir;
};
diff --git a/configmgr/qa/unit/makefile.mk b/configmgr/qa/unit/makefile.mk
index 7847978..60c3df7 100755
--- a/configmgr/qa/unit/makefile.mk
+++ b/configmgr/qa/unit/makefile.mk
@@ -69,7 +69,7 @@ TEST .PHONY: $(SHL1TARGETN) $(MISC)/unit.rdb
mkdir $(MISC)/unitdata/basis
mkdir $(MISC)/unitdata/basis/program
echo '[Bootstrap]' > $(MISC)/unitdata/basis/program/uno$(MY_INI)
- echo 'UNO_SHARED_PACKAGES_CACHE = $$OOO_BASE_DIR' \
+ echo 'UNO_SHARED_PACKAGES_CACHE = $$BRAND_BASE_DIR' \
>> $(MISC)/unitdata/basis/program/uno$(MY_INI)
echo 'UNO_USER_PACKAGES_CACHE =' \
'$${$$BRAND_BASE_DIR/program/bootstrap$(MY_INI):UserInstallation}' \
diff --git a/configmgr/qa/unit/urebootstrap.ini b/configmgr/qa/unit/urebootstrap.ini
index c413645..341174f 100755
--- a/configmgr/qa/unit/urebootstrap.ini
+++ b/configmgr/qa/unit/urebootstrap.ini
@@ -26,5 +26,4 @@
#***********************************************************************/
[Bootstrap]
-OOO_BASE_DIR = $ORIGIN/basis
BRAND_BASE_DIR = $ORIGIN/brand
diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
index d70e1e2..e06462c 100644
--- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
+++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx
@@ -126,12 +126,7 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists)
nsCOMPtr<nsILocalFile> binDir;
// Note: if path3 construction fails, mozilla will default to using MOZILLA_FIVE_HOME in the NS_InitXPCOM2()
rtl::OUString path1(
-#if defined WNT
- RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program")
-#else
- RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/program")
-#endif
- );
+ RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program"));
rtl::Bootstrap::expandMacros(path1);
rtl::OString path2;
if ((osl::FileBase::getSystemPathFromFileURL(path1, path1) ==
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index a59ad5b..e0e7d35 100644
--- a/desktop/Package_scripts.mk
+++ b/desktop/Package_scripts.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_Package_Package,desktop_scripts,$(SRCDIR)/desktop/scripts))
ifeq ($(OS),WNT)
-$(eval $(call gb_Package_add_file,desktop_scripts,bin/basis-link,basis-link))
$(eval $(call gb_Package_add_file,desktop_scripts,bin/ure-link,ure-link))
else
diff --git a/desktop/Pagein_common.mk b/desktop/Pagein_common.mk
index a9d46eb..3b0330c 100644
--- a/desktop/Pagein_common.mk
+++ b/desktop/Pagein_common.mk
@@ -61,7 +61,7 @@ $(eval $(call desktop_Pagein_add_libs_with_dir,common,\
cppuhelper \
cppu \
sal \
- ,../basis-link/ure-link/lib \
+ ,../ure-link/lib \
))
$(eval $(call desktop_Pagein_add_libs,common,\
diff --git a/desktop/scripts/basis-link b/desktop/scripts/basis-link
deleted file mode 100755
index 3af8420..0000000
--- a/desktop/scripts/basis-link
+++ /dev/null
@@ -1 +0,0 @@
-Basis
\ No newline at end of file
diff --git a/desktop/scripts/soffice.sh.in b/desktop/scripts/soffice.sh.in
index 28ee889..86ea49f 100755
--- a/desktop/scripts/soffice.sh.in
+++ b/desktop/scripts/soffice.sh.in
@@ -131,8 +131,8 @@ fi
case "`uname -s`" in
NetBSD|OpenBSD|FreeBSD|DragonFly)
# this is a temporary hack until we can live with the default search paths
- sd_prog1="$sd_prog/../basis-link/program"
- sd_prog2="$sd_prog/../basis-link/ure-link/lib"
+ sd_prog1="$sd_prog"
+ sd_prog2="$sd_prog/../ure-link/lib"
LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
export LD_LIBRARY_PATH
@@ -141,7 +141,7 @@ NetBSD|OpenBSD|FreeBSD|DragonFly)
fi
;;
AIX)
- LIBPATH=$sd_prog:$sd_prog/../basis-link/program:$sd_prog/../basis-link/ure-link/lib${LIBPATH:+:$LIBPATH}
+ LIBPATH=$sd_prog:$sd_prog/../ure-link/lib${LIBPATH:+:$LIBPATH}
export LIBPATH
;;
esac
diff --git a/desktop/scripts/unoinfo.sh b/desktop/scripts/unoinfo.sh
index a756615..97ee445 100755
--- a/desktop/scripts/unoinfo.sh
+++ b/desktop/scripts/unoinfo.sh
@@ -40,14 +40,14 @@ sd_prog=`pwd`
case $1 in
c++)
- printf '%s' "$sd_prog/../basis-link/ure-link/lib"
+ printf '%s' "$sd_prog/../ure-link/lib"
;;
java)
printf '0%s\0%s\0%s\0%s\0%s' \
- "$sd_prog/../basis-link/ure-link/share/java/ridl.jar" \
- "$sd_prog/../basis-link/ure-link/share/java/jurt.jar" \
- "$sd_prog/../basis-link/ure-link/share/java/juh.jar" \
- "$sd_prog/../basis-link/program/classes/unoil.jar" "$sd_prog"
+ "$sd_prog/../ure-link/share/java/ridl.jar" \
+ "$sd_prog/../ure-link/share/java/jurt.jar" \
+ "$sd_prog/../ure-link/share/java/juh.jar" \
+ "$sd_prog/../program/classes/unoil.jar" "$sd_prog"
;;
*)
exit 1
diff --git a/desktop/scripts/unopkg.sh b/desktop/scripts/unopkg.sh
index 54918f0..9856d19 100755
--- a/desktop/scripts/unopkg.sh
+++ b/desktop/scripts/unopkg.sh
@@ -45,8 +45,8 @@ cd "$sd_cwd"
# this is a temporary hack until we can live with the default search paths
case "`uname -s`" in
NetBSD|OpenBSD|FreeBSD|DragonFly)
- sd_prog1="$sd_prog/../basis-link/program"
- sd_prog2="$sd_prog/../basis-link/ure-link/lib"
+ sd_prog1="$sd_prog"
+ sd_prog2="$sd_prog/../ure-link/lib"
LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH:+:${LD_LIBRARY_PATH}}
JAVA_HOME=$(javaPathHelper -h libreoffice-java 2> /dev/null)
export LD_LIBRARY_PATH
@@ -55,8 +55,8 @@ NetBSD|OpenBSD|FreeBSD|DragonFly)
fi
;;
AIX)
- sd_prog1="$sd_prog/../basis-link/program"
- sd_prog2="$sd_prog/../basis-link/ure-link/lib"
+ sd_prog1="$sd_prog"
+ sd_prog2="$sd_prog/../ure-link/lib"
LIBPATH=$sd_prog1:$sd_prog2${LIBPATH:+:${LIBPATH}}
export LIBPATH
;;
@@ -83,8 +83,8 @@ then
fi
# extend the ld_library_path for java: javaldx checks the sofficerc for us
-if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
- my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \
+if [ -x "$sd_prog/../ure-link/bin/javaldx" ] ; then
+ my_path=`"$sd_prog/../ure-link/bin/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
if [ -n "$my_path" ] ; then
sd_platform=`uname -s`
diff --git a/desktop/scripts/ure-link b/desktop/scripts/ure-link
index dd0ecb6..122de34 100755
--- a/desktop/scripts/ure-link
+++ b/desktop/scripts/ure-link
@@ -1 +1 @@
-..\URE
\ No newline at end of file
+URE
\ No newline at end of file
diff --git a/desktop/unx/source/start.c b/desktop/unx/source/start.c
index c3f7f24..b22f10f 100755
--- a/desktop/unx/source/start.c
+++ b/desktop/unx/source/start.c
@@ -737,7 +737,7 @@ exec_javaldx (Args *args)
rtl_uString_newFromAscii( &pApp, "file://" );
rtl_uString_newConcat( &pApp, pApp, args->pAppPath );
pTmp = NULL;
- rtl_uString_newFromAscii( &pTmp, "../basis-link/ure-link/bin/javaldx" );
+ rtl_uString_newFromAscii( &pTmp, "../ure-link/bin/javaldx" );
rtl_uString_newConcat( &pApp, pApp, pTmp );
rtl_uString_release( pTmp );
diff --git a/desktop/win32/source/extendloaderenvironment.cxx b/desktop/win32/source/extendloaderenvironment.cxx
index 2d1f09a..8a313f2 100644
--- a/desktop/win32/source/extendloaderenvironment.cxx
+++ b/desktop/win32/source/extendloaderenvironment.cxx
@@ -111,63 +111,30 @@ void extendLoaderEnvironment(WCHAR * binPath, WCHAR * iniDirectory) {
nameEnd[-1] = 'n';
tools::buildPath(binPath, iniDirectory, iniDirEnd, name, nameEnd - name);
*iniDirEnd = L'\0';
- WCHAR path[MAX_PATH];
- WCHAR * pathEnd = tools::buildPath(
- path, iniDirectory, iniDirEnd, MY_STRING(L"..\\basis-link"));
- if (pathEnd == NULL) {
- fail();
- }
std::size_t const maxEnv = 32767;
- WCHAR pad[2 * MAX_PATH + maxEnv];
+ WCHAR pad[MAX_PATH + maxEnv];
// hopefully std::size_t is large enough to not overflow
- WCHAR * padEnd = NULL;
- WCHAR env[maxEnv];
- DWORD n = GetEnvironmentVariableW(L"PATH", env, maxEnv);
- if ((n >= maxEnv || n == 0) && GetLastError() != ERROR_ENVVAR_NOT_FOUND) {
- fail();
- }
- env[n] = L'\0';
- bool exclude1;
- pathEnd = tools::resolveLink(path);
+ WCHAR * pathEnd = tools::buildPath(
+ pad, iniDirectory, iniDirEnd, MY_STRING(L"..\\ure-link"));
if (pathEnd == NULL) {
- if (GetLastError() != ERROR_FILE_NOT_FOUND) {
- fail();
- }
- // This path is only taken by testtool.exe in basis program directory;
- // its PATH needs to include the brand program directory:
- pathEnd = tools::buildPath(
- path, iniDirectory, iniDirEnd, MY_STRING(L".."));
- if (pathEnd == NULL) {
- fail();
- }
- padEnd = tools::buildPath(
- pad, path, pathEnd, MY_STRING(L"\\..\\program"));
- if (padEnd == NULL) {
- fail();
- }
- exclude1 = contains(env, pad, padEnd);
- } else {
- exclude1 = true;
+ fail();
}
- WCHAR * pad2 = exclude1 ? pad : padEnd + 1;
- pathEnd = tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link"));
+ pathEnd = tools::resolveLink(pad);
if (pathEnd == NULL) {
fail();
}
- pathEnd = tools::resolveLink(path);
+ pathEnd = tools::buildPath(pad, pad, pathEnd, MY_STRING(L"\\bin"));
if (pathEnd == NULL) {
fail();
}
- padEnd = tools::buildPath(pad2, path, pathEnd, MY_STRING(L"\\bin"));
- if (padEnd == NULL) {
+ WCHAR env[maxEnv];
+ DWORD n = GetEnvironmentVariableW(L"PATH", env, maxEnv);
+ if ((n >= maxEnv || n == 0) && GetLastError() != ERROR_ENVVAR_NOT_FOUND) {
fail();
}
- bool exclude2 = contains(env, pad2, padEnd);
- if (!(exclude1 && exclude2)) {
- if (!(exclude1 || exclude2)) {
- pad2[-1] = L';';
- }
- WCHAR * p = exclude2 ? pad2 - 1 : padEnd;
+ env[n] = L'\0';
+ if (!contains(env, pad, pathEnd)) {
+ WCHAR * p = pathEnd;
if (n != 0) {
*p++ = L';';
}
diff --git a/desktop/win32/source/unoinfo.cxx b/desktop/win32/source/unoinfo.cxx
index 0ce5c98..ac0cd87 100644
--- a/desktop/win32/source/unoinfo.cxx
+++ b/desktop/win32/source/unoinfo.cxx
@@ -88,15 +88,8 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
#endif
wchar_t path[MAX_PATH];
wchar_t * pathEnd = getBrandPath(path);
- if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link"))
- == NULL)
- {
- exit(EXIT_FAILURE);
- }
- pathEnd = tools::resolveLink(path);
- if (pathEnd == NULL ||
- (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link")) ==
- NULL))
+ if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\ure-link")) ==
+ NULL)
{
exit(EXIT_FAILURE);
}
@@ -116,18 +109,9 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
wchar_t path[MAX_PATH];
wchar_t * pathEnd = getBrandPath(path);
writePath(path, pathEnd, MY_STRING(L""));
- if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\basis-link"))
- == NULL)
- {
- exit(EXIT_FAILURE);
- }
- pathEnd = tools::resolveLink(path);
- if (pathEnd == NULL) {
- exit(EXIT_FAILURE);
- }
writeNull();
- writePath(path, pathEnd, MY_STRING(L"\\program\\classes\\unoil.jar"));
- if (tools::buildPath(path, path, pathEnd, MY_STRING(L"\\ure-link")) ==
+ writePath(path, pathEnd, MY_STRING(L"classes\\unoil.jar"));
+ if (tools::buildPath(path, path, pathEnd, MY_STRING(L"..\\ure-link")) ==
NULL)
{
exit(EXIT_FAILURE);
diff --git a/extensions/source/nsplugin/source/npshell.cxx b/extensions/source/nsplugin/source/npshell.cxx
index 91ab12e..25659d4 100644
--- a/extensions/source/nsplugin/source/npshell.cxx
+++ b/extensions/source/nsplugin/source/npshell.cxx
@@ -145,19 +145,12 @@ bool extendEnvironment(boost::scoped_array< WCHAR > * environment) {
//TODO: conversion errors
if (len == 0 ||
(tools::buildPath(
- path, pathBegin, path + len - 1, MY_STRING(L"\\basis-link"))
+ path, pathBegin, path + len - 1, MY_STRING(L"\\ure-link"))
== NULL))
{
return false;
}
WCHAR * pathEnd = tools::resolveLink(path);
- if (pathEnd == NULL ||
- (tools::buildPath(path, pathBegin, pathEnd, MY_STRING(L"\\ure-link")) ==
- NULL))
- {
- return false;
- }
- pathEnd = tools::resolveLink(path);
if (pathEnd == NULL) {
return false;
}
diff --git a/extensions/source/nsplugin/source/so_main.cxx b/extensions/source/nsplugin/source/so_main.cxx
index d371627..662a1c2 100644
--- a/extensions/source/nsplugin/source/so_main.cxx
+++ b/extensions/source/nsplugin/source/so_main.cxx
@@ -303,19 +303,15 @@ Reference< lang::XMultiServiceFactory > SAL_CALL start_office(NSP_PIPE_FD read_f
// env string
::rtl::OUStringBuffer buf;
- OUString aIniPath, aPluginPipeName;
+ OUString aPath, aPluginPipeName;
- if(!Bootstrap::get(OUSTR("BRAND_BASE_DIR"), aIniPath))
+ if(!Bootstrap::get(OUSTR("BRAND_BASE_DIR"), aPath))
{
debug_fprintf(NSP_LOG_APPEND,"failed to get BRAND_BASE_DIR!\n");
return Reference< lang::XMultiServiceFactory >(NULL);
}
- aIniPath += OUSTR("/program/");
- aIniPath += OUSTR(SAL_CONFIGFILE("bootstrap"));
- Bootstrap aVersionFile(aIniPath);
- aVersionFile.getFrom(OUSTR("BaseInstallation"), aPluginPipeName, OUString());
- aPluginPipeName = ::rtl::OUString::valueOf( aPluginPipeName.hashCode() );
+ aPluginPipeName = ::rtl::OUString::valueOf( aPath.hashCode() );
// accept string
OSL_ASSERT( buf.getLength() == 0 );
diff --git a/extensions/source/update/check/updatecheck.cxx b/extensions/source/update/check/updatecheck.cxx
index 09821ab..7430a36 100644
--- a/extensions/source/update/check/updatecheck.cxx
+++ b/extensions/source/update/check/updatecheck.cxx
@@ -124,7 +124,7 @@ static inline rtl::OUString getBuildId()
//------------------------------------------------------------------------------
static inline rtl::OUString getBaseInstallation()
{
- rtl::OUString aPathVal(UNISTRING("${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE("bootstrap") ":BaseInstallation}"));
+ rtl::OUString aPathVal(UNISTRING("$BRAND_BASE_DIR"));
rtl::Bootstrap::expandMacros(aPathVal);
return aPathVal;
}
diff --git a/odk/cfgWin.js b/odk/cfgWin.js
index 961f15a..81fed05 100644
--- a/odk/cfgWin.js
+++ b/odk/cfgWin.js
@@ -36,7 +36,6 @@ var oo_user_sdk_dir=WshSysEnv("APPDATA") + "\\" + oo_sdk_name;
var oo_user_sdk_env_script=oo_user_sdk_dir + "\\setsdkenv_windows.bat";
var office_home=getOfficeHome();
-var office_base_home=getOfficeBaseHome();
var oo_sdk_ure_home=getUreHome();
var oo_sdk_make_home=getMakeHome();
@@ -215,12 +214,6 @@ function getOfficeHome()
function searchOffice()
{
var tmp = oo_sdk_home;
- var officepath ="";
- var index=-1;
-
- if ((index = tmp.lastIndexOf("\\Basis")) != -1) {
- tmp = tmp.substr(0, index);
- }
if (aFileSystemObject.FileExists(tmp + "\\program\\soffice.exe")) {
return tmp;
@@ -230,23 +223,10 @@ function searchOffice()
}
-function getOfficeBaseHome()
-{
- var officebase = oo_sdk_home;
- var index=officebase.lastIndexOf("\\");
-
- officebase = officebase.substr(0, index);
-
- return officebase;
-}
-
function getUreHome()
{
var tmpure = oo_sdk_home;
var ure = "";
- var index=0;
- if ((index = tmpure.lastIndexOf("Basis")) != -1)
- tmpure = tmpure.substr(0, index);
if (aFileSystemObject.FileExists(tmpure + "\\URE\\bin\\uno.exe")) {
ure = tmpure + "\URE";
@@ -792,16 +772,13 @@ function writeBatFile(fdir, file)
"set OO_SDK_NAME=" + oo_sdk_name +
"\n\n" +
"REM Installation directory of the Software Development Kit.\n" +
- "REM Example: set OO_SDK_HOME=C:\\Program Files\\LibreOffice 3\\Basis\\sdk\n" +
+ "REM Example: set OO_SDK_HOME=C:\\Program Files\\LibreOffice 3\\sdk\n" +
"set OO_SDK_HOME=" + oo_sdk_home +
"\n\n" +
"REM Office installation directory.\n" +
"REM Example: set OFFICE_HOME=C:\\Program Files\\LibreOffice 3\n" +
"set OFFICE_HOME=" + office_home +
"\n\n" +
- "REM Example: set OFFICE_HOME=C:\\Program Files\\LibreOffice 3\\Basis\n" +
- "set OFFICE_BASE_HOME=" + office_base_home +
- "\n\n" +
"REM URE installation directory.\n" +
"REM Example: set OO_SDK_URE_HOME=C:\\Program Files\\LibreOffice 3\\URE\n" +
"set OO_SDK_URE_HOME=" + oo_sdk_ure_home +
@@ -874,11 +851,6 @@ function writeBatFile(fdir, file)
" set OFFICE_PROGRAM_PATH=%OFFICE_HOME%\\program\n" +
" )\n" +
"\n" +
- "REM Set office program path.\n" +
- "if defined OFFICE_BASE_HOME (\n" +
- " set OFFICE_BASE_PROGRAM_PATH=%OFFICE_BASE_HOME%\\program\n" +
- " )\n" +
- "\n" +
"REM Set UNO path, necessary to ensure that the cpp examples using the\n" +
"REM new UNO bootstrap mechanism use the configured office installation\n" +
"REM (only set when using an Office).\n" +
@@ -892,8 +864,8 @@ function writeBatFile(fdir, file)
"set OO_SDK_URE_JAVA_DIR=%OO_SDK_URE_HOME%\\java\n" +
"REM ) else (\n" +
"set OO_SDK_OFFICE_BIN_DIR=%OFFICE_PROGRAM_PATH%\n" +
- "set OO_SDK_OFFICE_LIB_DIR=%OFFICE_BASE_PROGRAM_PATH%\n" +
- "set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_BASE_PROGRAM_PATH%\\classes\n" +
+ "set OO_SDK_OFFICE_LIB_DIR=%OFFICE_PROGRAM_PATH%\n" +
+ "set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_PROGRAM_PATH%\\classes\n" +
"REM )\n" +
"\n" +
"REM Set classpath\n" +
@@ -945,7 +917,6 @@ function writeBatFile(fdir, file)
"echo *\n" +
"echo * SDK = %OO_SDK_HOME%\n" +
"echo * Office = %OFFICE_HOME%\n" +
- "echo * Office Base = %OFFICE_BASE_HOME%\n" +
"echo * URE = %OO_SDK_URE_HOME%\n" +
"echo * Make = %OO_SDK_MAKE_HOME%\n" +
"echo * Zip = %OO_SDK_ZIP_HOME%\n" +
diff --git a/odk/configure.pl b/odk/configure.pl
index c03fe00..533c881 100755
--- a/odk/configure.pl
+++ b/odk/configure.pl
@@ -30,8 +30,6 @@ $main::OFFICE_OR_URE_SUGGESTION = "Office";
$main::OFFICE_HOME = "";
-$main::OFFICE_BASE_HOME = substr($main::sdkpath, 0, rindex($main::sdkpath, "/sdk"));
-
$main::OO_SDK_URE_HOME = `cd $main::sdkpath/../ure-link && pwd`;
chomp($main::OO_SDK_URE_HOME);
@@ -108,21 +106,12 @@ if ( $main::OFFICE_OR_URE eq "Office" )
}
# check more details
- if ( -d "$main::OFFICE_HOME/Contents/basis-link" ) {
- $main::OFFICE_BASE_HOME = "$main::OFFICE_HOME/Contents/basis-link";
- if ( -d "$main::OFFICE_BASE_HOME/ure-link" ) {
- $main::OO_SDK_URE_HOME = "$main::OFFICE_BASE_HOME/ure-link";
- } else {
- $main::OFFICE_HOME = "";
- $main::OFFICE_BASE_HOME = "";
- $main::OO_SDK_URE_HOME = "";
- print " Error: no URE found in office installation, please specify the path to a valid installation.\n";
- }
+ if ( -d "$main::OFFICE_HOME/Contents/ure-link" ) {
+ $main::OO_SDK_URE_HOME = "$main::OFFICE_HOME/Contents/ure-link";
} else {
$main::OFFICE_HOME = "";
- $main::OFFICE_BASE_HOME = "";
$main::OO_SDK_URE_HOME = "";
- print " Error: no base layer found in office installation, please specify the path to a valid installation.\n";
+ print " Error: no URE found in office installation, please specify the path to a valid installation.\n";
}
}
} else
@@ -785,7 +774,6 @@ sub prepareScriptFile()
$_ =~ s#\@OO_SDK_NAME\@#$main::OO_SDK_NAME#go;
$_ =~ s#\@OO_SDK_HOME\@#$main::OO_SDK_HOME#go;
$_ =~ s#\@OFFICE_HOME\@#$main::OFFICE_HOME#go;
- $_ =~ s#\@OFFICE_BASE_HOME\@#$main::OFFICE_BASE_HOME#go;
$_ =~ s#\@OO_SDK_URE_HOME\@#$main::OO_SDK_URE_HOME#go;
$_ =~ s#\@OO_SDK_MAKE_HOME\@#$main::OO_SDK_MAKE_HOME#go;
$_ =~ s#\@OO_SDK_ZIP_HOME\@#$main::OO_SDK_ZIP_HOME#go;
diff --git a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
index e0416f8..47daa75 100644
--- a/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
+++ b/odk/examples/cpp/DocumentLoader/DocumentLoader.cxx
@@ -79,7 +79,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
if (nCount < 1)
{
printf("using: DocumentLoader -env:URE_MORE_TYPES=<office_types_rdb_url> <file_url> [<uno_connection_url>]\n\n"
- "example: DocumentLoader -env:URE_MORE_TYPES=\"file:///.../basis-link/program/offapi.rdb\" \"file:///e:/temp/test.odt\" \"uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager\"\n");
+ "example: DocumentLoader -env:URE_MORE_TYPES=\"file:///.../program/offapi.rdb\" \"file:///e:/temp/test.odt\" \"uno:socket,host=localhost,port=2083;urp;StarOffice.ServiceManager\"\n");
exit(1);
}
if (nCount == 2)
diff --git a/odk/setsdkenv_unix.csh.in b/odk/setsdkenv_unix.csh.in
index f48be7b..f5a2cdc 100644
--- a/odk/setsdkenv_unix.csh.in
+++ b/odk/setsdkenv_unix.csh.in
@@ -65,11 +65,6 @@ if ( "${OFFICE_HOME}" != "" ) then
setenv OFFICE_PROGRAM_PATH "${OFFICE_HOME}/${programdir}"
endif
-# Set office base program path.
-if ( "${OFFICE_BASE_HOME}" != "" ) then
- setenv OFFICE_BASE_PROGRAM_PATH "${OFFICE_BASE_HOME}/program"
-endif
-
# Set UNO path, necessary to ensure that the cpp examples using the
# new UNO bootstrap mechanism use the configured office installation.
@@ -83,8 +78,8 @@ if ( "${OO_SDK_URE_HOME}" != "" ) then
setenv OO_SDK_URE_JAVA_DIR "${OO_SDK_URE_HOME}/share/java"
else
setenv OO_SDK_URE_BIN_DIR "${OFFICE_PROGRAM_PATH}"
- setenv OO_SDK_URE_LIB_DIR "${OFFICE_BASE_PROGRAM_PATH}"
- setenv OO_SDK_URE_JAVA_DIR "${OFFICE_BASE_PROGRAM_PATH}/classes"
+ setenv OO_SDK_URE_LIB_DIR "${OFFICE_PROGRAM_PATH}"
+ setenv OO_SDK_URE_JAVA_DIR "${OFFICE_PROGRAM_PATH}/classes"
endif
# Set SDK example output directory
@@ -261,7 +256,6 @@ echo " * SDK environment is prepared for ${platform}"
echo " *"
echo " * SDK = ${OO_SDK_HOME}"
echo " * Office = ${OFFICE_HOME}"
-echo " * Office Base = ${OFFICE_BASE_HOME}"
echo " * URE = ${OO_SDK_URE_HOME}"
echo " * Make = ${OO_SDK_MAKE_HOME}"
echo " * Zip = ${OO_SDK_ZIP_HOME}"
diff --git a/odk/setsdkenv_unix.sh.in b/odk/setsdkenv_unix.sh.in
index 91bf164..5ed1aff 100644
--- a/odk/setsdkenv_unix.sh.in
+++ b/odk/setsdkenv_unix.sh.in
@@ -15,7 +15,6 @@ OO_SDK_HOME='@OO_SDK_HOME@'
# Office installation directory.
# Example: OFFICE_HOME=/opt/libreoffice
OFFICE_HOME='@OFFICE_HOME@'
-OFFICE_BASE_HOME='@OFFICE_BASE_HOME@'
# URE installation directory.
# Example: OO_SDK_URE_HOME=/opt/libreoffice/ure
@@ -87,13 +86,6 @@ then
export OFFICE_PROGRAM_PATH
fi
-# Set office program path (only set when using an Office).
-if [ "${OFFICE_BASE_HOME}" ]
-then
- OFFICE_BASE_PROGRAM_PATH=${OFFICE_BASE_HOME}/program
- export OFFICE_BASE_PROGRAM_PATH
-fi
-
# Set UNO path, necessary to ensure that the cpp examples using the
# new UNO bootstrap mechanism use the configured office installation (only set
@@ -111,8 +103,8 @@ then
OO_SDK_URE_JAVA_DIR=${OO_SDK_URE_HOME}/share/java
else
OO_SDK_URE_BIN_DIR=${OFFICE_PROGRAM_PATH}
- OO_SDK_URE_LIB_DIR=${OFFICE_BASE_PROGRAM_PATH}
- OO_SDK_URE_JAVA_DIR=${OFFICE_BASE_PROGRAM_PATH}/classes
+ OO_SDK_URE_LIB_DIR=${OFFICE_PROGRAM_PATH}
+ OO_SDK_URE_JAVA_DIR=${OFFICE_PROGRAM_PATH}/classes
fi
export OO_SDK_URE_BIN_DIR
export OO_SDK_URE_LIB_DIR
@@ -225,7 +217,7 @@ esac
PATH=${OO_SDK_HOME}/bin:${OO_SDK_OUT}/${exampleout}/bin:${OO_SDK_URE_BIN_DIR}:${OFFICE_PROGRAM_PATH}:.:${PATH}
# Set the classpath
-CLASSPATH=${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/jurt.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar:${OFFICE_BASE_PROGRAM_PATH}/classes/unoil.jar:${CLASSPATH}
+CLASSPATH=${OO_SDK_URE_JAVA_DIR}/juh.jar:${OO_SDK_URE_JAVA_DIR}/jurt.jar:${OO_SDK_URE_JAVA_DIR}/ridl.jar:${OO_SDK_URE_JAVA_DIR}/unoloader.jar:${OFFICE_PROGRAM_PATH}/classes/unoil.jar:${CLASSPATH}
export CLASSPATH
@@ -307,7 +299,6 @@ echo " * SDK environment is prepared for ${platform}"
echo " *"
echo " * SDK = $OO_SDK_HOME"
echo " * Office = $OFFICE_HOME"
-echo " * Office Base = $OFFICE_BASE_HOME"
echo " * URE = $OO_SDK_URE_HOME"
echo " * Make = $OO_SDK_MAKE_HOME"
echo " * Zip = $OO_SDK_ZIP_HOME"
diff --git a/odk/setsdkenv_windows.template b/odk/setsdkenv_windows.template
index fbe09f9..96877d2 100755
--- a/odk/setsdkenv_windows.template
+++ b/odk/setsdkenv_windows.template
@@ -7,16 +7,13 @@ REM Example: set OO_SDK_NAME=libreoffice3.4_sdk
set OO_SDK_NAME=libreoffice3.4_sdk
REM Installation directory of the Software Development Kit.
-REM Example: set OO_SDK_HOME=C:\Program Files\LibreOffice 3\Basis\sdk
+REM Example: set OO_SDK_HOME=C:\Program Files\LibreOffice 3\sdk
set OO_SDK_HOME=
REM Office installation directory.
REM Example: set OFFICE_HOME=C:\Program Files\LibreOffice 3
set OFFICE_HOME=
-REM Example: set OFFICE_HOME=C:\Program Files\LibreOffice 3\Basis
-set OFFICE_BASE_HOME=
-
REM URE installation directory.
REM Example: set OO_SDK_URE_HOME=C:\Program Files\LibreOffice 3\URE
set OO_SDK_URE_HOME=
@@ -45,7 +42,7 @@ REM Example: set OO_SDK_JAVA_HOME=C:\Program Files\Java\jdk1.6.0_05
set OO_SDK_JAVA_HOME=
REM Special output directory
-REM Example: set OO_SDK_OUT=C:\Program Files\Libreoffice 3\Basis\sdk
+REM Example: set OO_SDK_OUT=C:\Program Files\Libreoffice 3\sdk
set OO_SDK_OUT=
REM Automatic deployment
@@ -90,11 +87,6 @@ if defined OFFICE_HOME (
set OFFICE_PROGRAM_PATH=%OFFICE_HOME%\program
)
-REM Set office program path.
-if defined OFFICE_BASE_HOME (
- set OFFICE_BASE_PROGRAM_PATH=%OFFICE_BASE_HOME%\program
- )
-
REM Set UNO path, necessary to ensure that the cpp examples using the
REM new UNO bootstrap mechanism use the configured office installation
REM (only set when using an Office).
@@ -108,8 +100,8 @@ set OO_SDK_URE_LIB_DIR=%OO_SDK_URE_HOME%\bin
set OO_SDK_URE_JAVA_DIR=%OO_SDK_URE_HOME%\java
REM ) else (
set OO_SDK_OFFICE_BIN_DIR=%OFFICE_PROGRAM_PATH%
-set OO_SDK_OFFICE_LIB_DIR=%OFFICE_BASE_PROGRAM_PATH%
-set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_BASE_PROGRAM_PATH%\classes
+set OO_SDK_OFFICE_LIB_DIR=%OFFICE_PROGRAM_PATH%
+set OO_SDK_OFFICE_JAVA_DIR=%OFFICE_PROGRAM_PATH%\classes
REM )
REM Set classpath
@@ -157,7 +149,6 @@ echo * SDK environment is prepared for Windows
echo *
echo * SDK = %OO_SDK_HOME%
echo * Office = %OFFICE_HOME%
-echo * Office Base = %OFFICE_BASE_HOME%
echo * URE = %OO_SDK_URE_HOME%
echo * Make = %OO_SDK_MAKE_HOME%
echo * Zip = %OO_SDK_ZIP_HOME%
diff --git a/odk/settings/std.mk b/odk/settings/std.mk
index 6deb065..0726631 100644
--- a/odk/settings/std.mk
+++ b/odk/settings/std.mk
@@ -19,7 +19,7 @@ IDL_DIR=$(PRJ)/idl
BIN_DIR=$(PRJ)/bin
CLASSES_DIR=$(PRJ)/classes
URE_CLASSES_DIR=$(subst \,/,$(OO_SDK_URE_JAVA_DIR))
-OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_BASE_PROGRAM_PATH))/classes
+OFFICE_CLASSES_DIR=$(subst \,/,$(OFFICE_PROGRAM_PATH))/classes
COMP_PACKAGE_DIR=$(subst /,$(PS),$(OUT_BIN))
SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag
@@ -27,8 +27,8 @@ SDKTYPEFLAG=$(OUT_MISC)/oosdk_cpp_types.flag
URE_TYPES="$(subst \,/,$(URE_MISC)$(PS)types.rdb)"
URE_SERVICES=$(subst \\,\,$(URE_MISC)$(PS)services.rdb)
-OFFICE_TYPES="$(subst \,/,$(OFFICE_BASE_PROGRAM_PATH)$(PS)offapi.rdb)"
-OFFICE_SERVICES=$(subst \\,\,$(OFFICE_BASE_PROGRAM_PATH)$(PS)services.rdb)
+OFFICE_TYPES="$(subst \,/,$(OFFICE_PROGRAM_PATH)$(PS)offapi.rdb)"
+OFFICE_SERVICES=$(subst \\,\,$(OFFICE_PROGRAM_PATH)$(PS)services.rdb)
OFFICE_TYPE_LIBRARY="$(OFFICE_TYPES)"
diff --git a/padmin/source/spadmin.sh b/padmin/source/spadmin.sh
index c41d505..ded0cb3 100644
--- a/padmin/source/spadmin.sh
+++ b/padmin/source/spadmin.sh
@@ -45,14 +45,14 @@ cd "$sd_cwd"
case "`uname -s`" in
FreeBSD)
- sd_prog1="$sd_prog/../basis-link/program"
- sd_prog2="$sd_prog/../basis-link/ure-link/lib"
+ sd_prog1="$sd_prog"
+ sd_prog2="$sd_prog/../ure-link/lib"
LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
;;
AIX)
- sd_prog1="$sd_prog/../basis-link/program"
- sd_prog2="$sd_prog/../basis-link/ure-link/lib"
+ sd_prog1="$sd_prog"
+ sd_prog2="$sd_prog/../ure-link/lib"
LIBPATH=$sd_prog1:$sd_prog2${LIBPATH:+:$LIBPATH}
export LIBPATH
;;
@@ -68,8 +68,8 @@ do
done
# extend the ld_library_path for java: javaldx checks the sofficerc for us
-if [ -x "$sd_prog/../basis-link/ure-link/bin/javaldx" ] ; then
- my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
+if [ -x "$sd_prog/../ure-link/bin/javaldx" ] ; then
+ my_path=`"$sd_prog/../ure-link/bin/javaldx" $BOOTSTRAPVARS \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
if [ -n "$my_path" ] ; then
sd_platform=`uname -s`
diff --git a/pyuno/zipcore/python.cxx b/pyuno/zipcore/python.cxx
index 775a0b7..cffee38 100644
--- a/pyuno/zipcore/python.cxx
+++ b/pyuno/zipcore/python.cxx
@@ -147,20 +147,12 @@ int wmain(int argc, wchar_t ** argv, wchar_t **) {
exit(EXIT_FAILURE);
}
wchar_t urepath[MAX_PATH];
- if (tools::buildPath(urepath, path, pathEnd, MY_STRING(L"..\\basis-link"))
+ if (tools::buildPath(urepath, path, pathEnd, MY_STRING(L"..\\ure-link"))
== NULL)
{
exit(EXIT_FAILURE);
}
- wchar_t * urepathEnd = urepathEnd = tools::resolveLink(urepath);
- if (urepathEnd == NULL ||
- (tools::buildPath(
- urepath, urepath, urepathEnd, MY_STRING(L"\\ure-link"))
- == NULL))
- {
- exit(EXIT_FAILURE);
- }
- urepathEnd = tools::resolveLink(urepath);
+ wchar_t * urepathEnd = tools::resolveLink(urepath);
if (urepathEnd == NULL) {
exit(EXIT_FAILURE);
}
diff --git a/pyuno/zipcore/python.sh b/pyuno/zipcore/python.sh
index c6c2f4a..22edea8 100644
--- a/pyuno/zipcore/python.sh
+++ b/pyuno/zipcore/python.sh
@@ -44,7 +44,7 @@ PATH=$sd_prog${PATH+:$PATH}
export PATH
# Set %%OOO_LIBRARY_PATH_VAR%% so that "import pyuno" finds libpyuno.so:
-%%OOO_LIBRARY_PATH_VAR%%=$sd_prog:$sd_prog/../basis-link/ure-link/lib${%%OOO_LIBRARY_PATH_VAR%%:+:$%%OOO_LIBRARY_PATH_VAR%%}
+%%OOO_LIBRARY_PATH_VAR%%=$sd_prog:$sd_prog/../ure-link/lib${%%OOO_LIBRARY_PATH_VAR%%:+:$%%OOO_LIBRARY_PATH_VAR%%}
export %%OOO_LIBRARY_PATH_VAR%%
# Set UNO_PATH so that "officehelper.bootstrap()" can find soffice executable:
diff --git a/scp2/source/ooo/common_brand.scp b/scp2/source/ooo/common_brand.scp
index a55af98..01d0cec 100644
--- a/scp2/source/ooo/common_brand.scp
+++ b/scp2/source/ooo/common_brand.scp
@@ -49,8 +49,7 @@ Module gid_Module_Root_Brand
gid_Brand_Dir_Share_Uno_Packages_Cache,
gid_Brand_Dir_Share_Registry,
gid_Brand_Dir_Share_Xdg);
- Files = (gid_Brand_File_BasisLink,
- gid_Brand_File_Bin_Crashreport,
+ Files = (gid_Brand_File_Bin_Crashreport,
gid_Brand_File_Bin_Crashreport_Script,
gid_Brand_File_Bin_Crashreport_Com,
gid_Brand_File_Bin_Python,
@@ -103,8 +102,7 @@ Module gid_Module_Root_Brand
gid_License_Txt,
git_License_Odt,
gid_Credits_Odt);
- Unixlinks = (gid_Brand_Unixlink_BasisLink,
- gid_Brand_Unixlink_Program,
+ Unixlinks = (gid_Brand_Unixlink_Program,
gid_Brand_Unixlink_Unopkg,
gid_Brand_Unixlink_Urelibs);
End
@@ -152,7 +150,7 @@ End
Directory gid_Brand_Dir_Readme
#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Dir_Bundle_Contents;
#else
ParentID = gid_Dir_Brand_Root;
#endif
@@ -428,38 +426,13 @@ Directory gid_Brand_Dir_Share_Xdg
End
#endif
-// Link to basis
-
-#if defined WNT
-File gid_Brand_File_BasisLink
- TXT_FILE_BODY;
- Dir = gid_Dir_Brand_Root;
- Name = "basis-link";
- Styles = (PACKED);
-End
-#elif defined MACOSX
-Directory gid_Brand_Dir_BasisLink
- ParentID = gid_Dir_Bundle_Contents;
- DosName = "basis-link";
-End
-#else
-Unixlink gid_Brand_Unixlink_BasisLink
- BIN_FILE_BODY;
- Styles = ();
- // Styles = (LAYERLINK);
- Name = "basis-link";
- Dir = gid_Dir_Brand_Root;
- Target = "basis${OOOBASEVERSION}";
-End
-#endif
-
// UnixLinks
#if defined MACOSX
Unixlink gid_Brand_Unixlink_Urelibs
Dir = gid_Brand_Dir_Program;
Name = "urelibs";
- Target = "../basis-link/ure-link/lib";
+ Target = "../ure-link/lib";
End
#endif
@@ -478,7 +451,7 @@ End
File gid_Brand_File_Html_Thirdpartylicensereadme
Name = "THIRDPARTYLICENSEREADME.html";
#ifdef MACOSX
- Dir = gid_Brand_Dir_BasisLink;
+ Dir = gid_Dir_Bundle_Contents;
#else
Dir = gid_Dir_Brand_Root;
#endif
@@ -827,15 +800,6 @@ End
// ProfileItems
-ProfileItem gid_Brand_Profileitem_Bootstrap_Baseinstall
- ProfileID = gid_Brand_Profile_Bootstrap_Ini;
- ModuleID = gid_Module_Root_Brand;
- Section = "Bootstrap";
- Order = 2;
- Key = "BaseInstallation";
- Value = "${OOO_BASE_DIR}";
-End
-
ProfileItem gid_Brand_Profileitem_Bootstrap_Productkey
ProfileID = gid_Brand_Profile_Bootstrap_Ini;
ModuleID = gid_Module_Root_Brand;
@@ -1143,18 +1107,6 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Brand_Base_Dir
Value = "${ORIGIN}/..";
End
-ProfileItem gid_Brand_Profileitem_Fundamental_Ooo_Base_Dir
- ModuleID = gid_Module_Root_Brand;
- ProfileID = gid_Brand_Profile_Fundamental_Ini;
- Section = "Bootstrap";
- Key = "OOO_BASE_DIR";
-#if defined WNT
- Value = "${.link:${BRAND_BASE_DIR}/basis-link}";
-#else
- Value = "${BRAND_BASE_DIR}/basis-link";
-#endif
-End
-
ProfileItem gid_Brand_Profileitem_Fundamental_Uno_Bundled_Extensions
ModuleID = gid_Module_Root_Brand;
ProfileID = gid_Brand_Profile_Fundamental_Ini;
@@ -1274,9 +1226,9 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Bin_Dir
Section = "Bootstrap";
Key = "URE_BIN_DIR";
#if defined WNT
- Value = "${.link:${OOO_BASE_DIR}/ure-link}/bin";
+ Value = "${.link:${BRAND_BASE_DIR}/ure-link}/bin";
#else
- Value = "${OOO_BASE_DIR}/ure-link/bin";
+ Value = "${BRAND_BASE_DIR}/ure-link/bin";
#endif
End
@@ -1286,9 +1238,9 @@ ProfileItem gid_Brand_Profileitem_Fundamental_Ure_Lib_Dir
Section = "Bootstrap";
Key = "URE_LIB_DIR";
#if defined WNT
- Value = "${.link:${OOO_BASE_DIR}/ure-link}/bin";
+ Value = "${.link:${BRAND_BASE_DIR}/ure-link}/bin";
#else
- Value = "${OOO_BASE_DIR}/ure-link/lib";
+ Value = "${BRAND_BASE_DIR}/ure-link/lib";
#endif
End
@@ -1439,7 +1391,7 @@ End
File gid_License_Txt
TXT_FILE_BODY;
#if defined MACOSX
- Dir = gid_Brand_Dir_BasisLink;
+ Dir = gid_Dir_Bundle_Contents;
#else
Dir = gid_Dir_Brand_Root;
#endif
@@ -1455,7 +1407,7 @@ End
File gid_License_Odt
BIN_FILE_BODY;
#if defined MACOSX
- Dir = gid_Brand_Dir_BasisLink;
+ Dir = gid_Dir_Bundle_Contents;
#else
Dir = gid_Dir_Brand_Root;
#endif
@@ -1466,7 +1418,7 @@ End
File gid_Credits_Odt
BIN_FILE_BODY;
#if defined MACOSX
- Dir = gid_Brand_Dir_BasisLink;
+ Dir = gid_Dir_Bundle_Contents;
#else
Dir = gid_Dir_Brand_Root;
#endif
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 5739b2a..9ee91e9 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -1153,15 +1153,6 @@ Directory gid_Dir_Share_Fingerprint
DosName = "fingerprint";
End
-Directory gid_Dir_Basis_Sdk
-#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
-#else
- ParentID = gid_Dir_Ooo_Basis;
-#endif
- DosName = "sdk";
-End
-
Directory gid_Dir_Help
#if defined MACOSX
ParentID = gid_Dir_Bundle_Contents;
diff --git a/scp2/source/ooo/ure_into_ooo.scp b/scp2/source/ooo/ure_into_ooo.scp
index 397d8fd..a67a508 100644
--- a/scp2/source/ooo/ure_into_ooo.scp
+++ b/scp2/source/ooo/ure_into_ooo.scp
@@ -46,13 +46,13 @@ End
#if defined WNT
File gid_File_UreLink
TXT_FILE_BODY;
- Dir = gid_Dir_Ooo_Basis;
+ Dir = gid_Dir_Brand_Root;
Name = "ure-link";
Styles = (PACKED);
End
#elif defined MACOSX
Directory gid_Dir_UreLink
- ParentID = gid_Brand_Dir_BasisLink;
+ ParentID = gid_Dir_Bundle_Contents;
DosName = "ure-link";
End
#else
@@ -61,7 +61,7 @@ Unixlink gid_Unixlink_UreLink
Styles = ();
// Styles = (LAYERLINK);
Name = "ure-link";
- Dir = gid_Dir_Ooo_Basis;
- Target = "../ure";
+ Dir = gid_Dir_Brand_Root;
+ Target = "ure";
End
#endif
diff --git a/scp2/source/sdkoo/sdkoo.scp b/scp2/source/sdkoo/sdkoo.scp
index a15e4c3..4b1f569 100644
--- a/scp2/source/sdkoo/sdkoo.scp
+++ b/scp2/source/sdkoo/sdkoo.scp
@@ -39,55 +39,35 @@ Installation gid_Installation_Sdk
#endif
End
-#ifndef MACOSX
+#if defined MACOSX
-#ifdef WNT
-Directory gid_Dir_Sdkoo_Root
+Directory gid_Dir_Basis_Sdk
ParentID = PREDEFINED_PROGDIR;
- HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}";
- Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION);
+ DosName = "LibreOffice${OOOBASEVERSION}_SDK";
End
-#endif
-#ifndef WNT
-Directory gid_Dir_Ooo_Openofficeorg_Sdk
+#elif defined WNT
+
+Directory gid_Dir_Sdkoo_Root
ParentID = PREDEFINED_PROGDIR;
- #ifdef WNT
- HostName = "${BASISROOTNAME}";
- #else
- HostName = ".";
- #endif
+ HostName = "${PRODUCTNAME}_${PRODUCTVERSION}_${POSTVERSIONEXTENSION}";
+ Styles = (OFFICEDIRECTORY, ISINSTALLLOCATION);
End
-#endif
-#ifndef WNT
-Directory gid_Dir_Ooo_Basis_Sdk
- ParentID = gid_Dir_Ooo_Openofficeorg_Sdk;
- #ifdef WNT
- HostName = "Basis ${OOOBASEVERSION}";
- #else
- HostName = "basis${OOOBASEVERSION}";
- #endif
- Styles = (BASISDIRECTORY);
+Directory gid_Dir_Basis_Sdk
+ ParentID = gid_Dir_Sdkoo_Root;
+ DosName = "sdk";
End
-#endif
-#endif
+#else
Directory gid_Dir_Basis_Sdk
-#if defined MACOSX
ParentID = PREDEFINED_PROGDIR;
- DosName = "LibreOffice${OOOBASEVERSION}_SDK";
-#else
- #if defined WNT
- ParentID = gid_Dir_Sdkoo_Root;
- #else
- ParentID = gid_Dir_Ooo_Basis_Sdk;
- #endif
DosName = "sdk";
-#endif
End
+#endif
+
Directory gid_Dir_Share_Sdk
ParentID = gid_Dir_Basis_Sdk;
DosName = "share";
diff --git a/scripting/examples/beanshell/Highlight/ShowDialog.bsh b/scripting/examples/beanshell/Highlight/ShowDialog.bsh
index e632c8f..c7c4ab4 100755
--- a/scripting/examples/beanshell/Highlight/ShowDialog.bsh
+++ b/scripting/examples/beanshell/Highlight/ShowDialog.bsh
@@ -38,8 +38,7 @@ boolean tryLoadingLibrary( xmcf, context, name )
}
libURL = xme.expandMacros(
- "${$BRAND_BASE_DIR/program/" + bootstrapName + "::BaseInstallation}" +
- "/share/basic/ScriptBindingLibrary/" +
+ "$BRAND_BASE_DIR/share/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 53c98fd..14a02e3 100755
--- a/scripting/examples/java/Highlight/HighlightText.java
+++ b/scripting/examples/java/Highlight/HighlightText.java
@@ -203,8 +203,7 @@ public class HighlightText implements com.sun.star.awt.XActionListener {
}
String libURL = xme.expandMacros(
- "${$BRAND_BASE_DIR/program/" + bootstrapName + "::BaseInstallation}" +
- "/share/basic/ScriptBindingLibrary/" +
+ "$BRAND_BASE_DIR/share/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 a6f9759..fa6838c 100755
--- a/scripting/examples/javascript/Highlight/ShowDialog.js
+++ b/scripting/examples/javascript/Highlight/ShowDialog.js
@@ -32,8 +32,7 @@ function tryLoadingLibrary( xmcf, context, name )
}
libURL = xme.expandMacros(
- "${$BRAND_BASE_DIR/program/" + bootstrapName + "::BaseInstallation}" +
- "/share/basic/ScriptBindingLibrary/" +
+ "$BRAND_BASE_DIR/share/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 e700797..1cf99d7 100755
--- a/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
+++ b/scripting/java/com/sun/star/script/framework/container/ScriptMetaData.java
@@ -134,9 +134,7 @@ public class ScriptMetaData extends ScriptEntry implements Cloneable {
// to be exposed at all
private static final String SHARE =
- "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" +
- PathUtils.BOOTSTRAP_NAME +
- "::BaseInstallation}/share";
+ "vnd.sun.star.expand:$BRAND_BASE_DIR/share";
private static final String USER =
"vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" +
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 e83410f..286d154 100755
--- a/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
+++ b/scripting/java/com/sun/star/script/framework/provider/ScriptProvider.java
@@ -142,7 +142,7 @@ public abstract class ScriptProvider
new Type(XMacroExpander.class), serviceObj);
XMLParserFactory.setOfficeDTDURL(me.expandMacros(
- "${$BRAND_BASE_DIR/program/bootstraprc::BaseInstallation}/share/dtd/officedocument/1_0/"));
+ "$BRAND_BASE_DIR/share/dtd/officedocument/1_0/"));
}
catch ( Exception e )
@@ -224,7 +224,7 @@ public abstract class ScriptProvider
if ( originalContextURL.startsWith( "share" ) )
{
- contextUrl = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::BaseInstallation}/share";
+ contextUrl = "vnd.sun.star.expand:$BRAND_BASE_DIR/share";
extensionDb = "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + PathUtils.BOOTSTRAP_NAME + "::UserInstallation}/user";
extensionRepository = "shared";
}
diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx
index d114ea9..8957d5e 100644
--- a/scripting/source/provider/URIHelper.cxx
+++ b/scripting/source/provider/URIHelper.cxx
@@ -46,8 +46,7 @@ namespace uri = ::com::sun::star::uri;
namespace script = ::com::sun::star::script;
static const char SHARE[] = "share";
-static const char SHARE_URI[] =
- "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" SAL_CONFIGFILE( "bootstrap") "::BaseInstallation}";
+static const char SHARE_URI[] = "vnd.sun.star.expand:$BRAND_BASE_DIR";
static const char SHARE_UNO_PACKAGES[] = "share:uno_packages";
static const char SHARE_UNO_PACKAGES_URI[] =
diff --git a/scripting/source/pyprov/pythonscript.py b/scripting/source/pyprov/pythonscript.py
index 4ebd196..6f9b542 100755
--- a/scripting/source/pyprov/pythonscript.py
+++ b/scripting/source/pyprov/pythonscript.py
@@ -143,7 +143,7 @@ class MyUriHelper:
def __init__( self, ctx, location ):
self.s_UriMap = \
- { "share" : "vnd.sun.star.expand:${$BRAND_BASE_DIR/program/" + toIniName( "bootstrap") + "::BaseInstallation}/share/Scripts/python" , \
+ { "share" : "vnd.sun.star.expand:$BRAND_BASE_DIR/share/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:uno_packages" : "vnd.sun.star.expand:$UNO_USER_PACKAGES_CACHE/uno_packages" }
diff --git a/setup_native/source/packinfo/packinfo_brand.txt b/setup_native/source/packinfo/packinfo_brand.txt
index 47d5745..4762277 100644
--- a/setup_native/source/packinfo/packinfo_brand.txt
+++ b/setup_native/source/packinfo/packinfo_brand.txt
@@ -27,7 +27,6 @@
Start
module = "gid_Module_Root_Brand"
-# script = "shellscripts_brand.txt"
solarispackagename = "%WITHOUTDOTUNIXPACKAGENAME%BRANDPACKAGEVERSION"
packagename = "%UNIXPACKAGENAME%BRANDPACKAGEVERSION"
requires = "%UREPACKAGEPREFIX%BRANDPACKAGEVERSION-ure,%BASISPACKAGEPREFIX%OOOBASEVERSION-core01,%BASISPACKAGEPREFIX%OOOBASEVERSION-core02,%BASISPACKAGEPREFIX%OOOBASEVERSION-core03,%BASISPACKAGEPREFIX%OOOBASEVERSION-core04,%BASISPACKAGEPREFIX%OOOBASEVERSION-core05,%BASISPACKAGEPREFIX%OOOBASEVERSION-core06,%BASISPACKAGEPREFIX%OOOBASEVERSION-core07,%BASISPACKAGEPREFIX%OOOBASEVERSION-images"
diff --git a/setup_native/source/packinfo/shellscripts_brand.txt b/setup_native/source/packinfo/shellscripts_brand.txt
deleted file mode 100644
index 8d52d57..0000000
--- a/setup_native/source/packinfo/shellscripts_brand.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-%preinstall << END
-END
-
-%postinstall << END
-
-# echo Command after installing
-# searching for the PRODUCTINSTALLLOCATION for the different platforms
-platform=`uname -s`
-case $$platform in
-SunOS)
- BASISPACKAGE=openofficeorg-core01
- BASISDIR=`pkginfo -r $$BASISPACKAGE`
- PRODUCTINSTALLLOCATION="$$BASEDIR"
- ;;
-Linux)
- BASISPACKAGE=libreoffice-core01
- BASISDIR=`rpm -q --queryformat "%{INSTALLPREFIX}" $$BASISPACKAGE`
- PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX"
- ;;
-*)
- PRODUCTINSTALLLOCATION="$$BASEDIR"
- ;;
-esac
-
-# creating link to basis layer
-if [ -d $$BASISDIR/libreoffice/basisBASISDIRECTORYVERSION ]
-then
- ln -s $$BASISDIR/libreoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
-else
- ln -s ../libreoffice/basisBASISDIRECTORYVERSION $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link >/dev/null 2>&1
-fi
-
-exit 0
-END
-
-%preremove << END
-END
-
-%postremove << END
-# echo Command after removing
-
-LASTUNINSTALL=1 # important for RPM deinstallation
-
-# searching for the PRODUCTINSTALLLOCATION for the different platforms
-platform=`uname -s`
-case $$platform in
-SunOS)
- PRODUCTINSTALLLOCATION="$$BASEDIR"
- ;;
-Linux)
- PRODUCTINSTALLLOCATION="$$RPM_INSTALL_PREFIX"
- if [ "$$1" = 1 ] # one package left after deinstallation -> update
- then
- LASTUNINSTALL=0
- fi
- ;;
-*)
- PRODUCTINSTALLLOCATION="$$BASEDIR"
- ;;
-esac
-
-if [ -h $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link -a $$LASTUNINSTALL -eq 1 ]
-then
- rm -f $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME/basis-link 2>/dev/null
- rmdir $$PRODUCTINSTALLLOCATION/PRODUCTDIRECTORYNAME 2>/dev/null
-fi
-
-exit 0
-END
diff --git a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
index 56885d4..28ecbfa 100644
--- a/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
+++ b/setup_native/source/win32/customactions/shellextensions/layerlinks.cxx
@@ -101,66 +101,20 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle)
{
string sInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
- string sOfficeInstallPath = sInstallPath;
- string sBasisInstallPath = sInstallPath + TEXT("Basis\\");
- string sUreInstallPath = sInstallPath + TEXT("URE\\");
+ string sUreInstallPath = sInstallPath + TEXT("URE");
- string sBasisLinkPath = sInstallPath + TEXT("basis-link");
- string sUreLinkPath = sInstallPath + TEXT("Basis\\ure-link");
+ string sUreLinkPath = sInstallPath + TEXT("ure-link");
if ( IsSetMsiProperty(handle, TEXT("ADMININSTALL")) )
{
- sBasisInstallPath = TEXT("Basis");
sUreInstallPath = TEXT("..\\URE");
}
- stripFinalBackslash(&sBasisInstallPath);
stripFinalBackslash(&sUreInstallPath);
- // creating basis-link in brand layer
+ // creating ure-link
- HANDLE h1file = CreateFile(
- sBasisLinkPath.c_str(),
- GENERIC_WRITE,
- 0,
- NULL,
- CREATE_NEW,
- FILE_ATTRIBUTE_NORMAL,
- NULL);
-
- if (IsValidHandle(h1file))
- {
- DWORD dummy;
-
- // Converting string into UTF-8 encoding and writing into file "basis-link"
-
- int nCharsRequired = MultiByteToWideChar( CP_ACP, 0, sBasisInstallPath.c_str(), -1, NULL, 0 );
- if ( nCharsRequired )
- {
- LPWSTR lpPathW = new WCHAR[nCharsRequired];
- if ( MultiByteToWideChar( CP_ACP, 0, sBasisInstallPath.c_str(), -1, lpPathW, nCharsRequired ) )
- {
- nCharsRequired = WideCharToMultiByte( CP_UTF8, 0, lpPathW, -1, NULL, 0, NULL, NULL );
- if ( nCharsRequired )
- {
- LPSTR lpPathUTF8 = new CHAR[nCharsRequired];
- WideCharToMultiByte( CP_UTF8, 0, lpPathW, -1, lpPathUTF8, nCharsRequired, NULL, NULL );
-
- WriteFile( h1file, lpPathUTF8, strlen(lpPathUTF8) ,&dummy, 0 );
-
- delete lpPathUTF8;
- }
- }
-
- delete lpPathW;
- }
-
- CloseHandle(h1file);
- }
-
- // creating ure-link in basis layer
-
- HANDLE h2file = CreateFile(
+ HANDLE hfile = CreateFile(
sUreLinkPath.c_str(),
GENERIC_WRITE,
0,
@@ -169,11 +123,11 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle)
FILE_ATTRIBUTE_NORMAL,
NULL);
- if (IsValidHandle(h2file))
+ if (IsValidHandle(hfile))
{
DWORD dummy;
- // Converting string into UTF-8 encoding and writing into file "basis-link"
+ // Converting string into UTF-8 encoding and writing into file "ure-link"
int nCharsRequired = MultiByteToWideChar( CP_ACP, 0, sUreInstallPath.c_str(), -1, NULL, 0 );
if ( nCharsRequired )
@@ -187,7 +141,7 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle)
LPSTR lpPathUTF8 = new CHAR[nCharsRequired];
WideCharToMultiByte( CP_UTF8, 0, lpPathW, -1, lpPathUTF8, nCharsRequired, NULL, NULL );
- WriteFile( h2file, lpPathUTF8, strlen(lpPathUTF8) ,&dummy, 0 );
+ WriteFile( hfile, lpPathUTF8, strlen(lpPathUTF8) ,&dummy, 0 );
delete lpPathUTF8;
}
@@ -196,7 +150,7 @@ extern "C" UINT __stdcall CreateLayerLinks(MSIHANDLE handle)
delete lpPathW;
}
- CloseHandle(h2file);
+ CloseHandle(hfile);
}
return ERROR_SUCCESS;
@@ -206,16 +160,8 @@ extern "C" UINT __stdcall RemoveLayerLinks(MSIHANDLE handle)
{
string sInstallPath = GetMsiProperty(handle, TEXT("INSTALLLOCATION"));
- string sOfficeInstallPath = sInstallPath;
- string sBasisInstallPath = sInstallPath + TEXT("Basis\\");
- string sUreInstallPath = sInstallPath + TEXT("URE\\");
-
- string sBasisLinkPath = sOfficeInstallPath + TEXT("basis-link");
- string sUreLinkPath = sBasisInstallPath + TEXT("ure-link");
- string sUreDirName = sUreInstallPath + TEXT("bin");
-
- // Deleting link to basis layer
- DeleteFile(sBasisLinkPath.c_str());
+ string sUreLinkPath = sInstallPath + TEXT("ure-link");
+ string sUreDirName = sInstallPath + TEXT("URE\\bin");
// Check, if URE is still installed
bool ureDirExists = true;
diff --git a/solenv/bin/install-gdb-printers b/solenv/bin/install-gdb-printers
index eaab2e8..aa63f62 100755
--- a/solenv/bin/install-gdb-printers
+++ b/solenv/bin/install-gdb-printers
@@ -124,7 +124,7 @@ create=false
link=false
# This option is only here to enable using the script during build of
# solenv/gdb . We must (or, better, want to :) avoid using the
-# installation subpaths (like basis-link), because all libs in solver
+# installation subpaths (like ure-link), because all libs in solver
# are in the same dir.
flat=false
@@ -169,8 +169,8 @@ if [[ ${DESTDIR}${pythondir} != ${GDBDIR} ]]; then
cp -r "${GDBDIR}/libreoffice" "${DESTDIR}${pythondir}"
fi
-make_autoload cppu basis-link/ure-link/lib libuno_cppu."$DYLIB".3
-make_autoload sal basis-link/ure-link/lib libuno_sal."$DYLIB".3
+make_autoload cppu ure-link/lib libuno_cppu."$DYLIB".3
+make_autoload sal ure-link/lib libuno_sal."$DYLIB".3
make_autoload svl program libsvllo."$DYLIB"
make_autoload sw program libswlo."$DYLIB"
make_autoload tl program libtllo."$DYLIB"
diff --git a/solenv/bin/linkoo b/solenv/bin/linkoo
index c39237f..fc7b38c 100755
--- a/solenv/bin/linkoo
+++ b/solenv/bin/linkoo
@@ -42,12 +42,12 @@ use strict;
# ends up in program/ooenv
( my $moz_lib = `pkg-config --variable=libdir mozilla-nss` ) =~ tr/\n/:/;
my $env_script = '
-java_path=`$thisdir/../basis-link/ure-link/bin/javaldx 2>/dev/null`
+java_path=`$thisdir/../ure-link/bin/javaldx 2>/dev/null`
export LD_LIBRARY_PATH="$thisdir:$java_path:' . $moz_lib . '$LD_LIBRARY_PATH"
ulimit -c unlimited
-export PATH="$thisdir/:$thisdir/../basis-link/program:$thisdir/../basis-link/ure-link/bin:$PATH"
+export PATH="$thisdir:$thisdir/../ure-link/bin:$PATH"
export GNOME_DISABLE_CRASH_DIALOG=1
-export STAR_RESOURCEPATH=$thisdir/../basis-link/program/resource
+export STAR_RESOURCEPATH=$thisdir/resource
# debugging assistance
export SAL_DISABLE_FLOATGRAB=1
export G_SLICE=always-malloc
@@ -110,7 +110,7 @@ substr ($OOO_BUILD, 0, 1) eq '/' || die "linkoo requires absolute paths ($OOO_
# setup global variables
my $brand_program_dir = 'program';
-my $ure_lib_dir = 'basis-link/ure-link/lib';
+my $ure_lib_dir = 'ure-link/lib';
my $win_ure_lib_dir = 'URE/bin';
my @exceptions = ( 'cppuhelper', 'sunjavaplugin', 'libjvmfwk' );
diff --git a/solenv/bin/macosx-change-install-names.pl b/solenv/bin/macosx-change-install-names.pl
index 1374be0..8ff051e 100644
--- a/solenv/bin/macosx-change-install-names.pl
+++ b/solenv/bin/macosx-change-install-names.pl
@@ -34,13 +34,13 @@ sub action($$$)
('app/UREBIN/URELIB' => '@executable_path/../lib',
'app/OOO/URELIB' => '@executable_path/../ure-link/lib',
'app/SDK/URELIB' => '@executable_path/../../ure-link/lib',
- 'app/BRAND/URELIB' => '@executable_path/../basis-link/ure-link/lib',
+ 'app/BRAND/URELIB' => '@executable_path/../ure-link/lib',
'app/BRAND/OOO' => '@executable_path',
'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/../basis-link/ure-link/lib',
+ 'shl/OOO/URELIB' => '@loader_path/../ure-link/lib',
'shl/OOO/OOO' => '@loader_path',
'shl/LOADER/LOADER' => '@loader_path',
'shl/OXT/URELIB' => '@executable_path/urelibs',
diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index 3e0af86..6d9ce4d 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -73,7 +73,7 @@ $(if $(strip $(UNO_SERVICES)),\
$(foreach rdb,$(UNO_SERVICES),\
$(call gb_CppunitTarget__make_url,$(call gb_RdbTarget_get_target,$(rdb))))") \
$(if $(URE),\
- $(foreach dir,URE_INTERNAL_LIB_DIR OOO_BASE_DIR BRAND_BASE_DIR,\
+ $(foreach dir,URE_INTERNAL_LIB_DIR BRAND_BASE_DIR,\
-env:$(dir)=$(call gb_CppunitTarget__make_url,$(gb_CppunitTest_LIBDIR))))
endef
diff --git a/solenv/gbuild/RdbTarget.mk b/solenv/gbuild/RdbTarget.mk
index 4ce33a1..12d1a4c 100644
--- a/solenv/gbuild/RdbTarget.mk
+++ b/solenv/gbuild/RdbTarget.mk
@@ -42,7 +42,6 @@ $(call gb_RdbTarget_get_target,%) :
' BEGIN { RS=">"; } \
/^<\?xml version.*/ { next; } \
/.*[^\r\n\t\s].*/ { \
- gsub(/vnd.sun.star.expand:\$$OOO_BASE_DIR\/program/, "vnd.sun.star.expand:$$OOO_BASE_DIR",$$0); \
gsub(/vnd.sun.star.expand:\$$BRAND_BASE_DIR\/program/, "vnd.sun.star.expand:$$BRAND_BASE_DIR",$$0); \
print $$0 ">"; \
}' $(call gb_RdbTarget__get_rdbs,$(COMPONENTS),$(OLD_COMPONENTS)) \
diff --git a/solenv/gbuild/platform/solaris.mk b/solenv/gbuild/platform/solaris.mk
index 8bcd70e..b4627a1 100644
--- a/solenv/gbuild/platform/solaris.mk
+++ b/solenv/gbuild/platform/solaris.mk
@@ -190,8 +190,8 @@ endef
gb_LinkTarget__RPATHS := \
URELIB:\dORIGIN \
UREBIN:\dORIGIN/../lib:\dORIGIN \
- OOO:\dORIGIN:\dORIGIN/../basis-link/ure-link/lib \
- BRAND:\dORIGIN:\dORIGIN/../basis-link/ure-link/lib \
+ OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
+ BRAND:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
NONE:\dORIGIN/../lib:\dORIGIN \
diff --git a/solenv/gbuild/platform/unxgcc.mk b/solenv/gbuild/platform/unxgcc.mk
index 01421da..27d6761 100644
--- a/solenv/gbuild/platform/unxgcc.mk
+++ b/solenv/gbuild/platform/unxgcc.mk
@@ -305,8 +305,8 @@ endef
gb_LinkTarget__RPATHS := \
URELIB:\dORIGIN \
UREBIN:\dORIGIN/../lib:\dORIGIN \
- OOO:\dORIGIN:\dORIGIN/../basis-link/ure-link/lib \
- BRAND:\dORIGIN:\dORIGIN/../basis-link/ure-link/lib \
+ OOO:\dORIGIN:\dORIGIN/../ure-link/lib \
+ BRAND:\dORIGIN:\dORIGIN/../ure-link/lib \
SDKBIN:\dORIGIN/../../ure-link/lib \
NONE:\dORIGIN/../lib:\dORIGIN \
diff --git a/solenv/inc/unxaigppc.mk b/solenv/inc/unxaigppc.mk
index 1eb280e..2b65c45 100644
--- a/solenv/inc/unxaigppc.mk
+++ b/solenv/inc/unxaigppc.mk
@@ -36,8 +36,8 @@ CDEFS+=-D_THREAD_SAFE
.INCLUDE : productversion.mk
COLON=":"
-URELIBDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/basis-link/ure-link/lib))
-UREBINDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/basis-link/ure-link/bin))
+URELIBDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/ure-link/lib))
+UREBINDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/ure-link/bin))
BRANDPROGRAMDIRS=$(subst,$(SPACECHAR),$(COLON) $(foreach,i,{$(PRODUCTLIST)} /opt/$i$(PRODUCTVERSIONSHORT)/program))
LINKFLAGSRUNPATH_URELIB:=-Wl,-blibpath:$(URELIBDIRS):/usr/lib:/lib
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 224c7e9..e6ed19b 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -175,9 +175,9 @@ LINKFLAGSDEFS*=-Wl,-z,defs
LINKFLAGSRUNPATH_URELIB=-Wl,-rpath,\''$$ORIGIN'\',--enable-new-dtags
LINKFLAGSRUNPATH_UREBIN=-Wl,-rpath,\''$$ORIGIN/../lib:$$ORIGIN'\',--enable-new-dtags
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\',--enable-new-dtags
+LINKFLAGSRUNPATH_OOO=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags
LINKFLAGSRUNPATH_SDK=-Wl,-rpath,\''$$ORIGIN/../../ure-link/lib'\',--enable-new-dtags
-LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\',--enable-new-dtags
+LINKFLAGSRUNPATH_BRAND=-Wl,-rpath,\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\',--enable-new-dtags
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=
# flag -Wl,-z,noexecstack sets the NX bit on the stack
diff --git a/solenv/inc/unxsoli4.mk b/solenv/inc/unxsoli4.mk
index aacf1d9..e3df189 100644
--- a/solenv/inc/unxsoli4.mk
+++ b/solenv/inc/unxsoli4.mk
@@ -130,9 +130,9 @@ CFLAGSCC+=$(C_RESTRICTIONFLAGS)
LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\'
+LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\'
+LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=
LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
diff --git a/solenv/inc/unxsols4.mk b/solenv/inc/unxsols4.mk
index c1d7aed..447d5b3 100644
--- a/solenv/inc/unxsols4.mk
+++ b/solenv/inc/unxsols4.mk
@@ -136,9 +136,9 @@ CFLAGSCC+=$(C_RESTRICTIONFLAGS)
LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\'
+LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
LINKFLAGSRUNPATH_SDK=-R\''$$ORIGIN/../../ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\'
+LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=
LINKFLAGS=-w -mt -z combreloc -PIC -temp=/tmp -norunpath -library=no%Cstd
diff --git a/solenv/inc/unxsolu4.mk b/solenv/inc/unxsolu4.mk
index e330b7f..224bb0e 100644
--- a/solenv/inc/unxsolu4.mk
+++ b/solenv/inc/unxsolu4.mk
@@ -131,8 +131,8 @@ CFLAGSCC+=$(C_RESTRICTIONFLAGS)
LINKFLAGSRUNPATH_URELIB=-R\''$$ORIGIN'\'
LINKFLAGSRUNPATH_UREBIN=-R\''$$ORIGIN/../lib:$$ORIGIN'\'
#TODO: drop $ORIGIN once no URE executable is also shipped in OOo
-LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\'
-LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../basis-link/ure-link/lib'\'
+LINKFLAGSRUNPATH_OOO=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
+LINKFLAGSRUNPATH_BRAND=-R\''$$ORIGIN:$$ORIGIN/../ure-link/lib'\'
LINKFLAGSRUNPATH_OXT=
LINKFLAGSRUNPATH_NONE=
LINKFLAGS=-m64 -w -mt -z combreloc -PIC -temp=/tmp -norunpath
diff --git a/svl/qa/unit/makefile.mk b/svl/qa/unit/makefile.mk
index ab59123..25ceb7a 100644
--- a/svl/qa/unit/makefile.mk
+++ b/svl/qa/unit/makefile.mk
@@ -91,6 +91,5 @@ test .PHONY: $(SHL1TARGETN) $(MISC)/$(TARGET)/services.rdb $(MISC)$/$(TARGET)$/t
$(CPPUNITTESTER) $(SHL1TARGETN) \
-env:UNO_SERVICES=$(my_file)$(PWD)/$(MISC)/$(TARGET)/services.rdb \
-env:UNO_TYPES="$(my_file)$(PWD)/$(MISC)/$(TARGET)/types.rdb $(my_file)$(PWD)/$(MISC)/$(TARGET)/udkapi.rdb" \
- -env:OOO_BASE_DIR="$(my_file)$(PWD)/$(MISC)/$(TARGET)" \
-env:BRAND_BASE_DIR="$(my_file)$(PWD)/$(MISC)/$(TARGET)" \
-env:UNO_USER_PACKAGES_CACHE="$(my_file)$(PWD)/$(MISC)/$(TARGET)"
diff --git a/svtools/source/filter/filter.cxx b/svtools/source/filter/filter.cxx
index 226b48d..b10a4ab 100644
--- a/svtools/source/filter/filter.cxx
+++ b/svtools/source/filter/filter.cxx
@@ -1069,11 +1069,7 @@ void GraphicFilter::ImplInit()
if( bUseConfig )
{
-#if defined WNT
rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM("$BRAND_BASE_DIR/program"));
-#else
- rtl::OUString url(RTL_CONSTASCII_USTRINGPARAM("$OOO_BASE_DIR/program"));
-#endif
rtl::Bootstrap::expandMacros(url); //TODO: detect failure
utl::LocalFileHelper::ConvertURLToPhysicalName(url, aFilterPath);
}
diff --git a/testautomation/global/system/includes/iniinfo.inc b/testautomation/global/system/includes/iniinfo.inc
index 93b4a22..7277639 100644
--- a/testautomation/global/system/includes/iniinfo.inc
+++ b/testautomation/global/system/includes/iniinfo.inc
@@ -1130,44 +1130,6 @@ end function
function getOfficeBasisPath as string
const CFN = "global::system::iniinfo.inc:getOfficeBasisPath: "
- 'get the basis directory from the information of basis-link
- dim ltemp(5) as string
- dim sFile as string
- dim sTemp as string
- dim sPath as string
-
- sTemp = gNetzOfficePath
- sFile = gNetzOfficePath & "basis-link"
-
- if FileExists( sFile ) then
- if ( lcase( gPlatform ) = "osx" ) then
- 'MacOS X
- sTemp = sFile
- else
- if ( gPlatGroup = "unx" ) then
- 'Unixes
- sPath = getLinkDestination( sFile )
- sTemp = fRelativeToAbsolutePath( gNetzOfficePath & sPath )
- if ( NOT FileExists( sTemp ) ) then
- sTemp = fRelativeToAbsolutePath( sPath )
- endif
-
- else
- 'all other platforms are Windows/DOS style
- ListRead( lTemp, sFile )
- if lTemp(1) <> "" then
- stemp = lTemp(1)
- sTemp = fRelativeToAbsolutePath( gNetzOfficePath & sTemp )
- endif
- endif
- endif
- else
- warnlog( CFN & "Basis-link could not be found" )
- endif
-
- if ( NOT FileExists( sTemp ) ) then
- warnlog( CFN & "Retrieved invalid path" )
- endif
-
- getOfficeBasisPath = sTemp & gPathSigne
+ 'get the basis directory
+ getOfficeBasisPath = gNetzOfficePath & gPathSigne
end function
diff --git a/testautomation/tools/run_tests/run_tests.sh b/testautomation/tools/run_tests/run_tests.sh
index 0c4dc85..a6cc294 100755
--- a/testautomation/tools/run_tests/run_tests.sh
+++ b/testautomation/tools/run_tests/run_tests.sh
@@ -107,7 +107,7 @@ sResetOfficeBas="${sLocation}global/tools/resetoffice.bas"
if [ -z "$sTestTool" ]
then
sTestTool=`GetValueFromSection Current OOoProgramDir "$testtoolrc"`
- sTestTool="$sTestTool/basis-link/program/testtool.bin"
+ sTestTool="$sTestTool/program/testtool.bin"
fi
diff --git a/toolkit/workben/layout/README b/toolkit/workben/layout/README
index 3b83bbf..3ab112e 100644
--- a/toolkit/workben/layout/README
+++ b/toolkit/workben/layout/README
@@ -15,8 +15,8 @@ Testing workbench and editor for Layout engine.
* FIXME: New three layer install/rpath feature needs these workarounds
|
| test -d $OOO_INSTALL_PREFIX/openoffice.org3 && export OOO_PREFIX_BRAND=$OOO_INSTALL_PREFIX/openoffice.org3 || export OOO_PREFIX_BRAND=$OOO_INSTALL_PREFIX
-| cp -f ../..$INPATH/lib/libtkx.so $OOO_PREFIX/openoffice.org/basis3.0/program
-| export LD_LIBRARY_PATH=$OOO_PREFIX_BRAND/basis-link/program:$OOO_PREFIX_BRAND/basis-link/ure-link/lib
+| cp -f ../..$INPATH/lib/libtkx.so $OOO_PREFIX/openoffice.org/program
+| export LD_LIBRARY_PATH=$OOO_PREFIX_BRAND/program:$OOO_PREFIX_BRAND/ure-link/lib
|
| (see source/layout/helper.cxx)
diff --git a/toolkit/workben/layout/TEST b/toolkit/workben/layout/TEST
index 8a04a66..e1376e1 100755
--- a/toolkit/workben/layout/TEST
+++ b/toolkit/workben/layout/TEST
@@ -7,5 +7,5 @@ for d in $(cd ../../../../.. && pwd)/ooo-svn /usr/lib/ooo3/; do
done
export SAL_ALLOW_LINKOO_SYMLINKS=1
test -d $OOO_INSTALL_PREFIX/openoffice.org3 && export OOO_PREFIX_BRAND=$OOO_INSTALL_PREFIX/openoffice.org3 || export OOO_PREFIX_BRAND=$OOO_INSTALL_PREFIX
-export LD_LIBRARY_PATH="$OOO_PREFIX_BRAND/basis-link/program:$OOO_PREFIX_BRAND/basis-link/ure-link/lib"
+export LD_LIBRARY_PATH="$OOO_PREFIX_BRAND/program:$OOO_PREFIX_BRAND/ure-link/lib"
../../unx*.pro/bin/test "$@"
diff --git a/toolkit/workben/layout/testrc.in b/toolkit/workben/layout/testrc.in
index 00ae5eb..b6c232a 100644
--- a/toolkit/workben/layout/testrc.in
+++ b/toolkit/workben/layout/testrc.in
@@ -1,12 +1,8 @@
OOO_INSTALL_PREFIX_URL=file://${OOO_INSTALL_PREFIX}
-OOO_BASIS_URL=${OOO_INSTALL_PREFIX_URL}/basis-link
-OOO_BASIS_BIN_URL=${OOO_BASIS_URL}/program
-OOO_URE_URL=${OOO_BASIS_URL}/ure-link
+OOO_BASIS_BIN_URL=${OOO_INSTALL_PREFIX_URL}/program
+OOO_URE_URL=${OOO_INSTALL_PREFIX_URL}/ure-link
#
-#CFG_INIFILE=${OOO_BASIS_BIN_URL}/configmgrrc
-#BaseInstallation=${OOO_BASIS_URL}
BRAND_BASE_DIR=${OOO_INSTALL_PREFIX_URL}
-OOO_BASE_DIR=${OOO_BASIS_URL}
#
UNO_TYPES=${OOO_URE_URL}/share/misc/types.rdb ${OOO_BASIS_BIN_URL}/offapi.rdb
UNO_SERVICES=${OOO_URE_URL}/share/misc/services.rdb ${OOO_BASIS_BIN_URL}/services.rdb
diff --git a/vcl/unx/generic/fontmanager/helper.cxx b/vcl/unx/generic/fontmanager/helper.cxx
index 673d8b0..5020327 100644
--- a/vcl/unx/generic/fontmanager/helper.cxx
+++ b/vcl/unx/generic/fontmanager/helper.cxx
@@ -63,11 +63,10 @@ OUString getOfficePath( enum whichOfficePath ePath )
{
bOnce = true;
OUString aIni;
- Bootstrap::get( OUString( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ), aIni );
- aIni += OUString( RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE( "bootstrap" ) ) );
+ Bootstrap::get( OUString( RTL_CONSTASCII_USTRINGPARAM( "BRAND_BASE_DIR" ) ), aNetPath );
+ aIni = aNetPath + OUString( RTL_CONSTASCII_USTRINGPARAM( "/program/" SAL_CONFIGFILE( "bootstrap" ) ) );
Bootstrap aBootstrap( aIni );
aBootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "CustomDataUrl" ) ), aConfigPath );
- aBootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "BaseInstallation" ) ), aNetPath );
aBootstrap.getFrom( OUString( RTL_CONSTASCII_USTRINGPARAM( "UserInstallation" ) ), aUserPath );
OUString aUPath = aUserPath;
diff --git a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
index 425ad76..bc1184a 100644
--- a/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
+++ b/xmlsecurity/source/xmlsec/nss/nssinitializer.cxx
@@ -303,7 +303,7 @@ bool nsscrypto_initialize( const css::uno::Reference< css::lang::XMultiServiceFa
#if defined SYSTEM_MOZILLA
OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("libnssckbi"SAL_DLLEXTENSION));
#else
- OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${OOO_BASE_DIR}/program/libnssckbi"SAL_DLLEXTENSION));
+ OUString rootModule(RTL_CONSTASCII_USTRINGPARAM("${BRAND_BASE_DIR}/program/libnssckbi"SAL_DLLEXTENSION));
#endif
::rtl::Bootstrap::expandMacros(rootModule);
commit 3535ceeac6f1b4277279082998663feb84d05487
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Oct 21 15:22:27 2011 +0200
Undo basis/brand split: Removed obsoleted gid_Dir_Program.
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 2e81cfd..5739b2a 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -96,15 +96,6 @@ Directory gid_Dir_Ooo_Basis
End
#endif
-Directory gid_Dir_Program
-#if defined MACOSX
- ParentID = gid_Brand_Dir_BasisLink;
-#else
- ParentID = gid_Dir_Ooo_Basis;
-#endif
- DosName = "program";
-End
-
#if defined MACOSX
Unixlink gid_Unixlink_Applications
BIN_FILE_BODY;
commit f2576647246245a1f7a7d55423c51f7976700cf8
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Oct 21 13:13:21 2011 +0200
Undo basis/brand split: Moved the rest of the WNT-only stuff.
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index c01f82b..5034909 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -356,7 +356,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)
- ::rtl::OUString sExecutableName( RTL_CONSTASCII_USTRINGPARAM( "$OOO_BASE_DIR/program/odbcconfig.exe" ) );
+ ::rtl::OUString sExecutableName( RTL_CONSTASCII_USTRINGPARAM( "$BRAND_BASE_DIR/program/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/scp2/source/base/file_base.scp b/scp2/source/base/file_base.scp
index 4a2b6d0..d54b5e1 100644
--- a/scp2/source/base/file_base.scp
+++ b/scp2/source/base/file_base.scp
@@ -42,7 +42,7 @@ End
#if defined WNT
File gid_File_Exe_Odbcconfig
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Name = EXENAME(odbcconfig);
Styles = (PACKED);
End
diff --git a/scp2/source/ooo/file_library_ooo.scp b/scp2/source/ooo/file_library_ooo.scp
index 5d60eb5..d83d6cf 100644
--- a/scp2/source/ooo/file_library_ooo.scp
+++ b/scp2/source/ooo/file_library_ooo.scp
@@ -103,7 +103,7 @@ File gid_File_Lib_Cli_Oootypes_Assembly
TXT_FILE_BODY;
Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
Name = "cli_oootypes.dll";
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Assemblyname = "cli_oootypes";
PublicKeyToken = "ce2cb7e279207b9e";
Version = "${CLI_OOOTYPES_NEW_VERSION}";
@@ -119,7 +119,7 @@ File gid_File_Lib_Policy_Cli_Oootypes_Assembly
TXT_FILE_BODY;
Styles = (PACKED, ASSEMBLY, DONTRENAMEINPATCH);
Name = "${CLI_OOOTYPES_POLICY_ASSEMBLY}.dll";
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Assemblyname = "${CLI_OOOTYPES_POLICY_ASSEMBLY}";
PublicKeyToken = "ce2cb7e279207b9e";
Version = "${CLI_OOOTYPES_POLICY_VERSION}";
@@ -136,7 +136,7 @@ File gid_File_Lib_Policy_Cli_Oootypes_Config
TXT_FILE_BODY;
Styles = (PACKED, ASSIGNCOMPOMENT, DONTRENAMEINPATCH);
Name = "cli_oootypes.config";
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
AssignComponent = gid_File_Lib_Policy_Cli_Oootypes_Assembly;
End
@@ -894,32 +894,6 @@ STD_LIB_FILE(gid_File_Lib_ooxml,ooxml)
STD_LIB_FILE(gid_File_Lib_Rtftok,rtftok)
-#if defined(WNT) && defined( _gcc3 )
-
-#if defined(MINGW_GCCDLL)
-
-File gid_File_Lib_Mingw_GccS
- TXT_FILE_BODY;
- Dir = gid_Dir_Program;
- Name = MINGW_GCCDLL;
- Styles = (PACKED);
-End
-
-#endif
-
-#if defined(MINGW_GXXDLL)
-
-File gid_File_Lib_Mingw_Stdcpp
- TXT_FILE_BODY;
- Dir = gid_Dir_Program;
- Name = MINGW_GXXDLL;
- Styles = (PACKED);
-End
-
-#endif
-
-#endif
-
STD_LIB_FILE(gid_File_Lib_Mysql,mysql)
STD_LIB_FILE(gid_File_Lib_Odbc,odbc)
@@ -1587,7 +1561,7 @@ End
File gid_File_Moz_Msvc80crt_Manifest
BIN_FILE_BODY;
Styles = (PACKED);
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Name = "Microsoft.VC80.CRT.manifest";
End
#endif
@@ -1813,7 +1787,7 @@ End
File gid_File_Lib_sellangmsi
TXT_FILE_BODY;
Styles = (PACKED, BINARYTABLE, BINARYTABLE_ONLY);
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Name = "sellangmsi.dll";
End
diff --git a/scp2/source/ooo/module_hidden_ooo.scp b/scp2/source/ooo/module_hidden_ooo.scp
index 3ba48ef..20d9b16 100644
--- a/scp2/source/ooo/module_hidden_ooo.scp
+++ b/scp2/source/ooo/module_hidden_ooo.scp
@@ -454,8 +454,6 @@ Module gid_Module_Root_Files_5
#endif
gid_File_Lib_sn_tools,
GID_FILE_LIB_WPD,
- gid_File_Lib_Mingw_GccS,
- gid_File_Lib_Mingw_Stdcpp,
gid_File_Lib_Msvcp70,
gid_File_Lib_Msvcr70,
gid_File_Lib_Ole,
diff --git a/scp2/source/winexplorerext/file_winexplorerext.scp b/scp2/source/winexplorerext/file_winexplorerext.scp
index a03a55e..97a8981 100644
--- a/scp2/source/winexplorerext/file_winexplorerext.scp
+++ b/scp2/source/winexplorerext/file_winexplorerext.scp
@@ -28,7 +28,7 @@
#include "macros.inc"
Directory gid_Dir_Shlxthdl
- ParentID = gid_Dir_Program;
+ ParentID = gid_Brand_Dir_Program;
DosName = "shlxthdl";
End
diff --git a/scp2/source/winexplorerext/registryitem_winexplorerext.scp b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
index 62911d2..78de789 100644
--- a/scp2/source/winexplorerext/registryitem_winexplorerext.scp
+++ b/scp2/source/winexplorerext/registryitem_winexplorerext.scp
@@ -35,8 +35,8 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer
ModuleID = gid_Module_Optional_Winexplorerext;
Styles = (X64);
Subkey = "CLSID\{087B3AE3-E237-4467-B8DB-5A38AB959AC9}\InprocServer32";
- Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
- Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
+ Value = "[INSTALLLOCATION]shlxthdl\shlxthdl.dll";
+ Val64 = "[INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll";
End
RegistryItem gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel
@@ -58,8 +58,8 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer
ModuleID = gid_Module_Optional_Winexplorerext;
Styles = (X64);
Subkey = "CLSID\{3B092F0C-7696-40E3-A80F-68D74DA84210}\InprocServer32";
- Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
- Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
+ Value = "[INSTALLLOCATION]shlxthdl\shlxthdl.dll";
+ Val64 = "[INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll";
End
RegistryItem gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel
@@ -90,8 +90,8 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer
ModuleID = gid_Module_Optional_Winexplorerext;
Styles = (X64);
Subkey = "CLSID\{C52AF81D-F7A0-4AAB-8E87-F80A60CCD396}\InprocServer32";
- Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
- Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
+ Value = "[INSTALLLOCATION]shlxthdl\shlxthdl.dll";
+ Val64 = "[INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll";
End
RegistryItem gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel
@@ -124,8 +124,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer
ModuleID = gid_Module_Root;
Subkey = "CLSID\{7BC0E710-5703-45BE-A29D-5D46D8B39262}\InprocServer32";
Styles = (X64); // Values: X64 / X64_ONLY
- Value = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt.dll";
- Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\ooofilt_x64.dll";
+ Value = "[INSTALLLOCATION]shlxthdl\ooofilt.dll";
+ Val64 = "[INSTALLLOCATION]shlxthdl\ooofilt_x64.dll";
End
RegistryItem gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
@@ -167,8 +167,8 @@ RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer
ModuleID = gid_Module_Optional_Winexplorerext;
Styles = (X64);
Subkey = "CLSID\{63542C48-9552-494A-84F7-73AA6A7C99C1}\InprocServer32";
- Value = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl.dll";
- Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\shlxthdl_x64.dll";
+ Value = "[INSTALLLOCATION]shlxthdl\shlxthdl.dll";
+ Val64 = "[INSTALLLOCATION]shlxthdl\shlxthdl_x64.dll";
End
RegistryItem gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel
@@ -201,8 +201,8 @@ RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer
ComponentCondition = "VersionNT >= 600";
Styles = (X64);
Subkey = "CLSID\{AE424E85-F6DF-4910-A6A9-438797986431}\InprocServer32";
- Value = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl.dll";
- Val64 = "[INSTALLLOCATION]Basis\program\shlxthdl\propertyhdl_x64.dll";
+ Value = "[INSTALLLOCATION]shlxthdl\propertyhdl.dll";
+ Val64 = "[INSTALLLOCATION]shlxthdl\propertyhdl_x64.dll";
End
RegistryItem gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel
commit a37884bd5215c7a7032824a66e3a9c78a3de5d59
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Oct 21 12:34:44 2011 +0200
Removed dead code.
diff --git a/scp2/source/ooo/starregistry_ooo.scp b/scp2/source/ooo/starregistry_ooo.scp
deleted file mode 100644
index 41bacdc..0000000
--- a/scp2/source/ooo/starregistry_ooo.scp
+++ /dev/null
@@ -1,34 +0,0 @@
-/*************************************************************************
-*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org. If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
-************************************************************************/
-
-#include "macros.inc"
-
-StarRegistry gid_Starregistry_Services_Rdb
- Name = "services.rdb";
- Dir = gid_Dir_Program;
-End
-
commit 3fce44fbe9adacdd163599763c2f94e560bbeaa9
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Oct 21 12:21:56 2011 +0200
Undo basis/brand split: Moved WNT-specific patchlist.txt etc.
diff --git a/scp2/source/ooo/file_ooo.scp b/scp2/source/ooo/file_ooo.scp
index 7284392..34ed8a9 100644
--- a/scp2/source/ooo/file_ooo.scp
+++ b/scp2/source/ooo/file_ooo.scp
@@ -1134,7 +1134,7 @@ End
File gid_File_Txt_Patchfiles
TXT_FILE_BODY;
Name = "patchlist.txt";
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Styles = (PACKED,PATCH,PATCH_ONLY,DONTRENAMEINPATCH);
End
#endif
diff --git a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
index 07e9bc2..1b57632 100644
--- a/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
+++ b/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
@@ -466,7 +466,7 @@ static std::queue< std::_tstring > getProfileKeys( const std::_tstring& aFileNam
extern "C" UINT __stdcall InstallPatchedFiles( MSIHANDLE handle )
{
std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
- std::_tstring sProgramDir = sInstDir + TEXT("Basis\\program\\");
+ std::_tstring sProgramDir = sInstDir + TEXT("program\\");
std::_tstring sPatchFile = sProgramDir + TEXT("patchlist.txt");
std::queue< std::_tstring > aSectionNames;
@@ -539,7 +539,7 @@ extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle )
else
return ERROR_SUCCESS;
- std::_tstring sProgramDir = sInstDir + TEXT("Basis\\program\\");
+ std::_tstring sProgramDir = sInstDir + TEXT("program\\");
std::_tstring sPatchFile = sProgramDir + TEXT("patchlist.txt");
std::queue< std::_tstring > aSectionNames;
@@ -584,7 +584,7 @@ extern "C" UINT __stdcall UninstallPatchedFiles( MSIHANDLE handle )
extern "C" UINT __stdcall IsOfficeRunning( MSIHANDLE handle )
{
std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
- std::_tstring sResourceDir = sInstDir + TEXT("Basis\\program\\resource\\");
+ std::_tstring sResourceDir = sInstDir + TEXT("program\\resource\\");
std::_tstring sPattern = sResourceDir + TEXT("vcl*.res");
WIN32_FIND_DATA aFindFileData;
@@ -740,7 +740,7 @@ extern "C" UINT __stdcall ShowOnlineUpdateDialog( MSIHANDLE handle )
// that offers the Online Update is superfluous.
std::_tstring sInstDir = GetMsiProperty( handle, TEXT("INSTALLLOCATION") );
- std::_tstring sProgramDir = sInstDir + TEXT("Basis\\program\\");
+ std::_tstring sProgramDir = sInstDir + TEXT("program\\");
std::_tstring sSearchFile = sProgramDir + TEXT("updchk.uno.dll");
WIN32_FIND_DATA data;
commit a32d05fbb9fa8c1062294e7bd75588dc152309a3
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Oct 21 12:15:50 2011 +0200
Undo basis/brand split: move WNT-specific gid_Dir_Shellnew[Too].
Hope that's all that needs to be done here...
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index e8c094d..2e81cfd 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -144,12 +144,12 @@ End
#ifdef WNT
Directory gid_Dir_Shellnew
- ParentID = gid_Dir_Program;
+ ParentID = gid_Brand_Dir_Program;
DosName = "shellnew";
End
Directory gid_Dir_ShellnewToo
- ParentID = gid_Dir_Program;
+ ParentID = gid_Brand_Dir_Program;
DosName = "2shellnew";
End
commit 90713adf1bf97befb9b6c97309f57d7b93566857
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Oct 21 12:14:53 2011 +0200
Removed some unused scp2 Directory definitions.
diff --git a/scp2/source/ooo/directory_ooo.scp b/scp2/source/ooo/directory_ooo.scp
index 10b32fb..e8c094d 100644
--- a/scp2/source/ooo/directory_ooo.scp
+++ b/scp2/source/ooo/directory_ooo.scp
@@ -115,16 +115,6 @@ Unixlink gid_Unixlink_Applications
End
#endif
-Directory gid_Dir_Program_Remote
- ParentID = gid_Dir_Program;
- DosName = "remote";
-End
-
-Directory gid_Dir_Program_Local
- ParentID = gid_Dir_Program;
- DosName = "local";
-End
-
Directory gid_Dir_Addin
Styles = (CREATE);
ParentID = gid_Brand_Dir_Program;
@@ -146,11 +136,6 @@ Directory gid_Dir_Resource
DosName = "resource";
End
-Directory gid_Dir_Httphome
- ParentID = gid_Dir_Program;
- DosName = "httphome";
-End
-
Directory gid_Dir_Classes
ParentID = gid_Brand_Dir_Program;
DosName = "classes";
commit 3416e30f6b1af42172566c8d554863f3f261112a
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Oct 21 12:06:30 2011 +0200
Undo basis/brand split: move unpack_update script from basis to brand.
Not sure if this is (still) used anywhere; at least no code seems to ever
call it.
diff --git a/scp2/source/onlineupdate/file_onlineupdate.scp b/scp2/source/onlineupdate/file_onlineupdate.scp
index 1267e33..07ab650 100644
--- a/scp2/source/onlineupdate/file_onlineupdate.scp
+++ b/scp2/source/onlineupdate/file_onlineupdate.scp
@@ -39,7 +39,7 @@ End
#if defined LINUX || defined SOLARIS
File gid_File_Bin_UnpackUpdate
BIN_FILE_BODY;
- Dir = gid_Dir_Program;
+ Dir = gid_Brand_Dir_Program;
Name = "unpack_update";
Styles = (PACKED);
End
commit 009765255f9512556de04ac2b056af2602644c2e
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Fri Oct 21 11:55:56 2011 +0200
Undo basis/brand split: adapt scp2 WkDir.
diff --git a/scp2/source/base/folderitem_base.scp b/scp2/source/base/folderitem_base.scp
index c678e74..671bd93 100644
--- a/scp2/source/base/folderitem_base.scp
+++ b/scp2/source/base/folderitem_base.scp
@@ -34,7 +34,7 @@ FolderItem gid_Folderitem_Sbase
FileID = gid_File_Exe_Sbase;
IconFile = gid_File_Exe_Sbase;
IconID = 0;
- WkDir = gid_Dir_Program;
+ WkDir = gid_Brand_Dir_Program;
Parameter = "";
Styles = (NOWEB, NON_ADVERTISED);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_BASE);
diff --git a/scp2/source/calc/folderitem_calc.scp b/scp2/source/calc/folderitem_calc.scp
index 36cd965..782d135 100644
--- a/scp2/source/calc/folderitem_calc.scp
+++ b/scp2/source/calc/folderitem_calc.scp
@@ -34,7 +34,7 @@ FolderItem gid_Folderitem_Scalc
FileID = gid_File_Exe_Scalc;
IconFile = gid_File_Exe_Scalc;
IconID = 0;
- WkDir = gid_Dir_Program;
+ WkDir = gid_Brand_Dir_Program;
Parameter = "";
Styles = (NOWEB, NON_ADVERTISED);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_CALC);
diff --git a/scp2/source/draw/folderitem_draw.scp b/scp2/source/draw/folderitem_draw.scp
index 4a73948..a07f710 100644
--- a/scp2/source/draw/folderitem_draw.scp
+++ b/scp2/source/draw/folderitem_draw.scp
@@ -34,7 +34,7 @@ FolderItem gid_Folderitem_Sdraw
FileID = gid_File_Exe_Sdraw;
IconFile = gid_File_Exe_Sdraw;
IconID = 0;
- WkDir = gid_Dir_Program;
+ WkDir = gid_Brand_Dir_Program;
Parameter = "";
Styles = (NOWEB, NON_ADVERTISED);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_DRAW);
diff --git a/scp2/source/impress/folderitem_impress.scp b/scp2/source/impress/folderitem_impress.scp
index db7b0c3..98954f1 100644
--- a/scp2/source/impress/folderitem_impress.scp
+++ b/scp2/source/impress/folderitem_impress.scp
@@ -34,7 +34,7 @@ FolderItem gid_Folderitem_Simpress
FileID = gid_File_Exe_Simpress;
IconFile = gid_File_Exe_Simpress;
IconID = 0;
- WkDir = gid_Dir_Program;
+ WkDir = gid_Brand_Dir_Program;
Parameter = "";
Styles = (NOWEB, NON_ADVERTISED);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_IMPRESS);
diff --git a/scp2/source/math/folderitem_math.scp b/scp2/source/math/folderitem_math.scp
index 2decfb2..609de29 100644
--- a/scp2/source/math/folderitem_math.scp
+++ b/scp2/source/math/folderitem_math.scp
@@ -34,7 +34,7 @@ FolderItem gid_Folderitem_Smath
FileID = gid_File_Exe_Smath;
IconFile = gid_File_Exe_Smath;
IconID = 0;
- WkDir = gid_Dir_Program;
+ WkDir = gid_Brand_Dir_Program;
Parameter = "";
Styles = (NOWEB, NON_ADVERTISED);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_MATH);
diff --git a/scp2/source/ooo/folderitem_ooo.scp b/scp2/source/ooo/folderitem_ooo.scp
index b6ef81e..3c41948 100644
--- a/scp2/source/ooo/folderitem_ooo.scp
+++ b/scp2/source/ooo/folderitem_ooo.scp
@@ -34,7 +34,7 @@ FolderItem gid_Folderitem_Soffice
FileID = gid_Brand_File_Bin_Soffice;
IconFile = gid_Brand_File_Bin_Soffice;
IconID = 0;
- WkDir = gid_Dir_Program;
+ WkDir = gid_Brand_Dir_Program;
Parameter = "";
Styles = (NOWEB, NON_ADVERTISED);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
@@ -48,7 +48,7 @@ FolderItem gid_Folderitem_Soffice_Desktop
IconFile = gid_Brand_File_Bin_Soffice;
IconID = 0;
ComponentIDFile = "gid_Brand_File_Desktophelper_Txt";
- WkDir = gid_Dir_Program;
+ WkDir = gid_Brand_Dir_Program;
Parameter = "";
Styles = (NOWEB,NON_ADVERTISED,USE_HELPER_FILENAME);
ALL_LANG(Tooltip, STR_FI_TOOLTIP_SOFFICE);
diff --git a/scp2/source/writer/folderitem_writer.scp b/scp2/source/writer/folderitem_writer.scp
index 7541e1d..1fe448d 100644
--- a/scp2/source/writer/folderitem_writer.scp
+++ b/scp2/source/writer/folderitem_writer.scp
@@ -34,7 +34,7 @@ FolderItem gid_Folderitem_Swriter
FileID = gid_File_Exe_Swriter;
IconFile = gid_File_Exe_Swriter;
IconID = 0;
- WkDir = gid_Dir_Program;
+ WkDir = gid_Brand_Dir_Program;
Parameter = "";
Styles = (NOWEB, NON_ADVERTISED);
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list