Copy zlib DLL during staging. Avoid building nmap-update

mswin32/Makefile

@@ -18,7 +18,7 @@ bundle-nmap: bundle-zip bundle-nsis
 
 build-nmap: nmap.sln nmap.rc
  "$(VCEXPRESS)" nmap.sln /build release /out $(LOGLOC)
- "$(VCEXPRESS)" nmap.sln /build release /project nmap-update /out $(LOGLOC)
+ #"$(VCEXPRESS)" nmap.sln /build release /project nmap-update /out $(LOGLOC)
 
 stage-nmap: build-nmap LICENSE
  rm -rf nmap-$(NMAP_VERSION)
@@ -28,7 +28,7 @@ stage-nmap: build-nmap LICENSE
 # "cp" means that the copied DLLs don't have the same ACL and cause an
 # error on startup: 0xc0000022.
  cmd /c copy $(subst /,\\,$(NMAP_MSWIN32_AUX))\\OpenSSL\\bin\\*.dll nmap-$(NMAP_VERSION)
- cmd /c copy Release\\libssh2.dll nmap-$(NMAP_VERSION)
+ cmd /c copy Release\\libssh2.dll Release\\zlibwapi.dll nmap-$(NMAP_VERSION)
  mkdir nmap-$(NMAP_VERSION)/scripts
  cd Release && cp -f $(NSE_FILES) ../nmap-$(NMAP_VERSION)/scripts/
  cd Release && for f in `find nselib -name .svn -prune -o -type d -print`; do \
@@ -45,7 +45,7 @@ stage-nmap: build-nmap LICENSE
  cp ../ncat/Release/ncat.exe nmap-$(NMAP_VERSION)
  cp ../ncat/Release/ca-bundle.crt nmap-$(NMAP_VERSION)
  cp ../nping/Release/nping.exe nmap-$(NMAP_VERSION)
- cp ../nmap-update/Release/nmap-update.exe nmap-$(NMAP_VERSION)
+ #cp ../nmap-update/Release/nmap-update.exe nmap-$(NMAP_VERSION)
 # Install the ndiff batch file wrapper in the zip distribution.
  cp ../ndiff/ndiff.py nmap-$(NMAP_VERSION)/ndiff.py
  cp python-wrap.bat nmap-$(NMAP_VERSION)/ndiff.bat
@@ -55,7 +55,7 @@ stage-nmap: build-nmap LICENSE
  cp ../zenmap/COPYING_HIGWIDGETS nmap-$(NMAP_VERSION)
  cp ../ndiff/README nmap-$(NMAP_VERSION)/NDIFF_README
 
-sign-files: nmap-$(NMAP_VERSION)/nmap.exe nmap-$(NMAP_VERSION)/ncat.exe nmap-$(NMAP_VERSION)/nping.exe nmap-$(NMAP_VERSION)/nmap-update.exe nmap-$(NMAP_VERSION)/ndiff.exe nmap-$(NMAP_VERSION)/zenmap.exe nmap-$(NMAP_VERSION)/libssh2.dll nmap-$(NMAP_VERSION)/libeay32.dll nmap-$(NMAP_VERSION)/ssleay32.dll
+sign-files: nmap-$(NMAP_VERSION)/nmap.exe nmap-$(NMAP_VERSION)/ncat.exe nmap-$(NMAP_VERSION)/nping.exe nmap-$(NMAP_VERSION)/ndiff.exe nmap-$(NMAP_VERSION)/zenmap.exe nmap-$(NMAP_VERSION)/libssh2.dll nmap-$(NMAP_VERSION)/libeay32.dll nmap-$(NMAP_VERSION)/ssleay32.dll nmap-$(NMAP_VERSION)/zlibwapi.dll
  # TODO: evaluate whether we should also sign the Python stuff for Zenmap, Ndiff
  "$(SIGNTOOL)" $(SIGNTOOL_ARGS) $^
 

mswin32/nmap.vcxproj

@@ -134,6 +134,7 @@ xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(Proje
  </Link>
  <PostBuildEvent>
  <Command>xcopy "$(SolutionDir)..\scripts" ".\$(Configuration)\scripts\" /e /y &amp;&amp; xcopy "$(SolutionDir)..\nselib\*.lua" "$(SolutionDir)\$(Configuration)\nselib\" /y &amp;&amp; xcopy /s /e "$(SolutionDir)..\nselib\data\*.*" "$(SolutionDir)\$(Configuration)\nselib\data\" /y &amp;&amp; xcopy "$(SolutionDir)\..\..\nmap-mswin32-aux\OpenSSL\bin\*.dll" "$(SolutionDir)\$(Configuration)\" /y &amp;&amp; xcopy "$(SolutionDir)..\nse_main.lua" "$(SolutionDir)\$(Configuration)\" /y
+xcopy /y /d "$(ProjectDir)..\libz\contrib\vstudio\vc12\x86\ZlibDll$(Configuration)\*.dll" "$(ProjectDir)$(OutDir)"
 xcopy /y /d "$(ProjectDir)..\libssh2\win32\$(Configuration)_dll\*.dll" "$(ProjectDir)$(OutDir)"</Command>
  </PostBuildEvent>
  </ItemDefinitionGroup>