Remove nmap-$(NMAP_VERSION)-win32.zip before rebuilding. If this isn't done,

then old files that were in a previous build can be in the zip file of a new
build that doesn't have those files anymore. When the zip command sees an
existing archive, it modifies the archive rather than rebuilding it from
scratch.
This commit is contained in:
david 2009-02-16 19:04:41 +00:00
parent de3b94ac54
commit 827bf68360

View file

@ -20,6 +20,7 @@ winbuild:
$(VCEXPRESS) nmap.sln /build release /log $(LOGLOC)
$(MAKENSIS) winpcap/winpcap-nmap.nsi
rm -rf nmap-$(NMAP_VERSION)
rm -f nmap-$(NMAP_VERSION)-win32.zip
mkdir nmap-$(NMAP_VERSION)
cd Release && cp -r ../../CHANGELOG ../../COPYING nmap-mac-prefixes nmap-os-db nmap-protocols nmap-rpc nmap-service-probes nmap-services nmap.exe nmap.xsl ../nmap_performance.reg ../../README-WIN32 ../nmap-$(NMAP_VERSION)/
cp -f OpenSSL/bin/*.dll ./nmap-$(NMAP_VERSION)/
@ -33,7 +34,7 @@ winbuild:
# Install the ndiff batch file wrapper in the zip distribution.
cp ../ndiff/ndiff nmap-$(NMAP_VERSION)/ndiff.py
cp python-wrap.bat nmap-$(NMAP_VERSION)/ndiff.bat
zip -r nmap-$(NMAP_VERSION)-win32.zip nmap-$(NMAP_VERSION)
zip nmap-$(NMAP_VERSION)-win32.zip nmap-$(NMAP_VERSION)
# Remove ndiff.py and ndiff.bat for the installer because it has ndiff.exe.
rm -f nmap-$(NMAP_VERSION)/ndiff.py nmap-$(NMAP_VERSION)/ndiff.bat
cd ../zenmap && install_scripts/windows/copy_and_compile.bat