forward-port matt's changes. plus note that tor-mingw.nsi.in is

what we're using these days, and stop shipping the old one to
be sure.


svn:r8912
This commit is contained in:
Roger Dingledine 2006-11-06 06:43:21 +00:00
parent 20cad22bb1
commit 4a80643825
5 changed files with 10 additions and 5 deletions

View File

@ -9,6 +9,9 @@ Changes in version 0.1.2.4-alpha - 2006-11-??
without replacing the server descriptor: previously, a server that without replacing the server descriptor: previously, a server that
restarted every 30 minutes could have 48 "interesting" descriptors per restarted every 30 minutes could have 48 "interesting" descriptors per
day. day.
- Start linking to the Tor specification and Tor reference manual
correctly in the Windows installer.
Changes in version 0.1.2.3-alpha - 2006-10-29 Changes in version 0.1.2.3-alpha - 2006-10-29
o Minor features: o Minor features:

View File

@ -3,7 +3,7 @@ DIST_SUBDIRS = osx suse
confdir = $(sysconfdir)/tor confdir = $(sysconfdir)/tor
EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.nsi.in tor.sh torctl rc.subr ExerciseServer.py PathDemo.py cross.sh tor-mingw.nsi.in package_nsis-mingw.sh tor.ico EXTRA_DIST = exitlist tor-tsocks.conf torify.1 TorControl.py tor.sh torctl rc.subr ExerciseServer.py PathDemo.py cross.sh tor-mingw.nsi.in package_nsis-mingw.sh tor.ico
conf_DATA = tor-tsocks.conf conf_DATA = tor-tsocks.conf

View File

@ -5,7 +5,7 @@
; ;
!include "MUI.nsh" !include "MUI.nsh"
!define VERSION "0.1.2.2-alpha" !define VERSION "0.1.2.3-alpha-dev"
!define INSTALLER "tor-${VERSION}-win32.exe" !define INSTALLER "tor-${VERSION}-win32.exe"
!define WEBSITE "http://tor.eff.org/" !define WEBSITE "http://tor.eff.org/"
@ -105,6 +105,7 @@ Section "Documents" Docs
File "..\doc\dir-spec.txt" File "..\doc\dir-spec.txt"
File "..\doc\rend-spec.txt" File "..\doc\rend-spec.txt"
File "..\doc\socks-extensions.txt" File "..\doc\socks-extensions.txt"
File "..\doc\tor-spec.txt"
File "..\doc\version-spec.txt" File "..\doc\version-spec.txt"
; ;
; WEBSITE-FILES-HERE ; WEBSITE-FILES-HERE
@ -146,7 +147,7 @@ Section "Start Menu" StartMenu
CreateShortCut "$SMPROGRAMS\Tor\Uninstall.lnk" "$INSTDIR\Uninstall.exe" CreateShortCut "$SMPROGRAMS\Tor\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
IfFileExists "$INSTDIR\Documents\*.*" "" endifdocs IfFileExists "$INSTDIR\Documents\*.*" "" endifdocs
CreateDirectory "$SMPROGRAMS\Tor\Documents" CreateDirectory "$SMPROGRAMS\Tor\Documents"
CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Manual.lnk" "$INSTDIR\Documents\tor-doc.html" 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 Documentation.lnk" "$INSTDIR\Documents"
CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Specification.lnk" "$INSTDIR\Documents\tor-spec.txt" CreateShortCut "$SMPROGRAMS\Tor\Documents\Tor Specification.lnk" "$INSTDIR\Documents\tor-spec.txt"
endifdocs: endifdocs:

View File

@ -2,7 +2,8 @@
; Originally written by J Doe. ; Originally written by J Doe.
; See LICENSE for licencing information ; See LICENSE for licencing information
;----------------------------------------- ;-----------------------------------------
; ; NOTE: This file is obsolete. Look at tor-mingw.nsi.in instead.
;-----------------------------------------
; How to make an installer: ; How to make an installer:
; Step 0. If you are a Tor maintainer, make sure that tor.nsi and ; Step 0. If you are a Tor maintainer, make sure that tor.nsi and
; src/win32/orconfig.h all have the correct version number. ; src/win32/orconfig.h all have the correct version number.

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.in'; $TOR_NSI = './contrib/tor-mingw.nsi.in';
sub demand { sub demand {
my $fn = shift; my $fn = shift;