Author: jsc
Date: Fri Jun 7 12:28:39 2013
New Revision: 1490610
URL: http://svn.apache.org/r1490610
Log:
#122478# further cleanup for 3layer changes
Modified:
openoffice/trunk/main/padmin/source/spadmin.sh
openoffice/trunk/main/pyuno/zipcore/python.sh
openoffice/trunk/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp
openoffice/trunk/main/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
Modified: openoffice/trunk/main/padmin/source/spadmin.sh
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/padmin/source/spadmin.sh?rev=1490610&r1=1490609&r2=1490610&view=diff
==============================================================================
--- openoffice/trunk/main/padmin/source/spadmin.sh (original)
+++ openoffice/trunk/main/padmin/source/spadmin.sh Fri Jun 7 12:28:39 2013
@@ -47,17 +47,15 @@ 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
+if [ -x "$sd_prog/javaldx" ] ; then
# this is a temporary hack until we can live with the default search paths
case "`uname -s`" in
FreeBSD)
- sd_prog1="$sd_prog/../basis-link/program"
- sd_prog2="$sd_prog/../basis-link/ure-link/lib"
-
LD_LIBRARY_PATH=$sd_prog1:$sd_prog2${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
+ LD_LIBRARY_PATH=$sd_prog:${LD_LIBRARY_PATH+:${LD_LIBRARY_PATH}}
export LD_LIBRARY_PATH
;;
esac
- my_path=`"$sd_prog/../basis-link/ure-link/bin/javaldx" $BOOTSTRAPVARS \
+ my_path=`"$sd_prog/javaldx" $BOOTSTRAPVARS \
"-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}
@@ -75,5 +73,5 @@ PATH=$sd_prog${PATH+:$PATH}
export PATH
# execute binary
-exec "$sd_prog/../basis-link/program/spadmin.bin" "$@" \
+exec "$sd_prog/spadmin.bin" "$@" \
"-env:INIFILENAME=vnd.sun.star.pathname:$sd_prog/redirectrc"
Modified: openoffice/trunk/main/pyuno/zipcore/python.sh
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/pyuno/zipcore/python.sh?rev=1490610&r1=1490609&r2=1490610&view=diff
==============================================================================
--- openoffice/trunk/main/pyuno/zipcore/python.sh (original)
+++ openoffice/trunk/main/pyuno/zipcore/python.sh Fri Jun 7 12:28:39 2013
@@ -38,7 +38,7 @@ PATH=$sd_prog${PATH+:$PATH}
export PATH
# Set LD_LIBRARY_PATH so that "import pyuno" finds libpyuno.so:
-LD_LIBRARY_PATH=$sd_prog/../basis-link/program:$sd_prog/../basis-link/ure-link/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
+LD_LIBRARY_PATH=$sd_prog:${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}
export LD_LIBRARY_PATH
# Set UNO_PATH so that "officehelper.bootstrap()" can find soffice executable:
@@ -50,10 +50,10 @@ export UNO_PATH
: ${URE_BOOTSTRAP=vnd.sun.star.pathname:$sd_prog/fundamentalrc}
export URE_BOOTSTRAP
-PYTHONPATH=$sd_prog/../basis-link/program:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib/lib-dynload:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib/lib-tk:$sd_prog/../basis-link/program/python-core-%%PYVERSION%%/lib/site-packages${PYTHONPATH+:$PYTHONPATH}
+PYTHONPATH=$sd_prog:$sd_prog/python-core-%%PYVERSION%%/lib:$sd_prog/python-core-%%PYVERSION%%/lib/lib-dynload:$sd_prog/python-core-%%PYVERSION%%/lib/lib-tk:$sd_prog/python-core-%%PYVERSION%%/lib/site-packages${PYTHONPATH+:$PYTHONPATH}
export PYTHONPATH
-PYTHONHOME=$sd_prog/../basis-link/program/python-core-%%PYVERSION%%
+PYTHONHOME=$sd_prog/python-core-%%PYVERSION%%
export PYTHONHOME
# execute binary
-exec "$sd_prog/../basis-link/program/python.bin" "$@"
+exec "$sd_prog/python.bin" "$@"
Modified:
openoffice/trunk/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp?rev=1490610&r1=1490609&r2=1490610&view=diff
==============================================================================
---
openoffice/trunk/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp
(original)
+++
openoffice/trunk/main/scp2/source/winexplorerext/registryitem_winexplorerext.scp
Fri Jun 7 12:28:39 2013
@@ -31,8 +31,8 @@ RegistryItem gid_Regitem_Clsid_087B3AE3_
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]program\shlxthdl\shlxthdl.dll";
+ Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
End
RegistryItem
gid_Regitem_Clsid_087B3AE3_E237_4467_B8DB_5A38AB959AC9_InProcServer32_ThreadingModel
@@ -54,8 +54,8 @@ RegistryItem gid_Regitem_Clsid_3B092F0C_
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]program\shlxthdl\shlxthdl.dll";
+ Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
End
RegistryItem
gid_Regitem_Clsid_3B092F0C_7696_40E3_A80F_68D74DA84210_InProcServer32_ThreadingModel
@@ -86,8 +86,8 @@ RegistryItem gid_Regitem_Clsid_C52AF81D_
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]program\shlxthdl\shlxthdl.dll";
+ Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
End
RegistryItem
gid_Regitem_Clsid_C52AF81D_F7A0_4AAB_8E87_F80A60CCD396_InProcServer32_ThreadingModel
@@ -118,8 +118,8 @@ RegistryItem gid_Regitem_Clsid_7BC0E710_
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]program\shlxthdl\ooofilt.dll";
+ Val64 = "[INSTALLLOCATION]program\shlxthdl\ooofilt_x64.dll";
End
RegistryItem
gid_Regitem_Clsid_7BC0E710_5703_45BE_A29D_5D46D8B39262_InProcServer32_ThreadingModel
@@ -159,8 +159,8 @@ RegistryItem gid_Regitem_Clsid_63542C48_
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]program\shlxthdl\shlxthdl.dll";
+ Val64 = "[INSTALLLOCATION]program\shlxthdl\shlxthdl_x64.dll";
End
RegistryItem
gid_Regitem_Clsid_63542C48_9552_494A_84F7_73AA6A7C99C1_InProcServer32_ThreadingModel
@@ -193,8 +193,8 @@ RegistryItem gid_Regitem_Clsid_AE424E85_
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]program\shlxthdl\propertyhdl.dll";
+ Val64 = "[INSTALLLOCATION]program\shlxthdl\propertyhdl_x64.dll";
End
RegistryItem
gid_Regitem_Clsid_AE424E85_F6DF_4910_A6A9_438797986431_InProcServer32_ThreadingModel
Modified:
openoffice/trunk/main/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/setup_native/source/win32/customactions/patch/swappatchfiles.cxx?rev=1490610&r1=1490609&r2=1490610&view=diff
==============================================================================
---
openoffice/trunk/main/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
(original)
+++
openoffice/trunk/main/setup_native/source/win32/customactions/patch/swappatchfiles.cxx
Fri Jun 7 12:28:39 2013
@@ -623,7 +623,8 @@ extern "C" UINT __stdcall UninstallPatch
else
return ERROR_SUCCESS;
- std::_tstring sProgramDir = sInstDir + TEXT("Basis\\program\\");
+// 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;
@@ -677,7 +678,8 @@ extern "C" UINT __stdcall UninstallPatch
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("Basis\\program\\resource\\");
+ std::_tstring sResourceDir = sInstDir + TEXT("program\\resource\\");
std::_tstring sPattern = sResourceDir + TEXT("vcl*.res");
WIN32_FIND_DATA aFindFileData;
@@ -857,7 +859,8 @@ extern "C" UINT __stdcall ShowOnlineUpda
// 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("Basis\\program\\");
+ std::_tstring sProgramDir = sInstDir + TEXT("program\\");
std::_tstring sSearchFile = sProgramDir + TEXT("updchk.uno.dll");
WIN32_FIND_DATA data;
