diff options
Diffstat (limited to 'instsetoo_native')
8 files changed, 50 insertions, 54 deletions
diff --git a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt index dea5e9767a6e..21f7fe7726a5 100644 --- a/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt +++ b/instsetoo_native/inc_ooolangpack/windows/msi_templates/ControlE.idt @@ -132,7 +132,6 @@ SetupResume Next EndDialog Return OutOfNoRbDiskSpace <> 1 0 SetupResume Next NewDialog OutOfSpace OutOfNoRbDiskSpace = 1 0 SetupType Back NewDialog CustomerInformation 1 0 SetupType Cancel SpawnDialog CancelSetup 1 0 -SetupType Next AddLocal ALL _IsSetupTypeMin = "Typical" 0 SetupType Next NewDialog CustomSetup _IsSetupTypeMin = "Custom" 0 SetupType Next NewDialog ReadyToInstall _IsSetupTypeMin <> "Custom" 0 SplashBitmap Cancel SpawnDialog CancelSetup 1 0 diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf index 7fcb566af0e3..ec904cd5e904 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/Control.ulf @@ -620,7 +620,7 @@ en-US = "< &Back" en-US = "Cancel" [OOO_CONTROL_255] -en-US = "All program features will be installed. (Requires the most disk space.)" +en-US = "The main components will be installed. Recommended for most users." [OOO_CONTROL_256] en-US = "Choose which program features you want installed and where they will be installed. Recommended for advanced users." diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf index da2d44cdb983..24b51774bacb 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/RadioBut.ulf @@ -8,7 +8,7 @@ en-US = "{&MSSansBold8}Re&pair" en-US = "{&MSSansBold8}&Remove" [OOO_RADIOBUTTON_4] -en-US = "{&MSSansBold8}&Complete" +en-US = "{&MSSansBold8}&Typical" [OOO_RADIOBUTTON_5] en-US = "{&MSSansBold8}Cu&stom" diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt index 2200f4d28a3a..56bf6b92d757 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/ControlE.idt @@ -145,7 +145,6 @@ SetupResume Next EndDialog Return OutOfNoRbDiskSpace <> 1 0 SetupResume Next NewDialog OutOfSpace OutOfNoRbDiskSpace = 1 0 SetupType Back NewDialog CustomerInformation 1 0 SetupType Cancel SpawnDialog CancelSetup 1 0 -SetupType Next AddLocal ALL _IsSetupTypeMin = "Typical" 0 SetupType Next NewDialog CustomSetup _IsSetupTypeMin = "Custom" 0 SetupType Next [FILETYPEDIALOGUSED] 0 _IsSetupTypeMin <> "Custom" 5 SetupType Next NewDialog ReadyToInstall _IsSetupTypeMin <> "Custom" 6 diff --git a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt index 332945b50bdb..49407d4770da 100644 --- a/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt +++ b/instsetoo_native/inc_sdkoo/windows/msi_templates/ControlE.idt @@ -133,7 +133,6 @@ SetupResume Next EndDialog Return OutOfNoRbDiskSpace <> 1 0 SetupResume Next NewDialog OutOfSpace OutOfNoRbDiskSpace = 1 0 SetupType Back NewDialog CustomerInformation 1 0 SetupType Cancel SpawnDialog CancelSetup 1 0 -SetupType Next AddLocal ALL _IsSetupTypeMin = "Typical" 0 SetupType Next NewDialog CustomSetup _IsSetupTypeMin = "Custom" 0 SetupType Next NewDialog ReadyToInstall _IsSetupTypeMin <> "Custom" 0 SplashBitmap Cancel SpawnDialog CancelSetup 1 0 diff --git a/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt b/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt index 332945b50bdb..49407d4770da 100644 --- a/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt +++ b/instsetoo_native/inc_ure/windows/msi_templates/ControlE.idt @@ -133,7 +133,6 @@ SetupResume Next EndDialog Return OutOfNoRbDiskSpace <> 1 0 SetupResume Next NewDialog OutOfSpace OutOfNoRbDiskSpace = 1 0 SetupType Back NewDialog CustomerInformation 1 0 SetupType Cancel SpawnDialog CancelSetup 1 0 -SetupType Next AddLocal ALL _IsSetupTypeMin = "Typical" 0 SetupType Next NewDialog CustomSetup _IsSetupTypeMin = "Custom" 0 SetupType Next NewDialog ReadyToInstall _IsSetupTypeMin <> "Custom" 0 SplashBitmap Cancel SpawnDialog CancelSetup 1 0 diff --git a/instsetoo_native/util/makefile.mk b/instsetoo_native/util/makefile.mk index 72f4262b1c4e..19a6214f8dc6 100644 --- a/instsetoo_native/util/makefile.mk +++ b/instsetoo_native/util/makefile.mk @@ -210,7 +210,7 @@ $(MAKETARGETS){$(PKGFORMAT:^".")} : $(ADDDEPS) .ENDIF # "$(MAKETARGETS:e)"=="" && "$(MAKETARGETS:s/_//)"!="$(MAKETARGETS)" .ENDIF # "$(MAKETARGETS)"!="" openoffice_%{$(PKGFORMAT:^".") .archive} : - $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) -log + $(PERL) -w $(SOLARENV)$/bin$/make_installer.pl -f $(PRJ)$/util$/openoffice.lst -l $(subst,$(@:s/_/ /:1)_, $(@:b)) -p OpenOffice -u $(OUT) -buildid $(BUILD) -msitemplate $(MSIOFFICETEMPLATEDIR) -msilanguage $(COMMONMISC)$/win_ulffiles -format $(@:e:s/.//) $(VERBOSESWITCH) $(PERL) -w $(SOLARENV)$/bin$/gen_update_info.pl --buildid $(BUILD) --arch "$(RTL_ARCH)" --os "$(RTL_OS)" --lstfile $(PRJ)$/util$/openoffice.lst --product OpenOffice --languages $(subst,$(@:s/_/ /:1)_, $(@:b)) $(PRJ)$/util$/update.xml > $(MISC)/$(@:b)_$(RTL_OS)_$(RTL_ARCH)$(@:e).update.xml $(foreach,i,$(alllangiso) openofficewithjre_$i) : $$@{$(PKGFORMAT:^".")} diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 221aee9868b2..04c2e0d9b3f3 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -4,15 +4,15 @@ Globals { variables { - OOOBASEVERSION 3.3 - OOOPACKAGEVERSION 3.3.0 - UREPACKAGEVERSION 1.7.0 + OOOBASEVERSION 3.4 + OOOPACKAGEVERSION 3.4.0 + UREPACKAGEVERSION 1.8.0 URELAYERVERSION 1 BASISROOTNAME OpenOffice.org UNIXBASISROOTNAME openoffice.org - SERVICETAG_PRODUCTNAME OpenOffice.org 3.3 - SERVICETAG_PRODUCTVERSION 3.3 - SERVICETAG_PARENTNAME OpenOffice.org 3.3 + SERVICETAG_PRODUCTNAME OpenOffice.org 3.4 + SERVICETAG_PRODUCTVERSION 3.4 + SERVICETAG_PARENTNAME OpenOffice.org 3.4 SERVICETAG_SOURCE {buildsource}{minor}(Build:{buildid}) SERVICETAG_URN urn:uuid:0187debd-e458-11de-82d6-080020a9ed93 HIDELICENSEDIALOG 1 @@ -21,7 +21,7 @@ Globals UREPACKAGEPREFIX openoffice.org SOLSUREPACKAGEPREFIX openofficeorg USE_FILEVERSION 1 - LIBRARYVERSION 9.3.0 + LIBRARYVERSION 9.4.0 POOLPRODUCT 1 REGISTRATION_HOST https://registration2.services.openoffice.org/RegistrationWeb REGISTRATIONURL http://survey.services.openoffice.org/user/index.php @@ -36,7 +36,7 @@ Globals CREATE_MSP_INSTALLSET 0 UPDATE_DATABASE_LISTNAME finals_instsetoo.txt PACKAGEMAP package_names.txt,package_names_ext.txt - WINDOWSPATCHLEVEL 6 + WINDOWSPATCHLEVEL 8 OOOVENDOR Oracle OOODOWNLOADNAME 1 STARTCENTER_LAYOUT_STYLE 0 @@ -53,7 +53,7 @@ OpenOffice variables { PRODUCTNAME OpenOffice.org - PRODUCTVERSION 3.3 + PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -61,10 +61,10 @@ OpenOffice POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.3.0 - BASEPRODUCTVERSION 3.3 + ABOUTBOXPRODUCTVERSION 3.4.0 + BASEPRODUCTVERSION 3.4 PCPFILENAME openoffice.pcp - UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update + UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt @@ -73,7 +73,7 @@ OpenOffice FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.3.0 + PACKAGEVERSION 3.4.0 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -88,7 +88,7 @@ OpenOffice STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A} CHANGETARGETDIR 1 USE_FILEVERSION 1 - LIBRARYVERSION 9.3.0 + LIBRARYVERSION 9.4.0 PATCHCODEFILE ooo_patchcodes.txt DOWNLOADBANNER ooobanner.bmp DOWNLOADBITMAP ooobitmap.bmp @@ -118,7 +118,7 @@ OpenOffice_wJRE variables { PRODUCTNAME OpenOffice.org - PRODUCTVERSION 3.3 + PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -126,9 +126,9 @@ OpenOffice_wJRE POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.3.0 - BASEPRODUCTVERSION 3.3 - UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update + ABOUTBOXPRODUCTVERSION 3.4.0 + BASEPRODUCTVERSION 3.4 + UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt @@ -137,7 +137,7 @@ OpenOffice_wJRE FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.3.0 + PACKAGEVERSION 3.4.0 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -153,7 +153,7 @@ OpenOffice_wJRE STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A} CHANGETARGETDIR 1 USE_FILEVERSION 1 - LIBRARYVERSION 9.3.0 + LIBRARYVERSION 9.4.0 PATCHCODEFILE ooo_patchcodes.txt JAVAPRODUCT 1 DOWNLOADBANNER ooobanner.bmp @@ -183,7 +183,7 @@ OpenOffice_Dev variables { PRODUCTNAME OOo-dev - PRODUCTVERSION 3.3 + PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -193,22 +193,22 @@ OpenOffice_Dev POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.3.0 - BASEPRODUCTVERSION 3.3 + ABOUTBOXPRODUCTVERSION 3.4.0 + BASEPRODUCTVERSION 3.4 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX ooobasis-dev UREPACKAGEPREFIX ooodev SOLSUREPACKAGEPREFIX ooodev REGISTRYLAYERNAME LayerDev SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93 - UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update + UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt EVAL FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.3.0 + PACKAGEVERSION 3.4.0 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -224,7 +224,7 @@ OpenOffice_Dev CHANGETARGETDIR 1 USE_FILEVERSION 1 JAVAPRODUCT 1 - LIBRARYVERSION 9.3.0 + LIBRARYVERSION 9.4.0 PATCHCODEFILE ooodev_patchcodes.txt CODEFILENAME codes_ooodev.txt DOWNLOADBANNER ooobanner.bmp @@ -257,8 +257,8 @@ URE variables { PRODUCTNAME URE - PRODUCTVERSION 1.7 - PACKAGEVERSION 1.7 + PRODUCTVERSION 1.8 + PACKAGEVERSION 1.8 PACKAGEREVISION 1 PRODUCTEXTENSION LONG_PRODUCTEXTENSION @@ -299,14 +299,14 @@ OpenOffice_SDK variables { PRODUCTNAME OpenOffice.org - PRODUCTVERSION 3.3 + PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3 - PACKAGEVERSION 3.3.0 + PACKAGEVERSION 3.4.0 PACKAGEREVISION {milestone} PACK_INSTALLED 1 POOLPRODUCT 0 @@ -344,7 +344,7 @@ OpenOffice_Dev_SDK variables { PRODUCTNAME OOo-dev - PRODUCTVERSION 3.3 + PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -353,7 +353,7 @@ OpenOffice_Dev_SDK POSTVERSIONEXTENSION SDK POSTVERSIONEXTENSIONUNIX sdk BRANDPACKAGEVERSION 3 - PACKAGEVERSION 3.3.0 + PACKAGEVERSION 3.4.0 PACKAGEREVISION {milestone} BASISPACKAGEPREFIX ooobasis-dev UREPACKAGEPREFIX ooodev @@ -395,7 +395,7 @@ BrOffice variables { PRODUCTNAME BrOffice.org - PRODUCTVERSION 3.3 + PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -403,13 +403,13 @@ BrOffice POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.3.0 + ABOUTBOXPRODUCTVERSION 3.4.0 PROGRESSBARCOLOR PROGRESSSIZE PROGRESSPOSITION PROGRESSFRAMECOLOR NATIVEPROGRESS - UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update + UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,userland.txt REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt @@ -418,7 +418,7 @@ BrOffice FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.3.0 + PACKAGEVERSION 3.4.0 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -433,7 +433,7 @@ BrOffice STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A} CHANGETARGETDIR 1 USE_FILEVERSION 1 - LIBRARYVERSION 9.3.0 + LIBRARYVERSION 9.4.0 CODEFILENAME codes_broo.txt PATCHCODEFILE bro_patchcodes.txt DOWNLOADBANNER brobanner.bmp @@ -465,7 +465,7 @@ BrOffice_wJRE variables { PRODUCTNAME BrOffice.org - PRODUCTVERSION 3.3 + PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -473,13 +473,13 @@ BrOffice_wJRE POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.3.0 + ABOUTBOXPRODUCTVERSION 3.4.0 PROGRESSBARCOLOR PROGRESSSIZE PROGRESSPOSITION PROGRESSFRAMECOLOR NATIVEPROGRESS - UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update + UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt REMOVE_UPGRADE_CODE_FILE upgradecode_remove_ooo.txt @@ -488,7 +488,7 @@ BrOffice_wJRE FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.3.0 + PACKAGEVERSION 3.4.0 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -504,7 +504,7 @@ BrOffice_wJRE STUBUPGRADECODE {0E7B27B8-D658-4BF9-98D6-EC361582EB4A} CHANGETARGETDIR 1 USE_FILEVERSION 1 - LIBRARYVERSION 9.3.0 + LIBRARYVERSION 9.4.0 CODEFILENAME codes_broo.txt PATCHCODEFILE bro_patchcodes.txt JAVAPRODUCT 1 @@ -536,7 +536,7 @@ BrOffice_Dev variables { PRODUCTNAME BrOo-dev - PRODUCTVERSION 3.3 + PRODUCTVERSION 3.4 PRODUCTEXTENSION LONG_PRODUCTEXTENSION SHORT_PRODUCTEXTENSION @@ -546,21 +546,21 @@ BrOffice_Dev POSTVERSIONEXTENSIONUNIX BRANDPACKAGEVERSION 3 USERDIRPRODUCTVERSION 3 - ABOUTBOXPRODUCTVERSION 3.3.0 + ABOUTBOXPRODUCTVERSION 3.4.0 DEVELOPMENTPRODUCT 1 BASISPACKAGEPREFIX ooobasis-dev UREPACKAGEPREFIX ooodev SOLSUREPACKAGEPREFIX ooodev REGISTRYLAYERNAME LayerDevBroffice SERVICETAG_URN urn:uuid:1680b00d-e45c-11de-82d6-080020a9ed93 - UPDATEURL http://update36.services.openoffice.org/ProductUpdateService/check.Update + UPDATEURL http://update38.services.openoffice.org/ProductUpdateService/check.Update ODFNOTIFYURL http://odfnotify.services.openoffice.org/OOo3.0/notification.jsp?version=ODF ADD_INCLUDE_FILES cliureversion.mk,clioootypesversion.mk,javaversion2.dat,userland.txt EVAL FILEFORMATNAME OpenOffice.org FILEFORMATVERSION 1.0 WRITERCOMPATIBILITYVERSIONOOO11 OpenOffice.org 1.1 - PACKAGEVERSION 3.3.0 + PACKAGEVERSION 3.4.0 PACKAGEREVISION {milestone} LICENSENAME LGPL SERVICESPROJEKT 1 @@ -576,7 +576,7 @@ BrOffice_Dev CHANGETARGETDIR 1 USE_FILEVERSION 1 JAVAPRODUCT 1 - LIBRARYVERSION 9.3.0 + LIBRARYVERSION 9.4.0 PATCHCODEFILE brodev_patchcodes.txt CODEFILENAME codes_broodev.txt DOWNLOADBANNER brobanner.bmp |