Commit c8de93e5 authored by Roger Dingledine's avatar Roger Dingledine
Browse files

update some of the win32 packaging scripts; stop shipping 

tor-doc.html tor-doc.css.


svn:r9515
parent a24b9e6a

contrib/package_nsis-mingw.sh

+6 −5
Original line number Diff line number Diff line
@@ -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,13 +42,13 @@ 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
@@ -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

contrib/package_nsis.sh

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ 
# you have already built Tor, that you are running cygwin, and that your

# environment is basically exactly the same as Nick's.



# This file is obsolete.



rm -rf win_tmp

mkdir win_tmp

mkdir win_tmp/bin

contrib/tor-mingw.nsi.in

+6 −6
Original line number Diff line number Diff line
@@ -101,12 +101,12 @@ Section "Documents" Docs 
   SetOutPath "$INSTDIR\Documents"

   ;File "doc\FAQ"

   File "..\doc\HACKING"

   File "..\doc\control-spec.txt"

   File "..\doc\dir-spec.txt"

   File "..\doc\rend-spec.txt"

   File "..\doc\socks-extensions.txt"

   File "..\doc\tor-spec.txt"

   File "..\doc\version-spec.txt"

   File "..\doc\spec\control-spec.txt"

   File "..\doc\spec\dir-spec.txt"

   File "..\doc\spec\rend-spec.txt"

   File "..\doc\spec\socks-extensions.txt"

   File "..\doc\spec\tor-spec.txt"

   File "..\doc\spec\version-spec.txt"

   ;

   ; WEBSITE-FILES-HERE

   ;

contrib/tor.nsi.in

+6 −6
Original line number Diff line number Diff line
@@ -124,12 +124,12 @@ Section "Documents" Docs 
   SetOutPath "$INSTDIR\Documents"

   ;File "..\doc\FAQ"

   File "..\doc\HACKING"

   File "..\doc\control-spec.txt"

   File "..\doc\dir-spec.txt"

   File "..\doc\rend-spec.txt"

   File "..\doc\socks-extensions.txt"

   File "..\doc\tor-spec.txt"

   File "..\doc\version-spec.txt"

   File "..\doc\spec\control-spec.txt"

   File "..\doc\spec\dir-spec.txt"

   File "..\doc\spec\rend-spec.txt"

   File "..\doc\spec\socks-extensions.txt"

   File "..\doc\spec\tor-spec.txt"

   File "..\doc\spec\version-spec.txt"

   ;

   ; WEBSITE-FILES-HERE

   ;