revert r13120: for some reason nickm disabled the version

updating for windows. i'm not sure why.

svn:r13292

diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in
index 1120400248106ebbe7b7693a0633e796db3a5e4b..f10e034d48d2e07a427b37449d8002d63457af50 100644 (file)
--- a/contrib/tor-mingw.nsi.in
+++ b/contrib/tor-mingw.nsi.in
@@ -9,7 +9,7 @@
 !include "FileFunc.nsh"
 !insertmacro GetParameters
   
-!define VERSION "@VERSION@"
+!define VERSION "0.2.0.18-alpha"
 !define INSTALLER "tor-${VERSION}-win32.exe"
 !define WEBSITE "https://www.torproject.org/"
 !define LICENSE "LICENSE"

diff --git a/contrib/updateVersions.pl b/contrib/updateVersions.pl
index 2d99d7cade758420fbe907a492f02fabcde04e4a..76b6fe56779a9054d7ba00fa95a9f3018faa4a9f 100755 (executable)
--- 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-mingw.nsi.in';
+$TOR_NSI = './contrib/tor-mingw.nsi.in';
 
 sub demand {
     my $fn = shift;
@@ -11,7 +11,7 @@ sub demand {
 
 demand($CONFIGURE_IN);
 demand($ORCONFIG_H);
-#demand($TOR_NSI);
+demand($TOR_NSI);
 
 # extract version from configure.in
 
@@ -53,5 +53,5 @@ sub correctversion {
     }
 }
 
-# correctversion($TOR_NSI, "!");
+correctversion($TOR_NSI, "!");
 correctversion($ORCONFIG_H, "#");