CLeaned up and works with mingw builds out of the box, mostly.

svn:r8653

1 files changed, 16 insertions, 15 deletions

diff --git a/contrib/package_nsis-mingw.sh b/contrib/package_nsis-mingw.sh
index 661bdbb40..433c51cfe 100644
--- a/contrib/package_nsis-mingw.sh
+++ b/contrib/package_nsis-mingw.sh
@@ -5,6 +5,7 @@
 # you know what you are doing.
 
 # Start in the tor source directory after you've compiled tor.exe
+# This means start as ./contrib/package_nsis-mingw.sh
 
 rm -rf win_tmp
 mkdir win_tmp
@@ -17,15 +18,17 @@ mkdir win_tmp/src
 mkdir win_tmp/src/config
 mkdir win_tmp/tmp
 
-cp src/or/tor.exe win_tmp/bin/tor.exe
-cp src/tools/tor_resolve.exe win_tmp/bin
-cp /usr/local/ssl/lib/libcrypto.a win_tmp/bin
-cp /usr/local/ssl/lib/libssl.a win_tmp/bin
+cp src/or/tor.exe win_tmp/bin/
+cp src/tools/tor-resolve.exe win_tmp/bin/
+cp /usr/local/ssl/lib/libcrypto.a win_tmp/bin/
+cp /usr/local/ssl/lib/libssl.a win_tmp/bin/
 
 # There is no man2html in mingw.  
 # Maybe we should add this into make dist instead.
-man2html doc/tor.1.in > win_tmp/tmp/tor-reference.html
-man2html doc/tor-resolve.1 > win_tmp/tmp/tor-resolve.html
+# One has to do this manually and cp it do the tor-source/doc dir
+#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
@@ -35,25 +38,23 @@ 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 tor-spec.txt HACKING rend-spec.txt control-spec.txt \
-   tor-doc.html tor-doc.css version-spec.txt; do
+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
 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 \
-    clean_newlines win_tmp/tmp/$fn win_tmp/doc/$fn
+for fn in 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
 
 clean_localstatedir src/config/torrc.sample.in win_tmp/src/config/torrc.sample
 
-cp contrib/tor.nsi win_tmp/contrib
+cp contrib/tor-mingw.nsi win_tmp/contrib/
 
-cd win_tmp/contrib
-C:\Program Files\NSIS\makensis.exe tor.nsi
-mv tor-*.exe ../..
+cd win_tmp
+"C:\Program Files\NSIS\makensis.exe" contrib/tor-mingw.nsi