[or-cvs] r8912: forward-port matt's changes. plus note that tor-mingw.nsi.in (in tor/trunk: . contrib)

[arma at seul.org]

Author: arma
Date: 2006-11-06 01:43:21 -0500 (Mon, 06 Nov 2006)
New Revision: 8912

Modified:
   tor/trunk/ChangeLog
   tor/trunk/contrib/Makefile.am
   tor/trunk/contrib/tor-mingw.nsi.in
   tor/trunk/contrib/tor.nsi.in
   tor/trunk/contrib/updateVersions.pl
Log:
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.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2006-11-06 06:27:30 UTC (rev 8911)
+++ tor/trunk/ChangeLog	2006-11-06 06:43:21 UTC (rev 8912)
@@ -9,7 +9,10 @@
       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:
     - Prepare for servers to publish descriptors less often: never

Modified: tor/trunk/contrib/Makefile.am
===================================================================
--- tor/trunk/contrib/Makefile.am	2006-11-06 06:27:30 UTC (rev 8911)
+++ tor/trunk/contrib/Makefile.am	2006-11-06 06:43:21 UTC (rev 8912)
@@ -3,7 +3,7 @@
 
 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
 

Modified: tor/trunk/contrib/tor-mingw.nsi.in
===================================================================
--- tor/trunk/contrib/tor-mingw.nsi.in	2006-11-06 06:27:30 UTC (rev 8911)
+++ tor/trunk/contrib/tor-mingw.nsi.in	2006-11-06 06:43:21 UTC (rev 8912)
@@ -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 @@
    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 @@
    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:

Modified: tor/trunk/contrib/tor.nsi.in
===================================================================
--- tor/trunk/contrib/tor.nsi.in	2006-11-06 06:27:30 UTC (rev 8911)
+++ tor/trunk/contrib/tor.nsi.in	2006-11-06 06:43:21 UTC (rev 8912)
@@ -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.

Modified: tor/trunk/contrib/updateVersions.pl
===================================================================
--- tor/trunk/contrib/updateVersions.pl	2006-11-06 06:27:30 UTC (rev 8911)
+++ tor/trunk/contrib/updateVersions.pl	2006-11-06 06:43:21 UTC (rev 8912)
@@ -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;