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 /packaging/nsis/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 'packaging/nsis/Makefile.nmake')
| -rw-r--r-- | packaging/nsis/Makefile.nmake | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/packaging/nsis/Makefile.nmake b/packaging/nsis/Makefile.nmake index 9a35ae91f6..e61e89a7e1 100644 --- a/packaging/nsis/Makefile.nmake +++ b/packaging/nsis/Makefile.nmake @@ -231,12 +231,11 @@ NSIS_FLAGS=\ !ENDIF wireshark.nsi: qt-dll-manifest.nsh -qt-dll-manifest.nsh: windeployqt-to-nsis.ps1 +qt-dll-manifest.nsh: windeployqt-to-nsis.ps1 Makefile.nmake !IF EXIST("$(QT5_BASE_DIR)\bin\windeployqt.exe") set PATH=%PATH%;$(QT5_BASE_DIR)\bin - powershell -executionpolicy bypass -File windeployqt-to-nsis.ps1 \ - windeployqt.exe ..\..\wireshark-qt-release\qtshark.exe \ - > $@ + $(POWERSHELL) windeployqt-to-nsis.ps1 \ + windeployqt.exe ..\..\wireshark-qt-release\qtshark.exe $@ !ELSE IF EXIST("..\..\wireshark-qt-release\Qt5Core.dll") type << > $@ File "..\..\wireshark-qt-release\Qt5Core.dll" |