Author: jsc
Date: Fri Jun 7 12:26:49 2013
New Revision: 1490609
URL: http://svn.apache.org/r1490609
Log:
#122478# further cleanup for 3layer changes
Modified:
openoffice/trunk/main/desktop/scripts/unoinfo.sh
openoffice/trunk/main/desktop/scripts/unopkg.sh
openoffice/trunk/main/desktop/win32/source/unoinfo.cxx
Modified: openoffice/trunk/main/desktop/scripts/unoinfo.sh
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/scripts/unoinfo.sh?rev=1490609&r1=1490608&r2=1490609&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/scripts/unoinfo.sh (original)
+++ openoffice/trunk/main/desktop/scripts/unoinfo.sh Fri Jun 7 12:26:49 2013
@@ -34,14 +34,14 @@ sd_prog=`pwd`
case $1 in
c++)
- printf '%s' "$sd_prog/../basis-link/ure-link/lib"
+ printf '%s' "$sd_prog"
;;
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/classes/ridl.jar" \
+ "$sd_prog/classes/jurt.jar" \
+ "$sd_prog/classes/java/juh.jar" \
+ "$sd_prog/classes/unoil.jar" "$sd_prog"
;;
*)
exit 1
Modified: openoffice/trunk/main/desktop/scripts/unopkg.sh
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/scripts/unopkg.sh?rev=1490609&r1=1490608&r2=1490609&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/scripts/unopkg.sh (original)
+++ openoffice/trunk/main/desktop/scripts/unopkg.sh Fri Jun 7 12:26:49 2013
@@ -58,7 +58,7 @@ 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 \
+ my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS $JVMFWKPARAMS \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"`
if [ -n "$my_path" ] ; then
LD_LIBRARY_PATH=$my_path${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
Modified: openoffice/trunk/main/desktop/win32/source/unoinfo.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/desktop/win32/source/unoinfo.cxx?rev=1490609&r1=1490608&r2=1490609&view=diff
==============================================================================
--- openoffice/trunk/main/desktop/win32/source/unoinfo.cxx (original)
+++ openoffice/trunk/main/desktop/win32/source/unoinfo.cxx Fri Jun 7 12:26:49
2013
@@ -66,10 +66,7 @@ void writePath(
if (end == NULL) {
exit(EXIT_FAILURE);
}
- std::size_t n = (end - path) * sizeof (wchar_t);
- if (fwrite(path, 1, n, stdout) != n) {
- exit(EXIT_FAILURE);
- }
+ fprintf(stdout, "%S", path);
}
}
@@ -83,23 +80,12 @@ int wmain(int argc, wchar_t ** argv, wch
#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))
- {
- exit(EXIT_FAILURE);
- }
- pathEnd = tools::resolveLink(path);
+
if (pathEnd == NULL) {
exit(EXIT_FAILURE);
}
- writePath(path, pathEnd, MY_STRING(L"\\bin"));
+
+ writePath(path, pathEnd, MY_STRING(L""));
#ifdef __MINGW32__
} else if (argc == 2 && strcmp(argv[1], "java") == 0) {
#else
@@ -111,32 +97,17 @@ int wmain(int argc, wchar_t ** argv, wch
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")) ==
- NULL)
- {
- exit(EXIT_FAILURE);
- }
- pathEnd = tools::resolveLink(path);
- if (pathEnd == NULL) {
- exit(EXIT_FAILURE);
- }
+ writePath(path, pathEnd, MY_STRING(L"classes\\unoil.jar"));
writeNull();
- writePath(path, pathEnd, MY_STRING(L"\\java\\ridl.jar"));
+ writePath(path, pathEnd, MY_STRING(L"\classes\\ridl.jar"));
writeNull();
- writePath(path, pathEnd, MY_STRING(L"\\java\\jurt.jar"));
+ writePath(path, pathEnd, MY_STRING(L"classes\\jurt.jar"));
writeNull();
- writePath(path, pathEnd, MY_STRING(L"\\java\\juh.jar"));
+ writePath(path, pathEnd, MY_STRING(L"classes\\juh.jar"));
} else {
exit(EXIT_FAILURE);
}
