mirror of
https://github.com/nmap/nmap.git
synced 2026-08-03 22:29:06 +00:00
o Reformat Nmap COPYING file (e.g. remove C comment markers, reduce
line length) during Nmap windows build so that it looks much better when presented by the Windows executable (NSIS) installer. Thanks to Jah for the patch (which was modified slightly by Fyodor).
This commit is contained in:
parent
8391686eff
commit
70eac662f4
7 changed files with 74 additions and 1 deletions
|
|
@ -1,5 +1,10 @@
|
|||
# Nmap Changelog ($Id$); -*-text-*-
|
||||
|
||||
o Reformat Nmap COPYING file (e.g. remove C comment markers, reduce
|
||||
line length) during Nmap windows build so that it looks much better
|
||||
when presented by the Windows executable (NSIS) installer. Thanks
|
||||
to Jah for the patch (which was modified slightly by Fyodor).
|
||||
|
||||
Nmap 4.60
|
||||
|
||||
o Nmap has moved. Everything at http://insecure.org/nmap/ can now be
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ winbuild:
|
|||
@cat ./nsis/Nmap.nsi | sed 's/VIProductVersion ".*"/VIProductVersion "$(NMAP_NUM_VERSION)"/' > ./nmap.nsi.tmp
|
||||
@cat ./nmap.nsi.tmp | sed 's/!define VERSION ".*"/!define VERSION "$(NMAP_VERSION)"/' > ./nsis/Nmap.nsi
|
||||
@rm ./nmap.nsi.tmp ./nmap.rc.tmp
|
||||
@sed -f ./license-sed/lic_sedexp_1 ../COPYING | sed -f ./license-sed/lic_sedexp_2 | sed -f ./license-sed/lic_sedexp_3 | sed -f ./license-sed/lic_sedexp_4 > LICENSE
|
||||
|
||||
$(VCEXPRESS) nmap.sln /build release /log $(LOGLOC)
|
||||
$(MAKENSIS) winpcap/winpcap-nmap.nsi
|
||||
|
|
|
|||
32
mswin32/license-sed/lic_sedexp_1
Normal file
32
mswin32/license-sed/lic_sedexp_1
Normal file
|
|
@ -0,0 +1,32 @@
|
|||
# remove horizontal asterisks
|
||||
s@\*\*@@g
|
||||
|
||||
# preserve double hyphens between words in GNU GPL
|
||||
s@\([^\S\-]\)\-\-\([^\S\-]\)@\1SDFGHdbldash\2@g
|
||||
|
||||
# remove horizontal hyphens
|
||||
s@\-\-@@g
|
||||
|
||||
# reintroduce double hyphens
|
||||
s@SDFGHdbldash@--@g
|
||||
|
||||
# remove trailing asterisk
|
||||
s@\s*\*\s*$@@g
|
||||
|
||||
# remove leading asterisk
|
||||
s@^\s*\*\s*@@g
|
||||
|
||||
# remove lonely slash
|
||||
s@^/$@@g
|
||||
|
||||
# remove leading whitespace
|
||||
s@^\s\+@@g
|
||||
|
||||
# preserve bullets
|
||||
s@^o\s@oSDFGHbullet@g
|
||||
|
||||
# preserve sentence spacing
|
||||
s@\.\s\s\(\S\)@.SDFGHJdblspace\1@g
|
||||
|
||||
# remove first line
|
||||
1d
|
||||
8
mswin32/license-sed/lic_sedexp_2
Normal file
8
mswin32/license-sed/lic_sedexp_2
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
# read entire input and preserve paragraph separation
|
||||
|
||||
: more
|
||||
$!N
|
||||
t enough
|
||||
$!b more
|
||||
: enough
|
||||
s@\n\n@SDFGHJdblnewline@g
|
||||
8
mswin32/license-sed/lic_sedexp_3
Normal file
8
mswin32/license-sed/lic_sedexp_3
Normal file
|
|
@ -0,0 +1,8 @@
|
|||
# read entire input and replace all newlines with a space
|
||||
|
||||
: more
|
||||
$!N
|
||||
t enough
|
||||
$!b more
|
||||
: enough
|
||||
s@\n@ @g
|
||||
19
mswin32/license-sed/lic_sedexp_4
Normal file
19
mswin32/license-sed/lic_sedexp_4
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
# newline first line
|
||||
s@^\s\(COPYING\)@\n\1@g
|
||||
|
||||
# collapse whitespace
|
||||
s@\s\s@ @g
|
||||
|
||||
# reintroduce double newlines
|
||||
s@SDFGHJdblnewline@\n\n@g
|
||||
|
||||
# reintroduce bullets
|
||||
s@oSDFGHbullet@\no @g
|
||||
|
||||
# reintroduce sentence spacing
|
||||
s@SDFGHJdblspace@ @g
|
||||
|
||||
# Clean up GNU "How to apply"
|
||||
s@\.\s\(Copyright (C) 19yy\)@\.\n\1@g
|
||||
s@\(name\sof\sauthor\)\s\(Gnomovision\)@\1\n\2@g
|
||||
s@1989 Ty Coon@1989\nTy Coon@g
|
||||
|
|
@ -42,7 +42,7 @@
|
|||
;Pages
|
||||
|
||||
; !insertmacro MUI_PAGE_LICENSE "${NSISDIR}\Docs\Modern UI\License.txt"
|
||||
!insertmacro MUI_PAGE_LICENSE "..\..\COPYING"
|
||||
!insertmacro MUI_PAGE_LICENSE "..\LICENSE"
|
||||
!insertmacro MUI_PAGE_COMPONENTS
|
||||
!insertmacro MUI_PAGE_DIRECTORY
|
||||
!insertmacro MUI_PAGE_INSTFILES
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue