[ooo-build-commit] patches/dev300

[Tor Lillqvist]

 patches/dev300/unxsplash-rework.diff |   16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

New commits:
commit eb3c019cfbf0494b4cc0d7cbe812197cc789fbbd
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Fri Aug 21 14:56:47 2009 +0300

    Adapt unxsplash-rework.diff for dev300-m54
    
    * patches/dev300/unxsplash-rework.diff: Adapt for dev300-m54.

diff --git a/patches/dev300/unxsplash-rework.diff b/patches/dev300/unxsplash-rework.diff
index f957c1a..d3339aa 100644
--- a/patches/dev300/unxsplash-rework.diff
+++ b/patches/dev300/unxsplash-rework.diff
@@ -10,12 +10,10 @@ index aae085b..d686e56 100644
  		virtual void			DeInit();
  		virtual BOOL			QueryExit();
  		virtual USHORT			Exception(USHORT nError);
-diff --git desktop/prj/build.lst desktop/prj/build.lst
-index 89c2d8c..0b010ef 100644
 --- desktop/prj/build.lst
 +++ desktop/prj/build.lst
 @@ -18,6 +18,8 @@ dt	desktop\win32\source\applauncher		nmake	-	w	dt_applauncher dt_inc NULL
- dt	desktop\win32\source\applauncher\ooo	nmake	-	w	dt_applauncher_ooo dt_applauncher.w dt_inc NULL
+ dt	desktop\win32\source\rebase				nmake	-	w	dt_rebase dt_inc NULL
  dt	desktop\os2\source\applauncher			nmake	-	p	dt_applauncher dt_inc NULL
  dt	desktop\unx\source\officeloader		nmake	-	u	dt_officeloader_unx dt_inc NULL
 +dt	desktop\unx\source			nmake	-	u	dt_uwrapper	dt_inc NULL
@@ -27,8 +25,8 @@ index 89c2d8c..0b010ef 100644
  dt	desktop\source\deployment\registry\help			nmake	-	all	dt_dp_registry_help dt_inc NULL
  dt	desktop\source\deployment\registry\executable		nmake	-	all	dt_dp_registry_executable dt_inc NULL
  dt	desktop\scripts 						nmake	-	u	dt_scripts dt_inc NULL
--dt	desktop\util							nmake	-	all	dt_util dt_app dt_so_comp dt_spl dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr NULL
-+dt	desktop\util							nmake	-	all	dt_util dt_app dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr NULL
+-dt	desktop\util							nmake	-	all	dt_util dt_app dt_so_comp dt_spl dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_rebase.w NULL
++dt	desktop\util							nmake	-	all	dt_util dt_app dt_so_comp dt_spl dt_uwrapper.u dt_usplash.u dt_wrapper.w dt_officeloader.w dt_officeloader_unx.u dt_migr dt_rebase.w NULL
  dt	desktop\zipintro							nmake	-	all	dt_zipintro NULL
 diff --git desktop/prj/d.lst desktop/prj/d.lst
 index 1f401d8..78e9977 100644
@@ -2288,14 +2286,12 @@ index 1a6661a..dbbe327 100644
  
  SPECIAL_UNO_LIB_FILE(gid_File_Lib_Srtrs1,srtrs1)
  
-diff --git smoketestoo_native/smoketest.pl smoketestoo_native/smoketest.pl
-index 6785977..c0a2e6c 100755
 --- smoketestoo_native/smoketest.pl
 +++ smoketestoo_native/smoketest.pl
 @@ -502,7 +502,7 @@ sub doTest {
-     if ($ENV{OS} eq "MACOSX") {
- 		delete $ENV{DYLD_LIBRARY_PATH};
- 	}
+ 
+ 	print "starting office ($INSTSETNAME)\n";
+ 
 -	$Command = "\"$programpath" . "$SOFFICEBIN\" -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions";
 +	$Command = "\"$programpath" . "$SOFFICEBIN\" -no-oosplash -norestore -nocrashreport macro:///Standard.Global.StartTestWithDefaultOptions";
  	if ( (defined($ENV{OS})) && ($ENV{OS} eq "MACOSX") ) {