mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-22 14:23:04 +01:00
Code Issues Projects Releases Wiki Activity

include geoip in win32 packages.

Browse source 
svn:r14798
This commit is contained in:
Andrew Lewman 2008-05-29 01:34:30 +00:00
parent a335b94c8f
commit 4591d931a4
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
contrib/package_nsis-mingw.sh
View file

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

16
contrib/tor-mingw.nsi.in
View file

@ -1,6 +1,6 @@
;tor.nsi - A basic win32 installer for Tor ;tor.nsi - A basic win32 installer for Tor
; Originally written by J Doe. ; Originally written by J Doe.
; Modified by Steve Topletz ; Modified by Steve Topletz, Andrew Lewman
; See the Tor LICENSE for licensing information ; See the Tor LICENSE for licensing information
;----------------------------------------- ;-----------------------------------------
; ;
@ -9,7 +9,7 @@
!include "FileFunc.nsh" !include "FileFunc.nsh"
!insertmacro GetParameters !insertmacro GetParameters
!define VERSION "0.2.1.0-alpha-dev" !define VERSION "0.2.0.26-rc-dev"
!define INSTALLER "tor-${VERSION}-win32.exe" !define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "https://www.torproject.org/" !define WEBSITE "https://www.torproject.org/"
!define LICENSE "LICENSE" !define LICENSE "LICENSE"
@ -96,6 +96,11 @@ Section "Tor" Tor
Next: Next:
${EndIf} ${EndIf}
File /oname=$CONFIGFILE "..\src\config\torrc.sample" 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 SectionEnd
Section "Documents" Docs Section "Documents" Docs
@ -113,7 +118,6 @@ Section "Start Menu" StartMenu
${If} ${FileExists} "$INSTDIR\Documents\*.*" ${If} ${FileExists} "$INSTDIR\Documents\*.*"
Call CreateDocLinks Call CreateDocLinks
${EndIf} ${EndIf}
endifdocs:
SectionEnd SectionEnd
Section "Desktop" Desktop Section "Desktop" Desktop
@ -156,12 +160,15 @@ Function ExtractBinaries
File "${BIN}\tor-resolve.exe" File "${BIN}\tor-resolve.exe"
FunctionEnd FunctionEnd
Function ExtractGEOIP
File "${BIN}\geoip"
FunctionEnd
Function ExtractIcon Function ExtractIcon
File "${BIN}\tor.ico" File "${BIN}\tor.ico"
FunctionEnd FunctionEnd
Function ExtractSpecs Function ExtractSpecs
;File "doc\FAQ"
File "..\doc\HACKING" File "..\doc\HACKING"
File "..\doc\spec\address-spec.txt" File "..\doc\spec\address-spec.txt"
File "..\doc\spec\control-spec.txt" File "..\doc\spec\control-spec.txt"
@ -209,6 +216,7 @@ Function un.InstallFiles
Delete "$INSTDIR\tor.ico" Delete "$INSTDIR\tor.ico"
Delete "$SMSTARTUP\Tor.lnk" Delete "$SMSTARTUP\Tor.lnk"
Delete "$INSTDIR\Uninstall.exe" Delete "$INSTDIR\Uninstall.exe"
Delete "$INSTDIR\geoip"
FunctionEnd FunctionEnd
Function un.InstallDirectories Function un.InstallDirectories