diff options
| author | Gerald Combs <gerald@wireshark.org> | 2014-08-07 17:30:45 -0700 |
|---|---|---|
| committer | Graham Bloice <graham.bloice@trihedral.com> | 2014-08-14 10:26:31 +0000 |
| commit | 673247f04f3b8c1534cb49a850a1f0bbd71c02e0 (patch) | |
| tree | c711e9e2cf1343d9c5278dba15db74a68213e89c /Makefile.nmake | |
| parent | d68d0e88b4924a610b5cd2fd3a748b00c9bbab1a (diff) | |
Windows: Clean up text file packaging.
Convert textify.sh to PowerShell. Use PowerShell's built-in line ending
conversion so that we don't depend on unix2dos.
Only copy the help toc and text files to the staging directory.
Add PowerShell to the Developer's Guide. Fixup some other content.
(asn1/Makefile.inc.nmake contains a call to u2d. Hopefully that's not
a problem.)
Change-Id: I61a92aa54820d01015abb9ffa65815558ae31c71
Reviewed-on: https://code.wireshark.org/review/3487
Reviewed-by: Graham Bloice <graham.bloice@trihedral.com>
Petri-Dish: Graham Bloice <graham.bloice@trihedral.com>
Diffstat (limited to 'Makefile.nmake')
| -rw-r--r-- | Makefile.nmake | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/Makefile.nmake b/Makefile.nmake index 10f63a49ce..5eb24dcafc 100644 --- a/Makefile.nmake +++ b/Makefile.nmake @@ -1224,10 +1224,11 @@ install-generated-files: doc xcopy ".\manuf" $(INSTALL_DIR) /d xcopy ".\services" $(INSTALL_DIR) /d xcopy ".\pdml2html.xsl" $(INSTALL_DIR) /d - $(TEXTIFY) "./COPYING" $(INSTALL_DIR) - $(TEXTIFY) "./NEWS" $(INSTALL_DIR) - $(TEXTIFY) "./README" $(INSTALL_DIR) - $(TEXTIFY) "./README.windows" $(INSTALL_DIR) + $(TEXTIFY) -Destination $(INSTALL_DIR) \ + ./COPYING \ + ./NEWS \ + ./README \ + ./README.windows xcopy ".\cfilters" $(INSTALL_DIR) /d xcopy ".\colorfilters" $(INSTALL_DIR) /d xcopy ".\dfilters" $(INSTALL_DIR) /d @@ -1239,10 +1240,8 @@ install-generated-files: doc xcopy ipmap.html $(INSTALL_DIR) /d xcopy doc\*.html $(INSTALL_DIR) /d if not exist $(INSTALL_DIR)\help mkdir $(INSTALL_DIR)\help - xcopy ".\help\*.*" $(INSTALL_DIR)\help /d -# you can't reliably use xcopy to rename files "on the fly" (so copy first, then rename) - xcopy ".\help\faq.txt" $(INSTALL_DIR) /d - $(UNIX2DOS) $(INSTALL_DIR)/help/*.txt + xcopy ".\help\toc" $(INSTALL_DIR)\help /d + $(TEXTIFY) -Destination $(INSTALL_DIR)\help help\*.txt if not exist $(INSTALL_DIR)\dtds mkdir $(INSTALL_DIR)\dtds xcopy ".\dtds\*.*" $(INSTALL_DIR)\dtds /d if not exist $(INSTALL_DIR)\asn1 mkdir $(INSTALL_DIR)\asn1 |