diff options
Diffstat (limited to 'contrib/package_nsis-mingw.sh')
| -rw-r--r-- | contrib/package_nsis-mingw.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/contrib/package_nsis-mingw.sh b/contrib/package_nsis-mingw.sh index 333302ea9e..0716bfa824 100644 --- a/contrib/package_nsis-mingw.sh +++ b/contrib/package_nsis-mingw.sh @@ -12,6 +12,7 @@ mkdir win_tmp mkdir win_tmp/bin mkdir win_tmp/contrib mkdir win_tmp/doc +mkdir win_tmp/doc/spec mkdir win_tmp/doc/design-paper mkdir win_tmp/doc/contrib mkdir win_tmp/src @@ -33,7 +34,6 @@ cp contrib/tor.ico win_tmp/bin/ #man2html doc/tor.1.in > win_tmp/tmp/tor-reference.html #man2html doc/tor-resolve.1 > win_tmp/tmp/tor-resolve.html - clean_newlines() { perl -pe 's/^\n$/\r\n/mg; s/([^\r])\n$/\1\r\n/mg;' $1 >$2 } @@ -42,17 +42,17 @@ clean_localstatedir() { perl -pe 's/^\n$/\r\n/mg; s/([^\r])\n$/\1\r\n/mg; s{\@LOCALSTATEDIR\@/(lib|log)/tor/}{C:\\Documents and Settings\\Application Data\\Tor\\}' $1 >$2 } -for fn in socks-extensions.txt dir-spec.txt tor-spec.txt HACKING rend-spec.txt control-spec.txt tor-doc.html tor-doc.css version-spec.txt; do - clean_newlines doc/$fn win_tmp/doc/$fn +for fn in socks-extensions.txt dir-spec.txt tor-spec.txt rend-spec.txt control-spec.txt version-spec.txt; do + clean_newlines doc/spec/$fn win_tmp/doc/spec/$fn done cp doc/design-paper/tor-design.pdf win_tmp/doc/design-paper/tor-design.pdf -for fn in tor-reference.html tor-resolve.html; do +for fn in HACKING tor-reference.html tor-resolve.html; do clean_newlines doc/$fn win_tmp/doc/$fn done -for fn in README AUTHORS ChangeLog LICENSE; do +for fn in README AUTHORS ChangeLog LICENSE; do clean_newlines $fn win_tmp/$fn done @@ -62,3 +62,4 @@ cp contrib/tor-mingw.nsi win_tmp/contrib/ cd win_tmp "C:\Program Files\NSIS\makensis.exe" contrib/tor-mingw.nsi + |