From a351295596cdf00e76321a2a4709d4bdbaa6ffe4 Mon Sep 17 00:00:00 2001 From: Andras Timar Date: Tue, 6 Dec 2011 19:28:21 +0100 Subject: remove NSIS support --- .../inc_openoffice/windows/msi_languages/Nsis.ulf | 41 ---------------------- .../windows/msi_languages/makefile.mk | 4 +-- instsetoo_native/util/openoffice.lst | 30 ---------------- 3 files changed, 1 insertion(+), 74 deletions(-) delete mode 100644 instsetoo_native/inc_openoffice/windows/msi_languages/Nsis.ulf (limited to 'instsetoo_native') diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/Nsis.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/Nsis.ulf deleted file mode 100644 index ee210a4ff478..000000000000 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/Nsis.ulf +++ /dev/null @@ -1,41 +0,0 @@ -[SetupCaption] -en-US = "%PRODUCTNAME %PRODUCTVERSION Installation Preparation" - -[MUI_TEXT_WELCOME_INFO_TITLE] -en-US = "Thank you for downloading %PRODUCTNAME %PRODUCTVERSION." - -[MUI_TEXT_WELCOME_INFO_TEXT] -en-US = "The installation files must be unpacked and copied to your hard disk in preparation for the installation. After that, the %PRODUCTNAME installation will start automatically.\n\nClick \'Next\' to continue." - -[MUI_TEXT_DIRECTORY_TITLE] -en-US = "Select Folder" - -[MUI_TEXT_DIRECTORY_SUBTITLE] -en-US = "Select the folder in which to save the unpacked files." - -[InstallBtn] -en-US = "&Unpack" - -[DirText] -en-US = "The %PRODUCTNAME %PRODUCTVERSION installation files will be unpacked and saved in the folder shown below. If you would like to save %PRODUCTNAME to a different folder, click \'Browse\' to select another folder." - -[DirSubText] -en-US = "Destination Folder" - -[SpaceRequired] -en-US = "Space required: " - -[SpaceAvailable] -en-US = "Space available: " - -[MUI_TEXT_INSTALLING_TITLE] -en-US = "Unpacking" - -[MUI_TEXT_INSTALLING_SUBTITLE] -en-US = "Please wait while the installation files are being unpacked." - -[Extract] -en-US = "Extract: " - -[MUI_TEXT_ABORTWARNING] -en-US = "Are you sure you want to quit the %PRODUCTNAME %PRODUCTVERSION Installation Preparation" diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk index 0a854df4f633..b01996728ae7 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/makefile.mk @@ -45,12 +45,10 @@ ULFFILES = \ LaunchCo.ulf \ Property.ulf \ RadioBut.ulf \ - Nsis.ulf \ SIS.ulf \ UIText.ulf MLFFILES = $(foreach,i,$(ULFFILES) $(MISC)$/$(TARGET)$/$(i:b).mlf) -UULFFILES = $(MISC)$/$(TARGET)$/Nsis.uulf # --- Targets ------------------------------------------------------ @@ -58,6 +56,6 @@ UULFFILES = $(MISC)$/$(TARGET)$/Nsis.uulf .IF "$(GUI)"=="WNT" -ALLTAR : $(MLFFILES) $(UULFFILES) +ALLTAR : $(MLFFILES) .ENDIF diff --git a/instsetoo_native/util/openoffice.lst b/instsetoo_native/util/openoffice.lst index 2c73f1cdb190..0cfafc561272 100644 --- a/instsetoo_native/util/openoffice.lst +++ b/instsetoo_native/util/openoffice.lst @@ -84,9 +84,6 @@ LibreOffice USE_FILEVERSION 1 LIBRARYVERSION 9.4.0 PATCHCODEFILE ooo_patchcodes.txt - DOWNLOADBANNER ooobanner.bmp - DOWNLOADBITMAP ooobitmap.bmp - DOWNLOADSETUPICO ooosetup.ico RELATIVE_PATHES_IN_DDF 1 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ STARTCENTER_INFO_URL http://www.libreoffice.org/ @@ -146,9 +143,6 @@ LibreOffice_wJRE LIBRARYVERSION 9.4.0 PATCHCODEFILE ooo_patchcodes.txt JAVAPRODUCT 1 - DOWNLOADBANNER ooobanner.bmp - DOWNLOADBITMAP ooobitmap.bmp - DOWNLOADSETUPICO ooosetup.ico RELATIVE_PATHES_IN_DDF 1 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ STARTCENTER_INFO_URL http://www.libreoffice.org/ @@ -211,9 +205,6 @@ LibreOffice_Dev LIBRARYVERSION 9.4.0 PATCHCODEFILE ooodev_patchcodes.txt CODEFILENAME codes_ooodev.txt - DOWNLOADBANNER ooobanner.bmp - DOWNLOADBITMAP ooobitmap.bmp - DOWNLOADSETUPICO ooosetup.ico LOCALUSERDIR $ORIGIN/.. RELATIVE_PATHES_IN_DDF 1 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ @@ -253,9 +244,6 @@ URE PCPFILENAME ure.pcp POOLPRODUCT 0 GLOBALFILEGID gid_File_Dl_Cppu - DOWNLOADBANNER urebanner.bmp - DOWNLOADBITMAP urebitmap.bmp - DOWNLOADSETUPICO ooosetup.ico DONTUSESTARTMENUFOLDER 1 RELATIVE_PATHES_IN_DDF 1 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ @@ -301,9 +289,6 @@ LibreOffice_SDK NOSPACEINDIRECTORYNAME 1 NOSHORTDIRECTORYNAMES 1 CHANGETARGETDIR 1 - DOWNLOADBANNER ooosdkbanner.bmp - DOWNLOADBITMAP ooosdkbitmap.bmp - DOWNLOADSETUPICO ooosetup.ico DONTUSESTARTMENUFOLDER 1 RELATIVE_PATHES_IN_DDF 1 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ @@ -353,9 +338,6 @@ LibreOffice_Dev_SDK NOSPACEINDIRECTORYNAME 1 NOSHORTDIRECTORYNAMES 1 CHANGETARGETDIR 1 - DOWNLOADBANNER ooosdkbanner.bmp - DOWNLOADBITMAP ooosdkbitmap.bmp - DOWNLOADSETUPICO ooosetup.ico DONTUSESTARTMENUFOLDER 1 RELATIVE_PATHES_IN_DDF 1 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ @@ -399,9 +381,6 @@ LibreOffice_Test NOSPACEINDIRECTORYNAME 1 NOSHORTDIRECTORYNAMES 1 CHANGETARGETDIR 1 - DOWNLOADBANNER ooobanner.bmp - DOWNLOADBITMAP ooobitmap.bmp - DOWNLOADSETUPICO ooosetup.ico DONTUSESTARTMENUFOLDER 1 RELATIVE_PATHES_IN_DDF 1 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ @@ -451,9 +430,6 @@ LibreOffice_Dev_Test NOSPACEINDIRECTORYNAME 1 NOSHORTDIRECTORYNAMES 1 CHANGETARGETDIR 1 - DOWNLOADBANNER ooobanner.bmp - DOWNLOADBITMAP ooobitmap.bmp - DOWNLOADSETUPICO ooosetup.ico DONTUSESTARTMENUFOLDER 1 RELATIVE_PATHES_IN_DDF 1 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ @@ -511,13 +487,10 @@ OxygenOffice USE_FILEVERSION 1 LIBRARYVERSION 9.4.0 PATCHCODEFILE ooo_patchcodes.txt - DOWNLOADBANNER ooobanner_ooop.bmp - DOWNLOADBITMAP ooobitmap_ooop.bmp PROGRESSBARCOLOR 126,170,23 PROGRESSSIZE 430,5 PROGRESSPOSITION 5,230 PROGRESSFRAMECOLOR 207,208,211 - DOWNLOADSETUPICO ooosetup.ico RELATIVE_PATHES_IN_DDF 1 STARTCENTER_ADDFEATURE_URL http://extensions.libreoffice.org/ STARTCENTER_INFO_URL http://www.libreoffice.org/ @@ -578,9 +551,6 @@ OxygenOffice_wJRE LIBRARYVERSION 9.4.0 PATCHCODEFILE ooo_patchcodes.txt JAVAPRODUCT 1 - DOWNLOADBANNER ooobanner_ooop.bmp - DOWNLOADBITMAP ooobitmap_ooop.bmp - DOWNLOADSETUPICO ooosetup.ico PROGRESSBARCOLOR 126,170,23 PROGRESSSIZE 430,5 PROGRESSPOSITION 5,230 -- cgit v1.2.3