[ooo-build-commit] 3 commits - patches/dev300
Tor Lillqvist
tml at kemper.freedesktop.org
Tue Aug 11 04:41:14 PDT 2009
patches/dev300/novell-win32-drop-win9x.diff | 121 -----------
patches/dev300/novell-win32-installer-branding.diff | 204 +++++++++-----------
patches/dev300/novell-win32-vrb-branding.diff | 4
3 files changed, 104 insertions(+), 225 deletions(-)
New commits:
commit 93d59263834eddeac19ad1f245a3f80e34032d49
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 14:39:43 2009 +0300
Adapt novell-win32-drop-win9x.diff for dev300-m54
* patches/dev300/novell-win32-drop-win9x.diff: Adapt for dev300-m54.
diff --git a/patches/dev300/novell-win32-drop-win9x.diff b/patches/dev300/novell-win32-drop-win9x.diff
index f06d65f..ce0395f 100644
--- a/patches/dev300/novell-win32-drop-win9x.diff
+++ b/patches/dev300/novell-win32-drop-win9x.diff
@@ -35,54 +35,6 @@
File gid_File_Lib_Go
Name = LIBNAME(go);
TXT_FILE_BODY;
---- solenv/bin/modules/installer/windows/msiglobal.pm
-+++ solenv/bin/modules/installer/windows/msiglobal.pm
-@@ -1175,20 +1175,6 @@
- push(@{$setupinifile}, $line);
- }
-
--##########################################################################
--# Writing the path to the instmsia.exe into setup.ini
--##########################################################################
--
--sub put_instmsiapath_into_setupini
--{
-- my ($setupinifile) = @_;
--
-- my $instmsiaexepath = "instmsia.exe";
-- my $line = "instmsia=" . $instmsiaexepath . "\n";
--
-- push(@{$setupinifile}, $line);
--}
--
- ##########################################################################
- # Writing the required msi version into setup.ini
- ##########################################################################
-@@ -1309,7 +1309,6 @@
-
- put_databasename_into_setupini($setupinifile, $allvariableshashref);
- put_instmsiwpath_into_setupini($setupinifile);
-- put_instmsiapath_into_setupini($setupinifile);
- put_msiversion_into_setupini($setupinifile);
- put_productname_into_setupini($setupinifile, $allvariableshashref);
- put_productcode_into_setupini($setupinifile);
-@@ -1377,7 +1377,7 @@
-
- #################################################################
- # Copying the files for the Windows installer into the
--# installation set (setup.exe, instmsia.exe, instmsiw.exe).
-+# installation set (setup.exe, instmsiw.exe).
- #################################################################
-
- sub copy_windows_installer_files_into_installset
-@@ -1387,7 +1387,6 @@
- installer::logger::include_header_into_logfile("Copying Windows installer files into installation set");
-
- @copyfile = ();
-- push(@copyfile, "instmsia.exe");
- push(@copyfile, "instmsiw.exe");
- push(@copyfile, "loader2.exe");
-
--- external/prj/d.lst
+++ external/prj/d.lst
@@ -54,7 +54,6 @@
@@ -92,78 +44,9 @@
-..\msi\instmsia.exe %_DEST%\bin%_EXT%\instmsia.exe
..\msi\instmsiw.exe %_DEST%\bin%_EXT%\instmsiw.exe
- ..\mingwm10\mingwm10.dll %_DEST%\bin%_EXT%\mingwm10.dll
---- desktop/win32/source/setup/setup.hxx
-+++ desktop/win32/source/setup/setup.hxx
-@@ -76,7 +76,6 @@
- LPTSTR m_pCmdLine;
- LPTSTR m_pDatabase;
- LPTSTR m_pInstMsiW;
-- LPTSTR m_pInstMsiA;
- LPTSTR m_pReqVersion;
- LPTSTR m_pProductName;
- LPTSTR m_pAdvertise;
+ ..\%__SRC%\bin\mingwm10.dll %_DEST%\bin%_EXT%\mingwm10.dll
--- desktop/win32/source/setup/setup.cpp
+++ desktop/win32/source/setup/setup.cpp
-@@ -123,7 +123,6 @@
-
- m_pDatabase = NULL;
- m_pInstMsiW = NULL;
-- m_pInstMsiA = NULL;
- m_pReqVersion = NULL;
- m_pProductName = NULL;
- m_pAdvertise = NULL;
-@@ -178,7 +178,6 @@
- if ( m_pAppTitle ) delete [] m_pAppTitle;
- if ( m_pDatabase ) delete [] m_pDatabase;
- if ( m_pInstMsiW ) delete [] m_pInstMsiW;
-- if ( m_pInstMsiA ) delete [] m_pInstMsiA;
- if ( m_pReqVersion ) delete [] m_pReqVersion;
- if ( m_pProductName ) delete [] m_pProductName;
- if ( m_pAdvertise ) delete [] m_pAdvertise;
-@@ -343,11 +343,6 @@
- m_pInstMsiW = pValue;
- Log( TEXT( " instmsiw = %s\r\n" ), pValue );
- }
-- else if ( lstrcmpi( TEXT( "instmsia" ), pName ) == 0 )
-- {
-- m_pInstMsiA = pValue;
-- Log( TEXT( " instmsia = %s\r\n" ), pValue );
-- }
- else if ( lstrcmpi( TEXT( "msiversion" ), pName ) == 0 )
- {
- m_pReqVersion = pValue;
-@@ -367,7 +367,7 @@
- }
- }
-
-- if ( bRet && ( !m_pDatabase || !m_pInstMsiW || !m_pInstMsiA || !m_pReqVersion || !m_pProductName ) )
-+ if ( bRet && ( !m_pDatabase || !m_pInstMsiW || !m_pReqVersion || !m_pProductName ) )
- {
- Log( TEXT( "ERROR: incomplete 'Setup' section in profile\r\n" ) );
- SetError( ERROR_INVALID_DATA );
-@@ -1161,19 +1161,13 @@
- {
- LPTSTR pInstaller = 0;
-
-- if ( IsWin9x() )
-- bRet = GetPathToFile( m_pInstMsiA, &pInstaller );
-- else
-- bRet = GetPathToFile( m_pInstMsiW, &pInstaller );
-+ bRet = GetPathToFile( m_pInstMsiW, &pInstaller );
-
- if ( bRet )
- bRet = InstallMsi( pInstaller );
- else
-- Log( TEXT( "ERROR: Could not find InstMsiA/InstMsiW!\r\n" ) );
-+ Log( TEXT( "ERROR: Could not find InstMsiW!\r\n" ) );
-
-- if ( bRet && IsWin9x() && ( GetMinorVersion() <= 10 ) )
-- SetRebootNeeded( true );
--
- if ( pInstaller ) delete [] pInstaller;
- }
-
@@ -1334,9 +1334,7 @@
const TCHAR sGUniqueName[] = TEXT( "Global\\_MSISETUP_{EA8130C1-8D3D-4338-9309-1A52D530D846}" );
const TCHAR sUniqueName[] = TEXT( "_MSISETUP_{EA8130C1-8D3D-4338-9309-1A52D530D846}" );
@@ -300,7 +183,7 @@
+dnl Windows builds with VS 2003/2005/2008 need instmsiw.exe in external/msi
dnl ===================================================================
if test "$_os" = "WINNT"; then
- if test "$COMEX" -ge "10"; then
+ if test "$WITH_MINGWIN" = "yes" || test "$COMEX" -ge "10"; then
- AC_MSG_CHECKING([for instmsia.exe/instmsiw.exe])
- if test -x ./external/msi/instmsia.exe -a -x ./external/msi/instmsiw.exe; then
+ AC_MSG_CHECKING([for instmsiw.exe])
commit 24f202a5c9969ce9617a6346146abadd516f36ab
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 14:31:02 2009 +0300
Adapt novell-win32-vrb-branding.diff to dev300-m54.
* patches/dev300/novell-win32-vrb-branding.diff: Adapt to dev300-m54.
diff --git a/patches/dev300/novell-win32-vrb-branding.diff b/patches/dev300/novell-win32-vrb-branding.diff
index 6029003..973f9d2 100644
--- a/patches/dev300/novell-win32-vrb-branding.diff
+++ b/patches/dev300/novell-win32-vrb-branding.diff
@@ -24,7 +24,7 @@
block "040704E4"
{
// German StringTable
-- value "CompanyName", "Sun Microsystems, Inc.\0"
+- value "CompanyName", "OpenOffice.org\0"
+ value "CompanyName", "Novell, Inc.\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "OriginalFilename", PPS(ORG_NAME) "\0"
@@ -33,7 +33,7 @@
block "040904E4"
{
// International StringTable
-- value "CompanyName", "Sun Microsystems, Inc.\0"
+- value "CompanyName", "OpenOffice.org\0"
+ value "CompanyName", "Novell, Inc.\0"
value "FileVersion", PPS(VER_LEVEL) "\0"
value "OriginalFilename", PPS(ORG_NAME) "\0"
commit 6cc6a2b88aa4bb101f7966c5a614e499a3502307
Author: Tor Lillqvist <tlillqvist at novell.com>
Date: Tue Aug 11 14:24:20 2009 +0300
Adapt novell-win32-installer-branding.diff to dev300
* patches/dev300/novell-win32-installer-branding.diff: Adapt to
dev300-m54.
diff --git a/patches/dev300/novell-win32-installer-branding.diff b/patches/dev300/novell-win32-installer-branding.diff
index bfb56a0..59cf0b5 100644
--- a/patches/dev300/novell-win32-installer-branding.diff
+++ b/patches/dev300/novell-win32-installer-branding.diff
@@ -1,104 +1,100 @@
---- instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
-+++ instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
-@@ -379,7 +379,7 @@
- en-US = "Cancel"
-
- [OOO_CONTROL_124]
--en-US = "Build contributed in collaboration with the community by Sun Microsystems, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html"
-+en-US = "Build contributed in collaboration with the community by Novell, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html"
-
- [OOO_CONTROL_125]
- en-US = "&Next >"
---- instsetoo_native/util/makefile.mk.old 2006-01-16 15:10:22.000000000 +0200
-+++ instsetoo_native/util/makefile.mk 2006-01-17 12:58:26.000000000 +0200
-@@ -372,10 +372,17 @@
- $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
- $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
- # $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
-- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
-- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
--# $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-+ $(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
-+ $(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
-+ $(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
-+ $(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
-+ $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
-+ $(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
-
-
-dummy line to avoid confusing diff-mode
---- instsetoo_native/util/openoffice.lst.old 2006-01-17 12:23:31.000000000 +0200
-+++ instsetoo_native/util/openoffice.lst 2006-01-17 14:24:08.000000000 +0200
-@@ -29,9 +29,9 @@
- USE_FILEVERSION 1
- LIBRARYVERSION 9.1.1
- PATCHCODEFILE ooo_patchcodes.txt
-- DOWNLOADBANNER ooobanner.bmp
-- DOWNLOADBITMAP ooobitmap.bmp
-- DOWNLOADSETUPICO ooosetup.ico
-+ DOWNLOADBANNER ooobanner_nld.bmp
-+ DOWNLOADBITMAP ooobitmap_nld.bmp
-+ DOWNLOADSETUPICO ooosetup_nld.ico
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
- STARTCENTER_INFO_URL http://www.go-oo.org
-@@ -76,9 +76,9 @@
- LIBRARYVERSION 9.1.1
- PATCHCODEFILE ooo_patchcodes.txt
- JAVAPRODUCT 1
-- DOWNLOADBANNER ooobanner.bmp
-- DOWNLOADBITMAP ooobitmap.bmp
-- DOWNLOADSETUPICO ooosetup.ico
-+ DOWNLOADBANNER ooobanner_nld.bmp
-+ DOWNLOADBITMAP ooobitmap_nld.bmp
-+ DOWNLOADSETUPICO ooosetup_nld.ico
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
- STARTCENTER_INFO_URL http://www.go-oo.org
-@@ -122,9 +122,9 @@
- LIBRARYVERSION 9.1.1
- PATCHCODEFILE ooodev_patchcodes.txt
- CODEFILENAME codes_ooodev.txt
-- DOWNLOADBANNER ooobanner.bmp
-- DOWNLOADBITMAP ooobitmap.bmp
-- DOWNLOADSETUPICO ooosetup.ico
-+ DOWNLOADBANNER ooobanner_nld.bmp
-+ DOWNLOADBITMAP ooobitmap_nld.bmp
-+ DOWNLOADSETUPICO ooosetup_nld.ico
- LOCALUSERDIR $ORIGIN/..
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
-@@ -150,9 +150,9 @@
- PROGRAMFILESROOT 1
- PCPFILENAME ure.pcp
- GLOBALFILEGID gid_File_Dl_Cppu
-- DOWNLOADBANNER urebanner.bmp
-- DOWNLOADBITMAP urebitmap.bmp
-- DOWNLOADSETUPICO ooosetup.ico
-+ DOWNLOADBANNER ooobanner_nld.bmp
-+ DOWNLOADBITMAP ooobitmap_nld.bmp
-+ DOWNLOADSETUPICO ooosetup_nld.ico
- DONTUSESTARTMENUFOLDER 1
- SERVICESPROJEKT 1
- RELATIVE_PATHES_IN_DDF 1
-@@ -92,9 +92,9 @@
- NOVERSIONINDIRNAME 0
- NOSPACEINDIRECTORYNAME 1
- CHANGETARGETDIR 1
-- DOWNLOADBANNER ooosdkbanner.bmp
-- DOWNLOADBITMAP ooosdkbitmap.bmp
-- DOWNLOADSETUPICO ooosetup.ico
-+ DOWNLOADBANNER ooobanner_nld.bmp
-+ DOWNLOADBITMAP ooobitmap_nld.bmp
-+ DOWNLOADSETUPICO ooosetup_nld.ico
- DONTUSESTARTMENUFOLDER 1
- RELATIVE_PATHES_IN_DDF 1
- STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+--- instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
++++ instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf
+@@ -379,7 +379,7 @@
+ en-US = "Cancel"
+
+ [OOO_CONTROL_124]
+-en-US = "Build contributed in collaboration with the community by Sun Microsystems, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html"
++en-US = "Build contributed in collaboration with the community by Novell, Inc. For credits, see: http://www.openoffice.org/welcome/credits.html"
+
+ [OOO_CONTROL_125]
+ en-US = "&Next >"
+--- instsetoo_native/util/makefile.mk
++++ instsetoo_native/util/makefile.mk
+@@ -372,9 +372,15 @@
+ $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+ $(RM) $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
+ $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
+- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
+- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
+- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSIURETEMPLATEDIR)$/Binary$/Image.bmp
+- $(COPY) $(PRJ)$/res$/nologoinstall.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
++ $(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Image.bmp
++ $(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Image.bmp
++ $(COPY) $(PRJ)$/res$/nologoinstall_nld.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Image.bmp
++ $(RM) $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
++ $(RM) $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
++ $(RM) $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
++ $(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSIOFFICETEMPLATEDIR)$/Binary$/Banner.bmp
++ $(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSILANGPACKTEMPLATEDIR)$/Binary$/Banner.bmp
++ $(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSISDKOOTEMPLATEDIR)$/Binary$/Banner.bmp
++ $(COPY) $(PRJ)$/res$/banner_nld.bmp $(MSIURETEMPLATEDIR)$/Binary$/Banner.bmp
+
+
+--- instsetoo_native/util/openoffice.lst
++++ instsetoo_native/util/openoffice.lst
+@@ -29,9 +29,9 @@
+ USE_FILEVERSION 1
+ LIBRARYVERSION 9.2.0
+ PATCHCODEFILE ooo_patchcodes.txt
+- DOWNLOADBANNER ooobanner.bmp
+- DOWNLOADBITMAP ooobitmap.bmp
+- DOWNLOADSETUPICO ooosetup.ico
++ DOWNLOADBANNER ooobanner_nld.bmp
++ DOWNLOADBITMAP ooobitmap_nld.bmp
++ DOWNLOADSETUPICO ooosetup_nld.ico
+ RELATIVE_PATHES_IN_DDF 1
+ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+ STARTCENTER_INFO_URL http://www.go-oo.org
+@@ -76,9 +76,9 @@
+ LIBRARYVERSION 9.2.0
+ PATCHCODEFILE ooo_patchcodes.txt
+ JAVAPRODUCT 1
+- DOWNLOADBANNER ooobanner.bmp
+- DOWNLOADBITMAP ooobitmap.bmp
+- DOWNLOADSETUPICO ooosetup.ico
++ DOWNLOADBANNER ooobanner_nld.bmp
++ DOWNLOADBITMAP ooobitmap_nld.bmp
++ DOWNLOADSETUPICO ooosetup_nld.ico
+ RELATIVE_PATHES_IN_DDF 1
+ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+ STARTCENTER_INFO_URL http://www.go-oo.org
+@@ -122,9 +122,9 @@
+ LIBRARYVERSION 9.2.0
+ PATCHCODEFILE ooodev_patchcodes.txt
+ CODEFILENAME codes_ooodev.txt
+- DOWNLOADBANNER ooobanner.bmp
+- DOWNLOADBITMAP ooobitmap.bmp
+- DOWNLOADSETUPICO ooosetup.ico
++ DOWNLOADBANNER ooobanner_nld.bmp
++ DOWNLOADBITMAP ooobitmap_nld.bmp
++ DOWNLOADSETUPICO ooosetup_nld.ico
+ LOCALUSERDIR $ORIGIN/..
+ RELATIVE_PATHES_IN_DDF 1
+ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
+@@ -150,9 +150,9 @@
+ PCPFILENAME ure.pcp
+ POOLPRODUCT 0
+ GLOBALFILEGID gid_File_Dl_Cppu
+- DOWNLOADBANNER urebanner.bmp
+- DOWNLOADBITMAP urebitmap.bmp
+- DOWNLOADSETUPICO ooosetup.ico
++ DOWNLOADBANNER ooobanner_nld.bmp
++ DOWNLOADBITMAP ooobitmap_nld.bmp
++ DOWNLOADSETUPICO ooosetup_nld.ico
+ DONTUSESTARTMENUFOLDER 1
+ SERVICESPROJEKT 1
+ RELATIVE_PATHES_IN_DDF 1
+@@ -92,9 +92,9 @@
+ NOVERSIONINDIRNAME 0
+ NOSPACEINDIRECTORYNAME 1
+ CHANGETARGETDIR 1
+- DOWNLOADBANNER ooosdkbanner.bmp
+- DOWNLOADBITMAP ooosdkbitmap.bmp
+- DOWNLOADSETUPICO ooosetup.ico
++ DOWNLOADBANNER ooobanner_nld.bmp
++ DOWNLOADBITMAP ooobitmap_nld.bmp
++ DOWNLOADSETUPICO ooosetup_nld.ico
+ DONTUSESTARTMENUFOLDER 1
+ RELATIVE_PATHES_IN_DDF 1
+ STARTCENTER_ADDFEATURE_URL http://extensions.go-oo.org/getmore?cid=920794
More information about the ooo-build-commit
mailing list