Handle website/* in tor.nsi

svn:r6444

4 files changed, 27 insertions, 37 deletions

diff --git a/contrib/Makefile.am b/contrib/Makefile.am
index cbbb356c0..d9dc3a6e8 100644
--- a/contrib/Makefile.am
+++ b/contrib/Makefile.am
@@ -3,7 +3,7 @@ DIST_SUBDIRS = osx
 
 confdir = $(sysconfdir)/tor
 
-EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.nsi tor.sh torctl rc.subr ExerciseServer.py PathDemo.py
+EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.nsi.in tor.sh torctl rc.subr ExerciseServer.py PathDemo.py
 
 conf_DATA = tor-tsocks.conf
 
diff --git a/contrib/package_nsis-weasel.sh b/contrib/package_nsis-weasel.sh
index 97f900e81..8dd494852 100755
--- a/contrib/package_nsis-weasel.sh
+++ b/contrib/package_nsis-weasel.sh
@@ -17,6 +17,7 @@ mkdir win_tmp
 mkdir win_tmp/bin
 mkdir win_tmp/contrib
 mkdir win_tmp/doc
+mkdir win_tmp/doc/website
 mkdir win_tmp/doc/design-paper
 mkdir win_tmp/doc/contrib
 mkdir win_tmp/src
@@ -40,30 +41,19 @@ clean_localstatedir() {
 }
 
 for fn in \
-	HACKING \
-	control-spec.txt \
-	dir-spec.txt \
-	rend-spec.txt \
-	socks-extensions.txt \
-	version-spec.txt \
+	doc/HACKING \
+	doc/control-spec.txt \
+	doc/dir-spec.txt \
+	doc/rend-spec.txt \
+	doc/socks-extensions.txt \
+	doc/tor-spec.txt \
+	doc/version-spec.txt \
 	\
-	website/stylesheet.css \
-	website/tor-doc-osx.html.en \
-	website/tor-doc-osx.html.it \
-	website/tor-doc-server.html.en \
-	website/tor-doc-server.html.it \
-	website/tor-doc-unix.html.en \
-	website/tor-doc-unix.html.it \
-	website/tor-doc-win32.html.en \
-	website/tor-doc-win32.html.es \
-	website/tor-doc-win32.html.it \
-	website/tor-hidden-service.html.en \
-	website/tor-switchproxy.html.en \
-	website/tor-switchproxy.html.it \
-	 \
+	doc/website/* \
 	; do
-    clean_newlines doc/"$fn" win_tmp/doc/"`basename $fn`"
+    clean_newlines "$fn" win_tmp/"$fn"
 done
+mmv win_tmp/doc/website/"*.html.*" win_tmp/doc/website/"#1.#2.html"
 
 cp doc/design-paper/tor-design.pdf win_tmp/doc/design-paper/tor-design.pdf
 
@@ -77,7 +67,19 @@ done
 
 clean_localstatedir src/config/torrc.sample.in win_tmp/src/config/torrc.sample
 
-cp contrib/tor.nsi win_tmp/contrib
+cp contrib/tor.nsi.in win_tmp/contrib/tor.nsi
+(
+	echo '/WEBSITE-FILES-HERE/'
+	echo 'a' # append
+	for fn in win_tmp/doc/website/*; do
+		echo -n 'File "..\doc\website\'
+		echo -n "`basename $fn`"
+		echo '"'
+	done
+	echo "." # end input
+	echo "w" # write
+	echo "q" # quit
+) | ed win_tmp/contrib/tor.nsi
 
 cd win_tmp/contrib
 
diff --git a/contrib/tor.nsi b/contrib/tor.nsi.in
index 8b83bd4d3..090138080 100644
--- a/contrib/tor.nsi
+++ b/contrib/tor.nsi.in
@@ -129,19 +129,7 @@ Section "Documents" Docs
    File "..\doc\socks-extensions.txt"
    File "..\doc\version-spec.txt"
    ;
-   File "..\doc\stylesheet.css"
-   File "..\doc\tor-doc-osx.html.en"
-   File "..\doc\tor-doc-osx.html.it"
-   File "..\doc\tor-doc-server.html.en"
-   File "..\doc\tor-doc-server.html.it"
-   File "..\doc\tor-doc-unix.html.en"
-   File "..\doc\tor-doc-unix.html.it"
-   File "..\doc\tor-doc-win32.html.en"
-   File "..\doc\tor-doc-win32.html.es"
-   File "..\doc\tor-doc-win32.html.it"
-   File "..\doc\tor-hidden-service.html.en"
-   File "..\doc\tor-switchproxy.html.en"
-   File "..\doc\tor-switchproxy.html.it"
+   ; WEBSITE-FILES-HERE
    ;
    File "..\doc\tor-resolve.html"
    File "..\doc\tor-reference.html"
diff --git a/contrib/updateVersions.pl b/contrib/updateVersions.pl
index 6dc5c0572..25cf5c77f 100755
--- a/contrib/updateVersions.pl
+++ b/contrib/updateVersions.pl
@@ -2,7 +2,7 @@
 
 $CONFIGURE_IN = './configure.in';
 $ORCONFIG_H = './src/win32/orconfig.h';
-$TOR_NSI = './contrib/tor.nsi';
+$TOR_NSI = './contrib/tor.nsi.in';
 
 sub demand {
     my $fn = shift;