sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle website/* in tor.nsi 

svn:r6444
This commit is contained in:
Peter Palfrader 2006-05-05 16:58:38 +00:00
parent e8e113c6f7
commit 0ee6dbea07
4 changed files with 27 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/Makefile.am
View File

@ -3,7 +3,7 @@ DIST_SUBDIRS = osx
confdir = $(sysconfdir)/tor 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 conf_DATA = tor-tsocks.conf

46
contrib/package_nsis-weasel.sh
View File

@ -17,6 +17,7 @@ mkdir win_tmp
mkdir win_tmp/bin mkdir win_tmp/bin
mkdir win_tmp/contrib mkdir win_tmp/contrib
mkdir win_tmp/doc mkdir win_tmp/doc
mkdir win_tmp/doc/website
mkdir win_tmp/doc/design-paper mkdir win_tmp/doc/design-paper
mkdir win_tmp/doc/contrib mkdir win_tmp/doc/contrib
mkdir win_tmp/src mkdir win_tmp/src
@ -40,30 +41,19 @@ clean_localstatedir() {
} }
for fn in \ for fn in \
HACKING \ doc/HACKING \
control-spec.txt \ doc/control-spec.txt \
dir-spec.txt \ doc/dir-spec.txt \
rend-spec.txt \ doc/rend-spec.txt \
socks-extensions.txt \ doc/socks-extensions.txt \
version-spec.txt \ doc/tor-spec.txt \
doc/version-spec.txt \
\ \
website/stylesheet.css \ doc/website/* \
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 \
\
; do ; do
clean_newlines doc/"$fn" win_tmp/doc/"`basename $fn`" clean_newlines "$fn" win_tmp/"$fn"
done 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 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 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 cd win_tmp/contrib

14
contrib/tor.nsi → contrib/tor.nsi.in
View File

@ -129,19 +129,7 @@ Section "Documents" Docs
File "..\doc\socks-extensions.txt" File "..\doc\socks-extensions.txt"
File "..\doc\version-spec.txt" File "..\doc\version-spec.txt"
; ;
File "..\doc\stylesheet.css" ; WEBSITE-FILES-HERE
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"
; ;
File "..\doc\tor-resolve.html" File "..\doc\tor-resolve.html"
File "..\doc\tor-reference.html" File "..\doc\tor-reference.html"

2
contrib/updateVersions.pl
View File

@ -2,7 +2,7 @@
$CONFIGURE_IN = './configure.in'; $CONFIGURE_IN = './configure.in';
$ORCONFIG_H = './src/win32/orconfig.h'; $ORCONFIG_H = './src/win32/orconfig.h';
$TOR_NSI = './contrib/tor.nsi'; $TOR_NSI = './contrib/tor.nsi.in';
sub demand { sub demand {
my $fn = shift; my $fn = shift;