include geoip in win32 packages. backport from r14798

svn:r14799

contrib/package_nsis-mingw.sh

@@ -4,6 +4,7 @@
 # package_nsis-ming.sh is distributed under this license:
 
 # Copyright (c) 2006-2007 Andrew Lewman
+# Copyright (c) 2008 The Tor Project, Inc.
 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -56,9 +57,7 @@ mkdir win_tmp/tmp
 cp src/or/tor.exe win_tmp/bin/
 cp src/tools/tor-resolve.exe win_tmp/bin/
 cp contrib/tor.ico win_tmp/bin/
-
-# YOU must copy torbutton xpi into the contrib dir
-#cp contrib/torbutton-1.0.4-fx+tb.xpi win_tmp/bin/
+cp src/config/geoip win_tmp/bin/
 
 # There is no man2html in mingw.  
 # Maybe we should add this into make dist instead.

contrib/tor-mingw.nsi.in

@@ -1,6 +1,6 @@
 ;tor.nsi - A basic win32 installer for Tor
 ; Originally written by J Doe.
-; Modified by Steve Topletz
+; Modified by Steve Topletz, Andrew Lewman
 ; See the Tor LICENSE for licensing information
 ;-----------------------------------------
 ;
@@ -96,6 +96,11 @@ Section "Tor" Tor
 		Next:
 	${EndIf}
 	File /oname=$CONFIGFILE "..\src\config\torrc.sample"
+
+; the geoip file needs to be included and stuffed into the right directory
+; otherwise tor is unhappy
+	SetOutPath $APPDATA\Tor
+	Call ExtractGEOIP
 SectionEnd
 
 Section "Documents" Docs
@@ -113,7 +118,6 @@ Section "Start Menu" StartMenu
   ${If} ${FileExists} "$INSTDIR\Documents\*.*"
     Call CreateDocLinks
   ${EndIf}
-   endifdocs:
 SectionEnd
 
 Section "Desktop" Desktop
@@ -156,12 +160,15 @@ Function ExtractBinaries
 	File "${BIN}\tor-resolve.exe"
 FunctionEnd
 
+Function ExtractGEOIP
+	File "${BIN}\geoip"
+FunctionEnd
+
 Function ExtractIcon
 	File "${BIN}\tor.ico"
 FunctionEnd
 
 Function ExtractSpecs
-	;File "doc\FAQ"
 	File "..\doc\HACKING"
 	File "..\doc\spec\address-spec.txt"
 	File "..\doc\spec\control-spec.txt"
@@ -209,6 +216,7 @@ Function un.InstallFiles
 	Delete "$INSTDIR\tor.ico"
 	Delete "$SMSTARTUP\Tor.lnk"
 	Delete "$INSTDIR\Uninstall.exe"
+	Delete "$INSTDIR\geoip"
 FunctionEnd
 
 Function un.InstallDirectories