summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2004-11-14 18:56:46 +0000
committerNick Mathewson <nickm@torproject.org>2004-11-14 18:56:46 +0000
commitf7094852dc77fd7395d017156aa04992aa93cdf7 (patch)
tree458c436d237bbf1da5de9e4aaeb1a261fdfd92b5
parentd6c2a1be68d307f81d9797c5345d2cfd7d68f65c (diff)
downloadtor-f7094852dc77fd7395d017156aa04992aa93cdf7.tar.gz
tor-f7094852dc77fd7395d017156aa04992aa93cdf7.zip
Make happy-installer script work.
svn:r2863
-rw-r--r--contrib/package_nsis.sh16
-rw-r--r--contrib/tor.nsi2
2 files changed, 10 insertions, 8 deletions
diff --git a/contrib/package_nsis.sh b/contrib/package_nsis.sh
index ebd36e8867..19829c592a 100644
--- a/contrib/package_nsis.sh
+++ b/contrib/package_nsis.sh
@@ -11,14 +11,14 @@ mkdir win_tmp/contrib
mkdir win_tmp/doc
mkdir win_tmp/doc/design-paper
mkdir win_tmp/doc/contrib
-mkdir win_tmp/tmp
mkdir win_tmp/src
mkdir win_tmp/src/config
+mkdir win_tmp/tmp
-#cp Win32Build/vc6/tor/Debug/tor.exe win_tmp/bin
-#cp Win32Build/vc6/tor_resolve/Debug/tor_resolve.exe win_tmp/bin
-#cp c:/windows/system32/libeay32.dll win_tmp/bin
-#cp c:/windows/system32/ssleay32.dll win_tmp/bin
+cp Win32Build/vc6/tor/Debug/tor.exe win_tmp/bin
+cp Win32Build/vc6/tor_resolve/Debug/tor_resolve.exe win_tmp/bin
+cp c:/windows/system32/libeay32.dll win_tmp/bin
+cp c:/windows/system32/ssleay32.dll 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
@@ -32,11 +32,13 @@ for fn in CLIENTS tor-spec.txt HACKING rend-spec.txt control-spec.txt \
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/$fn win_tmp/doc/$fn
+ clean_newlines win_tmp/tmp/$fn win_tmp/doc/$fn
done
-for fn in README AUTHORS ChangeLog; do \
+for fn in README AUTHORS ChangeLog LICENSE; do \
clean_newlines $fn win_tmp/$fn
done
diff --git a/contrib/tor.nsi b/contrib/tor.nsi
index 7659e24b16..b10879c0ad 100644
--- a/contrib/tor.nsi
+++ b/contrib/tor.nsi
@@ -122,7 +122,7 @@ Section "Documents" Docs
SetOutPath "$INSTDIR\Documents"
File "..\doc\CLIENTS"
File "..\doc\tor-spec.txt"
- File "..\doc\FAQ"
+ #File "..\doc\FAQ"
File "..\doc\HACKING"
File "..\doc\rend-spec.txt"
File "..\doc\control-spec.txt"