Commit Graph

91 Commits

Author SHA1 Message Date
dmiller 24229f2e65 Avoid re-downloading or clobbering build dependencies on Windows 2026-09-22 19:28:38 +00:00
dmiller 1bb2586a85 Separate signing and bundling for Windows 2026-08-05 19:59:53 +00:00
dmiller c66baf785e Merge Nmap 7.96 release branch 2025-05-07 13:22:40 +00:00
dmiller c4eb6d7b7f Use correct NMAP_NAME for OEM installer. See #2982 2024-12-03 18:58:39 +00:00
dmiller 95b974b101 Merge 7.95 release branch into trunk 2024-04-23 19:34:03 +00:00
dmiller 3fa1e58a6b Avoid building Win32 zipfile for non-OEM 2024-01-29 17:09:25 +00:00
dmiller 72d67cf401 Merge 7.94 release branch 2023-05-20 22:59:41 +00:00
dmiller f61773ac9f Update Windows zenmap build 2023-02-27 18:15:20 +00:00
dmiller 9beb17dbc5 Windows Makefile changes for latest zenmap updates 2023-02-10 22:55:05 +00:00
dmiller 2465e56e7d Fixes for zenmap Windows staging 2023-02-01 21:26:34 +00:00
dmiller a8dedf7f5f Fixes for zenmap Windows build 2023-02-01 20:05:27 +00:00
dmiller 973b5aacf5 Preliminary Windows bundling for Zenmap and Ndiff 2023-01-20 18:29:54 +00:00
dmiller 9732e6979e Merge Nmap 7.93 release branch 2022-09-02 14:38:17 +00:00
dmiller dd82097c80 Merge changes from 7.92 release branch 2021-08-08 21:20:19 +00:00
dmiller 76b25678d1 Remove VC++ 2008 runtime; Python uses VC 14+ same as our builds now. 2021-08-03 19:29:10 +00:00
dmiller ab35a2eccc Use cli defines, not sed, to customize NSIS script. Also addresses #2316 2021-07-30 17:02:11 +00:00
dmiller b7687223c1 Updates to build with VS 2019 2021-07-28 20:29:28 +00:00
dmiller bd81beac1c Use more structure in defining Nmap version number 2021-07-19 23:06:50 +00:00
dmiller ef8213a36c Reintegrate Nmap 7.90 release branch 2020-10-05 23:00:30 +00:00
dmiller 04e50e0f3e More OpenSSL DLL name changes 2020-09-03 19:19:52 +00:00
dmiller 210adf941e Remove nmap-update
This feature was never publicly released, and has not been distributed
in our binary builds for a couple versions now. It needed to be removed
in order to reduce the number of places Nmap looks for data files. See #2051
2020-08-27 19:13:31 +00:00
dmiller 6a2cacaa40 Windows config Zlib to not use ASM, support GZ. Fixes #1723 2019-09-19 16:45:39 +00:00
dmiller f05296d7f7 Merge changes from Nmap 7.80 release branch 2019-08-11 05:30:19 +00:00
dmiller 8490cad95d Copy zlib DLL during staging. Avoid building nmap-update 2018-11-08 15:30:15 +00:00
dmiller cadb66231f Merge 7.70 release branch into trunk 2018-03-20 18:08:25 +00:00
dmiller 4725c98f5e Backport some Windows build fixes from release branch 2017-06-11 20:01:02 +00:00
dmiller 5a5addb0ef Sign the Nmap uninstaller 2017-01-08 03:30:45 +00:00
dmiller 417f6fdd7b Add code signing and timestamps to windows build 2016-10-20 15:31:33 +00:00
dmiller 99efa84d86 Make sure Nmap.nsi gets regenerated when necessary and safely 2016-10-07 02:54:04 +00:00
dmiller c55b7f6f92 Rework Windows bundling to include Npcap instead of Winpcap 2016-06-14 14:16:48 +00:00
dmiller 0952bed032 Merge final changes to support VS2013 build
Changes:

* Fix a collision of the name PS_NONE with a different constant in shlobj.h
* Update solution and project files for VS2013
* Update the NSIS installer to reference the VC 2013 redistributable
2015-01-17 04:35:01 +00:00
dmiller 48c29e99b3 Force nmap.rc to be rebuilt when nmap.h changes
The make rule for nmap.rc depended only on nmap.rc.in, which doesn't
change regularly. Since the rule itself adds version info based on
nmap.h, it makes sense to list this as one of its dependencies.

Fixes #45
2015-01-14 04:56:56 +00:00
dmiller 1ea3557757 Let Windows build find VCExpress on any drive letter (mine is N) 2014-08-21 20:13:58 +00:00
dmiller 1e6db2b22c Make Ndiff install as a Python module as well as script
Discussion: http://seclists.org/nmap-dev/2013/q4/19
2013-10-17 19:20:49 +00:00
david cac0880ca6 Use /out instead of /log in command-line Windows build.
/log seems to be IDE internal logging, and has always been useless to
me. /out gives you the error messages you see in the build window in the
IDE.

http://msdn.microsoft.com/en-us/library/ms241272(v=vs.100).aspx
http://msdn.microsoft.com/en-us/library/ahky453h(v=vs.100).aspx
2013-03-01 05:09:39 +00:00
david 2d40aacd34 Remove MSBUILDDISABLENODEREUSE that doesn't seem to actually work. 2013-03-01 05:09:36 +00:00
david d5f3fb6745 Remove LICENSE on "make clean". 2012-10-31 17:29:27 +00:00
david 13fe0f6d2d Don't silence nmap.rc and nsis/Nmap.nsi commands.
They won't be run as often now.
2012-10-31 17:25:42 +00:00
david d2a44acb91 Use dependencies to generate LICENSE. 2012-10-31 17:25:39 +00:00
david 43fc9c6182 Exporting an environment variable has no effect on a single makefile line. 2012-10-31 17:23:45 +00:00
david 667aaad60c Use MSBUILDDISABLENODEREUSE=1 to prevent zombie msbuild.exe processes.
Having an msbuild.exe process running would cause builds to fail with a
mysterious message about a tmpdir.

http://stackoverflow.com/questions/3919892/msbuild-exe-staying-open-locking-files
2012-10-31 17:01:02 +00:00
david 9644ad825f Don't edit nmap.rc and nsis/Nmap.nsi in place.
Make new versioned nmap.rc.in and nsis/Nmap.nsi.in, and use those to
generate unversioned nmap.rc and nsis/Nmap.nsi. The changes made to
those files were constantly causing problems with updating.
2012-10-31 17:00:59 +00:00
david cfeec34979 Remove vcredist files, moved to /nmap-mswin32-aux. 2012-10-02 00:53:49 +00:00
david 2f2e826487 Remove OpenSSL directory, moved to /nmap-mswin32-aux. 2012-10-02 00:53:12 +00:00
david ceb25040c5 Add vcredist2008_x86.exe to the Windows zip.
This is apparently necessary on brand-new installations of Windows 2008.
2012-01-13 20:41:25 +00:00
david 97c6d85266 Include nmap-update.exe in the Windows zip file. 2011-12-20 01:42:03 +00:00
david 6d2382cadc Use "cmd /c copy" rather than "cp" when copying OpenSSL DLLs.
Using the builtin Windows copy preserves Windows ACLs. Without this, the
copied DLLs don't have their original ACLs, and something about this
causes the program to abort with error 0xc0000022.
2011-08-31 19:41:13 +00:00
fyodor 4b2528a3c9 make drive letter (for Windows VCExpress install path) case-insensitive. The registry key on my Win7 system uses c:\ instead of C:\ for some reason 2011-08-21 21:12:08 +00:00
fyodor f715da890e Fix a bug in the Makefile which used slightly the wrong path name in trying to delete a .svn directory 2010-11-20 08:57:33 +00:00
fyodor 51bfc9d384 Remove a .svn directory which was getting left in the builds (problem noted by Rob Nicholls 2010-11-20 08:34:55 +00:00