summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
Diffstat (limited to 'desktop')
-rw-r--r--desktop/Package_scripts.mk1
-rw-r--r--desktop/Pagein_common.mk2
-rwxr-xr-xdesktop/scripts/basis-link1
-rwxr-xr-xdesktop/scripts/soffice.sh.in6
-rwxr-xr-xdesktop/scripts/unoinfo.sh10
-rwxr-xr-xdesktop/scripts/unopkg.sh12
-rwxr-xr-xdesktop/scripts/ure-link2
-rwxr-xr-xdesktop/unx/source/start.c2
-rw-r--r--desktop/win32/source/extendloaderenvironment.cxx57
-rw-r--r--desktop/win32/source/unoinfo.cxx24
10 files changed, 33 insertions, 84 deletions
diff --git a/desktop/Package_scripts.mk b/desktop/Package_scripts.mk
index a59ad5b47f57..e0e7d35921a0 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 a9d46ebe494e..3b0330c396df 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 3af84201e04f..000000000000
--- 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 28ee88964b09..86ea49f02516 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 a7566155aa0d..97ee44503621 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 54918f0a17ae..9856d191b68f 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 dd0ecb6115e8..122de345e91f 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 c3f7f245eaae..b22f10f12c9b 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 2d1f09adbff9..8a313f2e18c0 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 0ce5c98b7215..ac0cd87839e4 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);
generated by cgit (git 2.34.1) at 2024-07-19 02:18:51 +0000