INTEGRATION: CWS sb83 (1.58.16); FILE MERGED

2008/02/22 11:10:45 sb 1.58.16.14: RESYNC: (1.59-1.61); FILE MERGED
2008/02/18 10:29:58 is 1.58.16.13: #i85112# creating directories
2008/02/12 12:44:25 sb 1.58.16.12: #i86041# do not add Mozilla library directory to LD_LIBRARY_PATH in soffice start script
2008/02/08 13:14:27 is 1.58.16.11: #i85916# different basis links
2008/02/08 11:15:01 sb 1.58.16.10: #i84200# deliver isoffice.lib
2008/02/07 16:22:44 sb 1.58.16.9: #i84200# extract all the meat from (soffice|unkpkg).bin into (soffice|unkpkg).dll, where the .dll are in the basis layer and the .bin, on Windows (similar to Mac OS X, albeit for different reasons), are in the brand layer, where they can include brand-specific icons (read by vcl; potentially visible in Windows Explorer according to hro).
2008/02/01 15:50:59 sb 1.58.16.8: #i85112# windows-specific stuff (is)
2008/01/31 17:00:15 is 1.58.16.7: #i85112# new basis  link
2008/01/30 11:58:41 sb 1.58.16.6: #i85112# ure-link-admin
2008/01/29 14:45:59 sb 1.58.16.5: #i84200# /DELAYLOAD:uwinapi.dll is not used at all any longer; guistdio.exe and unopkgio.exe were identical and have been unified
2007/12/27 12:29:14 sb 1.58.16.4: #i84200# The version number in basis-link needs to be abstracted over; provide a fake basis-link for good old monolithic OOo, to keep it running for now.
2007/12/21 14:57:29 sb 1.58.16.3: #i84200# Delayloading of uwinapi.dll is only needed in a few specific executables (loaders in module desktop; moved everything relevant from module sal there) (but needed on all Windows platforms); added preliminary Windows basis-link (which still needs to be fixed).
2007/12/10 14:42:05 sb 1.58.16.2: #i84309# Completely removed deprecated pkgchk tool.
2007/11/22 09:45:45 sb 1.58.16.1: Merged in CWS sb80.

1 files changed, 23 insertions, 7 deletions

diff --git a/desktop/prj/d.lst b/desktop/prj/d.lst
index 6e79b75299..ec45a98a53 100644
--- a/desktop/prj/d.lst
+++ b/desktop/prj/d.lst
@@ -3,6 +3,9 @@ mkdir: %_DEST%\bin%_EXT%\local
 mkdir: %_DEST%\bin%_EXT%\remote
 mkdir: %_DEST%\bin%_EXT%\remote2
 mkdir: %_DEST%\bin%_EXT%\so
+mkdir: %_DEST%\bin%_EXT%\c01
+mkdir: %_DEST%\bin%_EXT%\c05
+mkdir: %_DEST%\bin%_EXT%\c08
 
 ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
 ..\%__SRC%\bin\soffice.bin %_DEST%\bin%_EXT%\soffice.bin
@@ -11,6 +14,10 @@ mkdir: %_DEST%\bin%_EXT%\so
 ..\%__SRC%\bin\so\soffice.bin %_DEST%\bin%_EXT%\so\soffice.bin
 ..\%__SRC%\bin\so\officeloader.exe %_DEST%\bin%_EXT%\so\soffice.exe
 ..\%__SRC%\bin\so\soffice %_DEST%\bin%_EXT%\so\soffice.bin
+..\%__SRC%\bin\soffice.dll %_DEST%\bin%_EXT%\soffice.dll
+..\%__SRC%\lib\isoffice.lib %_DEST%\lib%_EXT%\isoffice.lib
+..\%__SRC%\lib\libsoffice.dylib %_DEST%\lib%_EXT%\libsoffice.dylib
+..\%__SRC%\lib\libsoffice.so %_DEST%\lib%_EXT%\libsoffice.so
 
 ..\%__SRC%\bin\soffice_oo.exe %_DEST%\bin%_EXT%\soffice_oo.exe
 ..\%__SRC%\bin\soffice_oo %_DEST%\bin%_EXT%\soffice_oo.bin
@@ -36,9 +43,10 @@ mkdir: %_DEST%\bin%_EXT%\so
 ..\%__SRC%\bin\wrp*.dll %_DEST%\bin%_EXT%\wrp*.dll
 ..\%__SRC%\bin\spl*.dll %_DEST%\bin%_EXT%\spl*.dll
 ..\%__SRC%\bin\socomp.dll %_DEST%\bin%_EXT%\socomp.dll
-..\%__SRC%\slb\soffice.lib %_DEST%\lib%_EXT%\soffice.lib
 ..\%__SRC%\obj\officeloader.obj %_DEST%\lib%_EXT%\officeloader.obj
 ..\%__SRC%\obj\extendloaderenvironment.obj %_DEST%\lib%_EXT%\extendloaderenvironment.obj
+..\%__SRC%\obj\copyright_ascii_sun.obj %_DEST%\lib%_EXT%\copyright_ascii_sun.obj
+..\%__SRC%\obj\main.obj %_DEST%\lib%_EXT%\main.obj
 ..\%__SRC%\lib\libwrp*.so %_DEST%\lib%_EXT%\libwrp*.so
 ..\%__SRC%\lib\libwrp*.dylib %_DEST%\lib%_EXT%\libwrp*.dylib
 ..\%__SRC%\lib\libspl*.so %_DEST%\lib%_EXT%\libspl*.so
@@ -66,12 +74,12 @@ mkdir: %_DEST%\bin%_EXT%\so
 ..\%__SRC%\bin\so\guiloader.exe %_DEST%\bin%_EXT%\so\unopkg.exe
 ..\%__SRC%\bin\unopkg %_DEST%\bin%_EXT%\unopkg.bin
 ..\%__SRC%\bin\so\unopkg %_DEST%\bin%_EXT%\so\unopkg.bin
-..\%__SRC%\bin\unopkg.bin %_DEST%\bin%_EXT%\unopkg.bin
-..\%__SRC%\bin\so\unopkg.bin %_DEST%\bin%_EXT%\so\unopkg.bin
+..\%__SRC%\bin\unopkg.exe %_DEST%\bin%_EXT%\unopkg.bin
+..\%__SRC%\bin\so\unopkg.exe %_DEST%\bin%_EXT%\so\unopkg.bin
 ..\%__SRC%\misc\unopkg.sh %_DEST%\bin%_EXT%\unopkg
-..\%__SRC%\bin\pkgchk.exe %_DEST%\bin%_EXT%\pkgchk.exe
-..\%__SRC%\bin\msi-pkgchk.exe %_DEST%\bin%_EXT%\msi-pkgchk.exe
-..\%__SRC%\bin\pkgchk %_DEST%\bin%_EXT%\pkgchk.bin
+..\%__SRC%\bin\unopkg.dll %_DEST%\bin%_EXT%\unopkg.dll
+..\%__SRC%\lib\libunopkg.dylib %_DEST%\lib%_EXT%\libunopkg.dylib
+..\%__SRC%\lib\libunopkg.so %_DEST%\lib%_EXT%\libunopkg.so
 
 ..\%__SRC%\bin\pagein %_DEST%\bin%_EXT%\pagein
 ..\%__SRC%\misc\pagein-* %_DEST%\bin%_EXT%\pagein-*
@@ -79,7 +87,6 @@ mkdir: %_DEST%\bin%_EXT%\so
 ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
 
 ..\%__SRC%\misc\soffice.sh %_DEST%\bin%_EXT%\soffice
-..\%__SRC%\misc\so\soffice.sh %_DEST%\bin%_EXT%\so\soffice
 ..\%__SRC%\misc\sbase.sh %_DEST%\bin%_EXT%\sbase
 ..\%__SRC%\misc\scalc.sh %_DEST%\bin%_EXT%\scalc
 ..\%__SRC%\misc\sdraw.sh %_DEST%\bin%_EXT%\sdraw
@@ -109,4 +116,13 @@ mkdir: %COMMON_DEST%\pck%_EXT%\broffice_nologo
 
 ..\%__SRC%\bin\guiloader.exe %_DEST%\bin%_EXT%\testtool.exe
 
+..\%__SRC%\bin\guistdio.exe %_DEST%\bin%_EXT%\guistdio.com
+..\%__SRC%\bin\guistdio.exe %_DEST%\bin%_EXT%\crashrep.com
+..\%__SRC%\bin\guistdio.exe %_DEST%\bin%_EXT%\unopkg.com
+
 ..\scripts\ure-link %_DEST%\bin%_EXT%\ure-link
+..\scripts\basis-link %_DEST%\bin%_EXT%\basis-link
+..\scripts\basis-link %_DEST%\bin%_EXT%\c01\basis-link
+..\scripts\basis-link %_DEST%\bin%_EXT%\c05\basis-link
+..\scripts\basis-link %_DEST%\bin%_EXT%\c08\basis-link
+..\scripts\so-basis-link %_DEST%\bin%_EXT%\so\basis-link