[or-cvs] [tor/master] windows packaging cleanups from phobos

[arma at torproject.org]

Author: Roger Dingledine <arma at torproject.org>
Date: Tue, 20 Apr 2010 20:17:28 -0400
Subject: windows packaging cleanups from phobos
Commit: 7231e289dd93d6aa3d17c46fd8ae44e70b365980

---
 contrib/package_nsis-mingw.sh |    9 ++++-----
 contrib/tor-mingw.nsi.in      |   24 +++++++++++++-----------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/contrib/package_nsis-mingw.sh b/contrib/package_nsis-mingw.sh
index 54f0ce2..59811f4 100644
--- a/contrib/package_nsis-mingw.sh
+++ b/contrib/package_nsis-mingw.sh
@@ -58,6 +58,7 @@ cp src/or/tor.exe win_tmp/bin/
 cp src/tools/tor-resolve.exe win_tmp/bin/
 cp contrib/tor.ico win_tmp/bin/
 cp src/config/geoip win_tmp/bin/
+strip win_tmp/bin/*.exe
 
 # There is no man2html in mingw.  
 # Maybe we should add this into make dist instead.
@@ -73,17 +74,15 @@ 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 address-spec.txt control-spec.txt control-spec-v0.txt dir-spec.txt dir-spec-v1.txt path-spec.txt rend-spec.txt socks-extensions.txt tor-spec.txt version-spec.txt; do
+for fn in address-spec.txt bridges-spec.txt control-spec.txt dir-spec.txt path-spec.txt rend-spec.txt socks-extensions.txt tor-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 HACKING tor-reference.html tor-resolve.html; do
+for fn in HACKING tor-gencert.html tor.html torify.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 ChangeLog LICENSE; do
     clean_newlines $fn win_tmp/$fn
 done
 
diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 54837d5..b213083 100644
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -29,7 +29,7 @@ VIProductVersion "${VERSION}"
 VIAddVersionKey "ProductName" "The Onion Router: Tor"
 VIAddVersionKey "Comments" "${WEBSITE}"
 VIAddVersionKey "LegalTrademarks" "Three line BSD"
-VIAddVersionKey "LegalCopyright" "©2004-2008, Roger Dingledine, Nick Mathewson"
+VIAddVersionKey "LegalCopyright" "©2004-2008, Roger Dingledine, Nick Mathewson. ©2009 The Tor Project, Inc. "
 VIAddVersionKey "FileDescription" "Tor is an implementation of Onion Routing. You can read more at ${WEBSITE}"
 VIAddVersionKey "FileVersion" "${VERSION}"
 
@@ -170,10 +170,9 @@ FunctionEnd
 Function ExtractSpecs
 	File "..\doc\HACKING"
 	File "..\doc\spec\address-spec.txt"
+	File "..\doc\spec\bridges-spec.txt"
 	File "..\doc\spec\control-spec.txt"
-	File "..\doc\spec\control-spec-v0.txt"
 	File "..\doc\spec\dir-spec.txt"
-	File "..\doc\spec\dir-spec-v1.txt"
 	File "..\doc\spec\path-spec.txt"
 	File "..\doc\spec\rend-spec.txt"
 	File "..\doc\spec\socks-extensions.txt"
@@ -182,17 +181,14 @@ Function ExtractSpecs
 FunctionEnd
 
 Function ExtractHTML
+	File "..\doc\tor.html"
+	File "..\doc\torify.html"
 	File "..\doc\tor-resolve.html"
-	File "..\doc\tor-reference.html"
-FunctionEnd
-
-Function ExtractDesignDocs
-	File "..\doc\design-paper\tor-design.pdf"
+	File "..\doc\tor-gencert.html"
 FunctionEnd
 
 Function ExtractReleaseDocs
 	File "..\README"
-	File "..\AUTHORS"
 	File "..\ChangeLog"
 	File "..\LICENSE"
 FunctionEnd
@@ -201,7 +197,6 @@ Function ExtractDocuments
 	SetOutPath "$INSTDIR\Documents"
 	Call ExtractSpecs
 	Call ExtractHTML
-	Call ExtractDesignDocs
 	Call ExtractReleaseDocs
 FunctionEnd
 
@@ -248,9 +243,16 @@ FunctionEnd
 
 Function CreateDocLinks
 	CreateDirectory "$SMPROGRAMS\Tor\Documents"
-	CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Manual.lnk" "$INSTDIR\Documents\tor-reference.html"
 	CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Documentation.lnk" "$INSTDIR\Documents"
 	CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Specification.lnk" "$INSTDIR\Documents\tor-spec.txt"
+	CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Address Specification.lnk" "$INSTDIR\Documents\address-spec.txt"
+	CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Bridges Specification.lnk" "$INSTDIR\Documents\bridges-spec.txt"
+	CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Control Specification.lnk" "$INSTDIR\Documents\control-spec.txt"
+	CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Directory Specification.lnk" "$INSTDIR\Documents\dir-spec.txt"
+	CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Path Specification.lnk" "$INSTDIR\Documents\path-spec.txt"
+	CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Rend Specification.lnk" "$INSTDIR\Documents\rend-spec.txt"
+	CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Version Specification.lnk" "$INSTDIR\Documents\version-spec.txt"
+	CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor SOCKS Extensions.lnk" "$INSTDIR\Documents\socks-extensions.txt"
 FunctionEnd
 
 Function ParseCmdLine
-- 
1.6.5