remove NSIS support

configure.in

@@ -1516,17 +1516,6 @@ AC_ARG_WITH(csc-path,
     ],
 ,)
 
-AC_ARG_WITH(nsis-path,
-    AS_HELP_STRING([--with-nsis-path],
-        [For Windows builds, please supply the directory where makensis
-         is located. If makensis is found in PATH or this option is
-         properly supplied a self-contained executable installer for
-         LibreOffice will be created.])
-    [
-                          Usage:     --with-nsis-path=<path to directory containing makensis>
-    ],
-,)
-
 AC_ARG_WITH(dotnet-framework-home,
     AS_HELP_STRING([--with-dotnet-framework-home],
         [For Microsoft compiler users, please supply the path pointing to
@@ -6797,48 +6786,6 @@ fi
 AC_SUBST(DIRECTXSDK_HOME)
 AC_SUBST(DIRECTXSDK_LIB)
 
-dnl ============================================
-dnl Check for Nullsoft Scriptable Install System
-dnl ============================================
-NSIS_PATH=""
-if test "$_os" = "WINNT" ; then
-    if test -z "$with_nsis_path"; then
-        AC_PATH_PROG(NSIS_PATH, makensis)
-        if test -n "$NSIS_PATH"; then
-            NSIS_PATH=`dirname "$NSIS_PATH"`
-        elif test "$build_os" = "cygwin"; then
-            AC_MSG_CHECKING([for NSIS])
-            nsistest=`./oowintool --nsis-dir`;
-            nsistest=`cygpath -d -m "$nsistest"`
-            nsistest=`cygpath -u "$nsistest"`
-            if test -x "$nsistest/nsis.exe"; then
-                NSIS_PATH="$nsistest"
-                AC_MSG_RESULT([found ($NSIS_PATH)])
-            else
-                AC_MSG_RESULT([no, no self-contained installer will be built.])
-            fi
-        fi
-    else
-        AC_MSG_CHECKING([for NSIS])
-        if test "$build_os" = "cygwin"; then
-            with_nsis_path=`cygpath -u "$with_nsis_path"`
-        fi
-        if test -e "$with_nsis_path/makensis$EXEEXT_FOR_BUILD"; then
-            NSIS_PATH="$with_nsis_path"
-        fi
-        if test -z "$NSIS_PATH"; then
-            AC_MSG_RESULT([no, no self-contained installer will be built.])
-        else
-            if test "$build_os" = "cygwin"; then
-                NSIS_PATH=`cygpath -d "$NSIS_PATH"`
-                NSIS_PATH=`cygpath -u "$NSIS_PATH"`
-            fi
-            AC_MSG_RESULT([found ($NSIS_PATH)])
-        fi
-    fi
-fi
-AC_SUBST(NSIS_PATH)
-
 dnl ***************************************
 dnl Checking for bison and flex
 dnl ***************************************

instsetoo_native/inc_openoffice/windows/msi_languages/Nsis.ulf

-[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"

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

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

oowintool

@@ -54,7 +54,6 @@ sub print_syntax()
     print "   --csc-compilerdir       - print .NET SDK compiler path\n";
     print "   --windows-sdk-home      - print Windows SDK install dir\n";
     print "   --jdk-home              - print the jdk install dir\n";
-    print "   --nsis-dir              - print NSIS path\n";
     print "   --help                  - print this message\n";
 }
 
@@ -235,12 +234,6 @@ sub print_jdk_dir()
     print cygpath($dir, 'w', $output_format); 
 }
 
-sub print_nsis_dir()
-{
-    my $dir = reg_get_value ("HKEY_LOCAL_MACHINE/SOFTWARE/NSIS/@");
-    print cygpath ($dir, 'w', $output_format) if defined $dir;
-}
-
 sub copy_dll($$$)
 {
     my ($src, $fname, $dest) = @_;
@@ -354,8 +347,6 @@ while (@commands) {
 	print_windows_sdk_home();
     } elsif ($opt eq '--jdk-home') {
 	print_jdk_dir();
-    } elsif ($opt eq '--nsis-dir') {
-	print_nsis_dir();
     } elsif ($opt eq '--help' || $opt eq '/?') {
 	print_syntax();
     } else {

set_soenv.in

@@ -65,7 +65,7 @@ my ( $COM, $ARCH, $CPU, $CPUNAME, $GUI, $GUIBASE,
 my ( $USR, $ETC, $BIN, $LIB, $LIB64, $INC, $INCLUDE, $DEV, $OPT, $LOCAL, $SOLENV, $SOLVER, $CONFIG, $DEFIMGS,
      $USR_BIN, $USR_LIB, $USR_LOCAL, $USR_CCS, $JAVA_BIN, $JAVA_LIB, $JAVA_INCLUDE,
      $SOLARENVINC, $USR_DT, $USR_OPENWIN, $XLIB, $XINC,
-     $CYGWIN_PATH, $language, @languages, $ASM_PATH, $NSIS_PATH, $PERL_PATH, $CL_X64 );
+     $CYGWIN_PATH, $language, @languages, $ASM_PATH, $PERL_PATH, $CL_X64 );
 
 # Environment variables.
 my ( $oldPATH, $SRC_ROOT, $SO_HOME, $JAVA_HOME, $JDK, $JAVAFLAGS, $OOO_SHELL,
@@ -1140,12 +1140,6 @@ elsif ($platform =~ m/cygwin/)
    if ( "$PATH:$oldPATH" !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
       $PATH          .= $ps.$tmppath;
    }
-   # makensis directory
-   $NSIS_PATH = PathFormat('@NSIS_PATH@');
-   $tmppath = CygFormat($NSIS_PATH);
-   if ( "$PATH:$oldPATH" !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
-       $PATH          .= $ps.$tmppath;
-   }
    # path to sn.exe (signing) for Windows users.
    my $sn_path = PathFormat('@DOTNET_FRAMEWORK_HOME@/bin');
    $tmppath = CygFormat($sn_path);
@@ -1191,12 +1185,6 @@ elsif ($platform =~ m/mingw32/)
                         $ps.CygFormat($SOLARENV).$ds."bin".
                         $ps.CygFormat($SOLARENV).$ds.$OUTPATH.$BIN;
 
-   # makensis directory
-   $NSIS_PATH = PathFormat('@NSIS_PATH@');
-   $tmppath = CygFormat($NSIS_PATH);
-   if ( $PATH !~ /(?:[:]|\A)(?:$tmppath)(?:[:]|\Z)/ ) {
-       $PATH          .= $ps.$tmppath;
-   }
    $PATH              .= $ps.$oldPATH;
 }
 elsif ($platform =~ m/darwin/)
@@ -1620,7 +1608,6 @@ if ( $platform =~ m/cygwin/ )
    ToFile( "ATL_INCLUDE",       $ATL_INCLUDE,       "e" );
    ToFile( "MFC_LIB",           $MFC_LIB,         "e" );
    ToFile( "MFC_INCLUDE",       $MFC_INCLUDE,       "e" );
-   ToFile( "NSIS_PATH",         $NSIS_PATH,         "e" );
    ToFile( "DISABLE_ACTIVEX",   "@DISABLE_ACTIVEX@","e" );
    ToFile( "DISABLE_ATL",   "@DISABLE_ATL@","e" );
    ToFile( "INCLUDE",           "",                 "e" );
@@ -1647,8 +1634,7 @@ if ( $platform =~ m/cygwin/ )
    }
 }
 elsif ( $platform =~ m/mingw32/ )
-{  ToFile( "NSIS_PATH",         $NSIS_PATH,         "e" );
-   ToFile( "DISABLE_ACTIVEX",   "@DISABLE_ACTIVEX@","e" );
+{  ToFile( "DISABLE_ACTIVEX",   "@DISABLE_ACTIVEX@","e" );
    ToFile( "DISABLE_ATL",       "@DISABLE_ATL@",    "e" );
    ToFile( "MINGW_CLIB_DIR",    "@MINGW_CLIB_DIR@", "e" );
    ToFile( "MINGW_SHARED_GCCLIB", "@MINGW_SHARED_GCCLIB@", "e" );

setup_native/prj/d.lst

@@ -23,9 +23,6 @@ mkdir: %_DEST%\bin\osolsmf
 ..\source\win32\patchlist.txt %_DEST%\bin\patchlist.txt
 ..\source\win32\desktophelper.txt %_DEST%\bin\desktophelper.txt
 ..\source\win32\get_retval.bat %_DEST%\bin\get_retval.bat
-..\source\win32\nsis\downloadtemplate.nsi %_DEST%\bin\downloadtemplate.nsi
-..\source\win32\nsis\*.ico %_DEST%\bin\*.ico
-..\source\win32\nsis\*.bmp %_DEST%\bin\*.bmp
 ..\source\linux\*.dat %_DEST%\bin\*.dat
 ..\source\mac\*.icns %_DEST%\bin\*.icns
 ..\source\mac\Info.plist.langpack %_DEST%\bin\Info.plist.langpack

solenv/bin/modules/installer/followme.pm

@@ -94,7 +94,6 @@ sub save_followme_info
     push(@filecontent, "globals:product: $installer::globals::product\n");
     push(@filecontent, "globals:minor: $installer::globals::minor\n");
     push(@filecontent, "globals:lastminor: $installer::globals::lastminor\n");
-    push(@filecontent, "globals:nsisfilename: $installer::globals::nsisfilename\n");
 
     # Saving file
     installer::files::save_file($downloadinfodir . $installer::globals::separator . $downloadinfofilename, \@filecontent);
@@ -197,7 +196,6 @@ sub read_followme_info
             if ( $name eq "product" ) { $installer::globals::product = $value; }
             if ( $name eq "minor" ) { $installer::globals::minor = $value; }
             if ( $name eq "lastminor" ) { $installer::globals::lastminor = $value; }
-            if ( $name eq "nsisfilename" ) { $installer::globals::nsisfilename = $value; }
         }
     }
 

solenv/bin/modules/installer/globals.pm

@@ -455,11 +455,7 @@ BEGIN
     @helppackfeature =();
     @featurecollector =();
     $msiassemblyfiles = "";
-    $nsisfilename = "Nsis";
     $macinstallfilename = "macinstall.ulf";
-    $nsis204 = 0;
-    $nsis231 = 0;
-    $unicodensis = 0;
     $linuxlinkrpms = "";
     $extensioninstalldir = "gid_Dir_Share_Extension_Install";
     @languagenames = ();