[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[or-cvs] r13120: Stop trying to mess with version in tor-mingw.nsi.in when we (in tor/trunk: . contrib)



Author: nickm
Date: 2008-01-12 19:20:41 -0500 (Sat, 12 Jan 2008)
New Revision: 13120

Modified:
   tor/trunk/
   tor/trunk/contrib/updateVersions.pl
Log:
 r15889@tombo:  nickm | 2008-01-12 17:18:29 -0500
 Stop trying to mess with version in tor-mingw.nsi.in when we reconfigure. This is a relic of our pre-mingw days, when we didn't use autoconf on windows.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r17581] on 8246c3cf-6607-4228-993b-4d95d33730f1
 svk:merge ticket from /tor/trunk [r15889] on d9e39d38-0f13-419c-a857-e10a0ce2aa0c

Modified: tor/trunk/contrib/updateVersions.pl
===================================================================
--- tor/trunk/contrib/updateVersions.pl	2008-01-13 00:15:08 UTC (rev 13119)
+++ tor/trunk/contrib/updateVersions.pl	2008-01-13 00:20:41 UTC (rev 13120)
@@ -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 @@
 
 demand($CONFIGURE_IN);
 demand($ORCONFIG_H);
-demand($TOR_NSI);
+#demand($TOR_NSI);
 
 # extract version from configure.in
 
@@ -53,5 +53,5 @@
     }
 }
 
-correctversion($TOR_NSI, "!");
+# correctversion($TOR_NSI, "!");
 correctversion($ORCONFIG_H, "#");