From 4a80643825c086c8bdd21033d6739ca95229de92 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Mon, 6 Nov 2006 06:43:21 +0000 Subject: [PATCH] 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 --- ChangeLog | 3 +++ contrib/Makefile.am | 2 +- contrib/tor-mingw.nsi.in | 5 +++-- contrib/tor.nsi.in | 3 ++- contrib/updateVersions.pl | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index ad32c46334..a08ea9ae7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -9,6 +9,9 @@ Changes in version 0.1.2.4-alpha - 2006-11-?? without replacing the server descriptor: previously, a server that restarted every 30 minutes could have 48 "interesting" descriptors per 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 o Minor features: diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 17b65b3957..2bd202f11f 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -3,7 +3,7 @@ DIST_SUBDIRS = osx suse 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 diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 73340102de..cd89e79300 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -5,7 +5,7 @@ ; !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 WEBSITE "http://tor.eff.org/" @@ -105,6 +105,7 @@ Section "Documents" Docs 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" ; ; WEBSITE-FILES-HERE @@ -146,7 +147,7 @@ Section "Start Menu" StartMenu CreateShortCut "$SMPROGRAMS\Tor\Uninstall.lnk" "$INSTDIR\Uninstall.exe" IfFileExists "$INSTDIR\Documents\*.*" "" endifdocs 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 Specification.lnk" "$INSTDIR\Documents\tor-spec.txt" endifdocs: diff --git a/contrib/tor.nsi.in b/contrib/tor.nsi.in index 805997c685..f1b62479f1 100644 --- a/contrib/tor.nsi.in +++ b/contrib/tor.nsi.in @@ -2,7 +2,8 @@ ; Originally written by J Doe. ; See LICENSE for licencing information ;----------------------------------------- -; +; NOTE: This file is obsolete. Look at tor-mingw.nsi.in instead. +;----------------------------------------- ; How to make an installer: ; Step 0. If you are a Tor maintainer, make sure that tor.nsi and ; src/win32/orconfig.h all have the correct version number. diff --git a/contrib/updateVersions.pl b/contrib/updateVersions.pl index 25cf5c77f6..76b6fe5677 100755 --- a/contrib/updateVersions.pl +++ b/contrib/updateVersions.pl @@ -2,7 +2,7 @@ $CONFIGURE_IN = './configure.in'; $ORCONFIG_H = './src/win32/orconfig.h'; -$TOR_NSI = './contrib/tor.nsi.in'; +$TOR_NSI = './contrib/tor-mingw.nsi.in'; sub demand { my $fn = shift;