[ooo-build-commit] .: patches/dev300
Fridrich Strba
fridrich at kemper.freedesktop.org
Tue Sep 14 03:23:40 PDT 2010
patches/dev300/apply | 6 -
patches/dev300/build-fix-win32.diff | 124 ------------------------------------
2 files changed, 130 deletions(-)
New commits:
commit ffad44fe5dd6d509e898465791717b1c472f21d7
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date: Tue Sep 14 12:23:15 2010 +0200
Move build-fix-win32.diff to git.
diff --git a/patches/dev300/apply b/patches/dev300/apply
index 583914b..580efd4 100644
--- a/patches/dev300/apply
+++ b/patches/dev300/apply
@@ -2931,12 +2931,6 @@ mysqlcppconn-mysqlclient-SONAME.diff
[ BuildBits ]
novell-win32-agfa-monotype-fonts.diff, tml
-[ BuildFixWin32 ]
-# FIXME: 2009-09-10: various hacks to get the build to build, should be removed
-# the changes in this patch should be integrated into existing patches or
-# the underlying problem these patches avoid should be fixex --noelp
-build-fix-win32.diff
-
[ EMFPlus ]
emf+-driver-string.diff, n#519715, rodo
diff --git a/patches/dev300/build-fix-win32.diff b/patches/dev300/build-fix-win32.diff
deleted file mode 100644
index a47cc51..0000000
--- a/patches/dev300/build-fix-win32.diff
+++ /dev/null
@@ -1,124 +0,0 @@
---- scp2/source/ooo/file_library_ooo.scp
-+++ scp2/source/ooo/file_library_ooo.scp
-@@ -1922,6 +1922,12 @@
- Name = SCP2_URE_DL_NORMAL("msvcr80");
- Styles = (PACKED, VERSION_INDEPENDENT_COMP_ID);
- End
-+File gid_File_Moz_Msvc80crt_Manifest
-+ BIN_FILE_BODY;
-+ Styles = (PACKED);
-+ Dir = gid_Dir_Program;
-+ Name = "Microsoft.VC80.CRT.manifest";
-+End
- #endif
-
- #ifndef SYSTEM_REDLAND
---- scp2/source/ooo/common_brand.scp
-+++ scp2/source/ooo/common_brand.scp
-@@ -504,10 +504,7 @@
- Name = "unopkg.bin";
- End
-
--#if defined WNT && \
-- (defined M1310 || \
-- ((defined M1400 || defined M1500) && \
-- !(defined SYSTEM_MOZILLA || defined WITHOUT_MOZILLA)))
-+#ifdef WNT
- File gid_Brand_File_Bin_Msvcr71
- TXT_FILE_BODY;
- Dir = gid_Brand_Dir_Program;
---- external/prj/d.lst
-+++ external/prj/d.lst
-@@ -34,8 +34,8 @@
- ..\msvcp80\msvcm80*.dll %_DEST%\bin%_EXT%
- ..\msvcp80\msvcp80*.dll %_DEST%\bin%_EXT%
- ..\msvcp80\msvcr80*.dll %_DEST%\bin%_EXT%
--..\msvcp90\Microsoft.VC80.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.CRT.manifest
--..\msvcp90\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.DebugCRT.manifest
-+..\msvcp80\Microsoft.VC80.CRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.CRT.manifest
-+..\msvcp80\Microsoft.VC80.DebugCRT.manifest %_DEST%\bin%_EXT%\Microsoft.VC80.DebugCRT.manifest
-
- ..\msvcp90\msvcm90*.dll %_DEST%\bin%_EXT%
- ..\msvcp90\msvcp90*.dll %_DEST%\bin%_EXT%
---- external/msvcp80/README_msvcX80.dll
-+++ external/msvcp80/README_msvcX80.dll
-@@ -1,2 +1,3 @@
--Put the msvcp80.dll and msvcr80.dll in this directory for Windows builds using
--a VS 2005 compiler.
-+Put the msvcp80.dll, msvcr80.dll and Microsoft.VC80.CRT.manifest in this
-+directory for Windows builds using VS 2005, or using prebuilt Mozilla DLLs
-+that were built using VS 2005.
---- solenv/bin/modules/installer/windows/mergemodule.pm
-+++ solenv/bin/modules/installer/windows/mergemodule.pm
-@@ -402,14 +402,14 @@
- installer::logger::include_timestamp_into_logfile("\nPerformance Info: After merging database");
-
- # Saving original idt files
-- if ( -f "File.idt" ) { installer::systemactions::rename_one_file("File.idt", "File.idt.$counter"); }
-- if ( -f "Media.idt" ) { installer::systemactions::rename_one_file("Media.idt", "Media.idt.$counter"); }
-- if ( -f "Directory.idt" ) { installer::systemactions::rename_one_file("Directory.idt", "Directory.idt.$counter"); }
-- if ( -f "Director.idt" ) { installer::systemactions::rename_one_file("Director.idt", "Director.idt.$counter"); }
-- if ( -f "FeatureComponents.idt" ) { installer::systemactions::rename_one_file("FeatureComponents.idt", "FeatureComponents.idt.$counter"); }
-- if ( -f "FeatureC.idt" ) { installer::systemactions::rename_one_file("FeatureC.idt", "FeatureC.idt.$counter"); }
-- if ( -f "MsiAssembly.idt" ) { installer::systemactions::rename_one_file("MsiAssembly.idt", "MsiAssembly.idt.$counter"); }
-- if ( -f "MsiAssem.idt" ) { installer::systemactions::rename_one_file("MsiAssem.idt", "MsiAssem.idt.$counter"); }
-+ if ( -f "File.idt" ) { installer::systemactions::rename_one_file("File.idt", "old.File.idt.$counter"); }
-+ if ( -f "Media.idt" ) { installer::systemactions::rename_one_file("Media.idt", "old.Media.idt.$counter"); }
-+ if ( -f "Directory.idt" ) { installer::systemactions::rename_one_file("Directory.idt", "old.Directory.idt.$counter"); }
-+ if ( -f "Director.idt" ) { installer::systemactions::rename_one_file("Director.idt", "old.Director.idt.$counter"); }
-+ if ( -f "FeatureComponents.idt" ) { installer::systemactions::rename_one_file("FeatureComponents.idt", "old.FeatureComponents.idt.$counter"); }
-+ if ( -f "FeatureC.idt" ) { installer::systemactions::rename_one_file("FeatureC.idt", "old.FeatureC.idt.$counter"); }
-+ if ( -f "MsiAssembly.idt" ) { installer::systemactions::rename_one_file("MsiAssembly.idt", "old.MsiAssembly.idt.$counter"); }
-+ if ( -f "MsiAssem.idt" ) { installer::systemactions::rename_one_file("MsiAssem.idt", "old.MsiAssem.idt.$counter"); }
-
- # Extracting tables
-
-@@ -478,13 +478,13 @@
- # merged into the three ExecuteSequences with the following process (also into InstallUISequence.idt).
-
- # Saving original idt files
-- if ( -f "InstallE.idt" ) { installer::systemactions::rename_one_file("InstallE.idt", "InstallE.idt.$counter"); }
-- if ( -f "InstallU.idt" ) { installer::systemactions::rename_one_file("InstallU.idt", "InstallU.idt.$counter"); }
-- if ( -f "AdminExe.idt" ) { installer::systemactions::rename_one_file("AdminExe.idt", "AdminExe.idt.$counter"); }
-- if ( -f "AdvtExec.idt" ) { installer::systemactions::rename_one_file("AdvtExec.idt", "AdvtExec.idt.$counter"); }
-- if ( -f "ModuleInstallExecuteSequence.idt" ) { installer::systemactions::rename_one_file("ModuleInstallExecuteSequence.idt", "ModuleInstallExecuteSequence.idt.$counter"); }
-- if ( -f "ModuleAdminExecuteSequence.idt" ) { installer::systemactions::rename_one_file("ModuleAdminExecuteSequence.idt", "ModuleAdminExecuteSequence.idt.$counter"); }
-- if ( -f "ModuleAdvtExecuteSequence.idt" ) { installer::systemactions::rename_one_file("ModuleAdvtExecuteSequence.idt", "ModuleAdvtExecuteSequence.idt.$counter"); }
-+ if ( -f "InstallE.idt" ) { installer::systemactions::rename_one_file("InstallE.idt", "old.InstallE.idt.$counter"); }
-+ if ( -f "InstallU.idt" ) { installer::systemactions::rename_one_file("InstallU.idt", "old.InstallU.idt.$counter"); }
-+ if ( -f "AdminExe.idt" ) { installer::systemactions::rename_one_file("AdminExe.idt", "old.AdminExe.idt.$counter"); }
-+ if ( -f "AdvtExec.idt" ) { installer::systemactions::rename_one_file("AdvtExec.idt", "old.AdvtExec.idt.$counter"); }
-+ if ( -f "ModuleInstallExecuteSequence.idt" ) { installer::systemactions::rename_one_file("ModuleInstallExecuteSequence.idt", "old.ModuleInstallExecuteSequence.idt.$counter"); }
-+ if ( -f "ModuleAdminExecuteSequence.idt" ) { installer::systemactions::rename_one_file("ModuleAdminExecuteSequence.idt", "old.ModuleAdminExecuteSequence.idt.$counter"); }
-+ if ( -f "ModuleAdvtExecuteSequence.idt" ) { installer::systemactions::rename_one_file("ModuleAdvtExecuteSequence.idt", "old.ModuleAdvtExecuteSequence.idt.$counter"); }
-
- # Extracting tables
- my $moduleexecutetables = "ModuleInstallExecuteSequence ModuleAdminExecuteSequence ModuleAdvtExecuteSequence"; # new tables
-@@ -561,16 +561,22 @@
- my $localworkdir = $workdir;
- $localmsifilename =~ s/\//\\\\/g;
- $localworkdir =~ s/\//\\\\/g;
-- $systemcall = $msidb . " -d " . $localmsifilename . " -f " . $localworkdir . " -i " . $workingtables. " " . $executetables;
-+ foreach $table (split / /, $workingtables . ' ' . $executetables) {
-+ $systemcall = $msidb . " -d " . $localmsifilename . " -f " . $localworkdir . " -i " . $table;
-+ my $retval = system($systemcall);
-+ $infoline = "Systemcall returned $retval: $systemcall\n";
-+ push( @installer::globals::logfileinfo, $infoline);
-+ $returnvalue |= $retval;
-+ }
- }
- else
- {
- $systemcall = $msidb . " -d " . $msifilename . " -f " . $workdir . " -i " . $workingtables. " " . $executetables;
-- }
-- $returnvalue = system($systemcall);
-+ $returnvalue = system($systemcall);
-+ $infoline = "Systemcall: $systemcall\n";
-+ push( @installer::globals::logfileinfo, $infoline);
-
-- $infoline = "Systemcall: $systemcall\n";
-- push( @installer::globals::logfileinfo, $infoline);
-+ }
-
- if ($returnvalue)
- {
More information about the ooo-build-commit
mailing list