From e50380f9d794e9b02a5462d220a961d4788a62ff Mon Sep 17 00:00:00 2001
From: fyodor <fyodor@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Sat, 11 Aug 2007 06:04:30 +0000
Subject: [PATCH] merge soc07 r5283 - prelim umit windows build integration

---
 mswin32/Makefile      |  3 +++
 mswin32/nsis/Nmap.nsi | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/mswin32/Makefile b/mswin32/Makefile
index 7360d9105..068a0e730 100644
--- a/mswin32/Makefile
+++ b/mswin32/Makefile
@@ -28,6 +28,9 @@ winbuild:
 	cd Release && cp -f $(NSE_LIB_FILES) ../nmap-$(NMAP_VERSION)/nselib/
 	zip -r nmap-$(NMAP_VERSION)-win32.zip nmap-$(NMAP_VERSION)
 	cp winpcap/winpcap-nmap-*.exe nmap-$(NMAP_VERSION)
+	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)
 	$(MAKENSIS) nmap-$(NMAP_VERSION)/Nmap.nsi
 	mv nmap-$(NMAP_VERSION)/NmapInstaller.exe nmap-$(NMAP_VERSION)-setup.exe
diff --git a/mswin32/nsis/Nmap.nsi b/mswin32/nsis/Nmap.nsi
index 58721a28e..91e928ac2 100644
--- a/mswin32/nsis/Nmap.nsi
+++ b/mswin32/nsis/Nmap.nsi
@@ -107,6 +107,13 @@ Section "Network Performance Improvements (Registry Changes)" SecPerfRegistryMod
   File ..\nmap_performance.reg 
   Exec 'regedt32 /S "$INSTDIR\nmap_performance.reg"' 
 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"
+SectionEnd
  
 ;-------------------------------- 
 ;Descriptions 
@@ -166,6 +173,10 @@ Section "Uninstall"
   DetailPrint "Unregistering Nmap Path..." 
   Push $INSTDIR 
   Call un.RemoveFromPath 
+
+  Delete "$DESKTOP\Nmap - UMIT GUI.lnk"
+  Delete "$SMPROGRAMS\Nmap\Nmap - UMIT GUI.lnk"
+  RMDIR "$SMPROGRAMS\Nmap"
  
   SetDetailsPrint both 
 SectionEnd