merge soc07 r5308:5317 - finish umit win build integration

mswin32/Makefile

@@ -31,7 +31,7 @@ winbuild:
 	cd nmap-$(NMAP_VERSION) && mkdir umit
 	cd ../umit && utils/copy_win_deps.bat
 	cp -R ../umit/dist/* ../umit/COPYING* ../umit/README nmap-$(NMAP_VERSION)/umit
-	cp nsis/AddToPath.nsh nsis/Nmap.nsi nmap-$(NMAP_VERSION)
+	cp nsis/AddToPath.nsh nsis/Nmap.nsi nsis/shortcuts.ini nmap-$(NMAP_VERSION)
 	$(MAKENSIS) nmap-$(NMAP_VERSION)/Nmap.nsi
 	mv nmap-$(NMAP_VERSION)/NmapInstaller.exe nmap-$(NMAP_VERSION)-setup.exe
 

mswin32/nmap.rc

@@ -12,7 +12,7 @@
 //
 
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION 4,21,0,5
+FILEVERSION 4,22,0,2
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x21L
@@ -29,7 +29,7 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Insecure.Org\0"
             VALUE "FileDescription", "Nmap\0"
-            VALUE "FileVersion", "4.21ALPHA5\0"
+            VALUE "FileVersion", "4.22SOC2\0"
             VALUE "InternalName", "Nmap\0"
             VALUE "LegalCopyright", "Copyright (c) Insecure.Com LLC (fyodor@insecure.org)\0"
             VALUE "LegalTrademarks", "NMAP\0"

mswin32/nsis/Nmap.nsi

@@ -20,8 +20,8 @@
   ;Get installation folder from registry if available 
   InstallDirRegKey HKCU "Software\Nmap" "" 
  
-  !define VERSION "4.21ALPHA5"  
-  VIProductVersion "4.21.0.5"
+  !define VERSION "4.22SOC2"  
+  VIProductVersion "4.22.0.2"
   VIAddVersionKey /LANG=1033 "FileVersion" "${VERSION}"
   VIAddVersionKey /LANG=1033 "ProductName" "Nmap" 
   VIAddVersionKey /LANG=1033 "CompanyName" "Insecure.org" 
@@ -46,12 +46,62 @@
    
   !insertmacro MUI_UNPAGE_CONFIRM 
   !insertmacro MUI_UNPAGE_INSTFILES 
+  Page custom shortcutsPage makeShortcuts
    
 ;-------------------------------- 
 ;Languages 
   
   !insertmacro MUI_LANGUAGE "English" 
- 
+
+;--------------------------------
+;Variables
+
+Var umitset
+
+;--------------------------------
+;Reserves
+
+ReserveFile "shortcuts.ini"
+!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS
+
+;--------------------------------
+;Functions
+
+Function .onInit
+  !insertmacro MUI_INSTALLOPTIONS_EXTRACT "shortcuts.ini"
+FunctionEnd
+
+
+Function shortcutsPage
+  StrCmp $umitset "" skip
+
+  !insertmacro MUI_HEADER_TEXT "Create Shortcuts" ""
+  !insertmacro MUI_INSTALLOPTIONS_DISPLAY "shortcuts.ini"  
+
+  skip:
+FunctionEnd
+
+Function makeShortcuts
+  StrCmp $umitset "" skip
+
+  SetOutPath "$INSTDIR\umit"
+
+  ReadINIStr $0 "$PLUGINSDIR\shortcuts.ini" "Field 1" "State"
+  StrCmp $0 "0" skipdesktop
+  CreateShortCut "$DESKTOP\Nmap - UMIT GUI.lnk" "$INSTDIR\umit\umit.exe"
+
+  skipdesktop:
+
+  ReadINIStr $0 "$PLUGINSDIR\shortcuts.ini" "Field 2" "State"
+  StrCmp $0 "0" skipstartmenu
+  CreateDirectory "$SMPROGRAMS\Nmap"
+  CreateShortCut "$SMPROGRAMS\Nmap\Nmap - UMIT GUI.lnk" "$INSTDIR\umit\umit.exe"
+
+  skipstartmenu:
+
+  skip:
+FunctionEnd
+
 ;-------------------------------- 
 ;Installer Sections 
  
@@ -110,10 +160,9 @@ SectionEnd
 
 Section "UMIT (GUI frontend)" SecUmit
   File /r ..\nmap-${VERSION}\umit
-  CreateShortCut "$DESKTOP\Nmap - UMIT GUI.lnk" "$INSTDIR\umit\umit.exe"
-  CreateDirectory "$SMPROGRAMS\Nmap"
-  CreateShortcut "$SMPROGRAMS\Nmap\Nmap - UMIT GUI.lnk" "$INSTDIR\umit\umit.exe"
+  StrCpy $umitset "true"
 SectionEnd
+
  
 ;-------------------------------- 
 ;Descriptions 

mswin32/nsis/shortcuts.ini

@@ -0,0 +1,20 @@
+[Settings]
+NumFields=2
+
+[Field 1]
+Type=CheckBox
+Left=10
+Right=-1
+Top=20
+Bottom=28
+Text=Desktop Icon
+State=1
+
+[Field 2]
+Type=CheckBox
+Left=10
+Right=-1
+Top=10
+Bottom=18
+Text=Start Menu Folder
+State=1