mirror of
https://github.com/nmap/nmap.git
synced 2026-05-13 08:46:45 +00:00
Windows Makefile changes for latest zenmap updates
This commit is contained in:
parent
dfd5eab41a
commit
9beb17dbc5
1 changed files with 4 additions and 3 deletions
|
|
@ -1,5 +1,5 @@
|
|||
export MSYS2_ARG_CONV_EXCL=*
|
||||
MAKENSIS=C:/Program Files (x86)/NSIS3-strlen/makensis.exe
|
||||
MAKENSIS=C:/Program Files (x86)/NSIS/makensis.exe
|
||||
SIGNTOOL := $(shell reg query "HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\Microsoft\\Microsoft SDKs\\Windows\\v10.0" /v "InstallationFolder" | egrep InstallationFolder | cut -d ' ' -f13- | sed 's%\\%/%g' | tr -d '\r\n' | sed 's%$$%bin/x86/signtool.exe%')
|
||||
NMAPDIR=..
|
||||
NMAPDIR_WIN=$(shell echo '$(NMAPDIR)' | sed 's|/cygdrive/\(.\)|\1:|;s|/|\\|g')
|
||||
|
|
@ -57,7 +57,8 @@ stage-common: $(NMAPDIR)/CHANGELOG $(NMAPDIR)/LICENSE $(NMAPDIR)/nmap-mac-prefix
|
|||
# Install the ndiff batch file wrapper in the zip distribution.
|
||||
cp $(NMAPDIR)/ndiff/ndiff.py nmap-$(NMAP_VERSION)/ndiff.py
|
||||
cp python-wrap.bat nmap-$(NMAP_VERSION)/ndiff.bat
|
||||
cd $(ZENMAP_WINDIR) && sh build.sh
|
||||
make -C $(ZENMAP_WINDIR)
|
||||
rm -rf nmap-$(NMAP_VERSION)/zenmap-w64
|
||||
cp -R $(ZENMAP_WINDIR)/dist/zenmap-w64 nmap-$(NMAP_VERSION)/
|
||||
cp $(NMAPDIR)/zenmap/README nmap-$(NMAP_VERSION)/ZENMAP_README
|
||||
cp $(NMAPDIR)/zenmap/COPYING_HIGWIDGETS nmap-$(NMAP_VERSION)
|
||||
|
|
@ -123,5 +124,5 @@ LICENSE.formatted: $(NMAPDIR)/LICENSE
|
|||
./license-format/licformat.sh "$<" > "$@"
|
||||
|
||||
clean:
|
||||
./Build.bat Clean "$(VCCONFIG)${OEM_SUFFIX}"
|
||||
cmd /c Build.bat Clean "$(VCCONFIG)${OEM_SUFFIX}"
|
||||
rm -rf make-vars.make nmap-$(NMAP_VERSION) nmap-$(NMAP_VERSION)-oem Debug Release Release-oem msbuild.log LICENSE.formatted
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue