[or-cvs] r19431: {torvm} Update package specs for 0.0.2 release. (in torvm/trunk/build/win32: patches src/pkg src/torvm-w32)

coderman at seul.org coderman at seul.org
Tue May 5 00:58:31 UTC 2009 

Author: coderman
Date: 2009-05-04 20:58:31 -0400 (Mon, 04 May 2009)
New Revision: 19431

Modified:
   torvm/trunk/build/win32/patches/vidalia-torvm.patch
   torvm/trunk/build/win32/src/pkg/bundle.nsi
   torvm/trunk/build/win32/src/pkg/license.wxs
   torvm/trunk/build/win32/src/pkg/netinst.nsi
   torvm/trunk/build/win32/src/pkg/torvm.wxs
   torvm/trunk/build/win32/src/torvm-w32/torvm.c
Log:
Update package specs for 0.0.2 release.

Modified: torvm/trunk/build/win32/patches/vidalia-torvm.patch
===================================================================
--- torvm/trunk/build/win32/patches/vidalia-torvm.patch	2009-05-05 00:40:11 UTC (rev 19430)
+++ torvm/trunk/build/win32/patches/vidalia-torvm.patch	2009-05-05 00:58:31 UTC (rev 19431)
@@ -51,33 +51,33 @@
 +    light.exe vidalia.wixobj -out vidalia.msi -ext C:\Path\to\Wix\bin\WixUIExtension.dll
   -->
  <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-+  <?define ThisProductVersion="@VER_MAJOR at .@VER_MINOR at .@VER_PATCH@" ?>
-+  <?define ThisProductVersionDisp="@VERSION@" ?>
-+  <?define VidaliaVersion="@VERSION@" ?>
++  <?define ThisProductVersion="0.2.2" ?>
++  <?define ThisProductVersionDisp="0.2.0" ?>
++  <?define VidaliaVersion="0.2.0" ?>
 +  <?define TorVersion="latest" ?>
 +  <?define TorbuttonVersion="latest" ?>
 +  <?define PolipoVersion="latest" ?>
 +  <?define PrivoxyVersion="latest" ?>
-+  <?define VidaliaBundleVersion="bundle- at VERSION@" ?>
++  <?define VidaliaBundleVersion="0.0.2" ?>
 +  <?define UpgradeCode="147903e8-fa6f-47f0-bf97-b7250337b2b7" ?>
 +  
-+  <?define CurrProductGUID="d5c5edf6-72d9-4c06-b31d-d88505cd945d" ?>
-+  <?define CurrExecutableGUID="4d78ea1a-6d9e-49d6-9361-b63d5649f178" ?>
-+  <?define CurrQtLibsGUID="37cc4b3d-11db-4ecd-aa2c-914cc4e569ec" ?>
-+  <?define CurrCryptoLibsGUID="c4d0f815-fc12-4aa0-a6c1-447b9b6bccb8" ?>
-+  <?define CurrMingwLibsGUID="1e1d929d-5f2c-493e-a8b5-be0705c9e2a1" ?>
-+  <?define CurrGeoIPCacheGUID="de59a47b-28cf-49fa-a958-d661531aa995" ?>
-+  <?define CurrPolipoConfigGUID="91a75a7b-90d4-4a23-a21a-4d4a399d48d3" ?>
-+  <?define CurrMarblePluginGUID="ef5a2944-9260-4534-8006-3f4467f86d21" ?>
-+  <?define CurrPluginDataDirGUID="7e453371-e040-4343-a0f8-18b095287834" ?>
-+  <?define CurrPluginImageFormatsGUID="5165d926-0fe7-4abf-9d5b-f8b9065fbff5" ?>
-+  <?define CurrDocumentsGUID="bfbf9e6a-3d82-4e4c-b9f5-01c031b87895" ?>
-+  <?define CurrConfigFileGUID="588f5caa-ed55-49da-a4d7-016083e8ffe1" ?>
-+  <?define CurrStartMenuGUID="b676da08-ca06-4f59-be44-d1b63acb4678" ?>
-+  <?define CurrDesktopGUID="f112abb9-4598-4ed5-8fc2-255f90775c58" ?>
-+  <?define CurrDocsOnDesktopGUID="d6c16c8e-afd8-4c61-b9ba-9afa3861a696" ?>
-+  <?define CurrStartupGUID="a4913b9e-2c6e-43d7-b765-c5f81515561e" ?>
-+  <?define CurrLocalProgramsGUID="e360bf57-5d75-43e7-8024-740898e78547" ?>
++  <?define CurrProductGUID="67afe87d-9f74-4a22-b4bf-e4dfcefd6cb1" ?>
++  <?define CurrExecutableGUID="ebda5f07-6e3c-4904-9fcf-2ad3d3793773" ?>
++  <?define CurrQtLibsGUID="2ee91de7-1c50-488f-97be-984f4abcc388" ?>
++  <?define CurrCryptoLibsGUID="4ee11862-00a8-467f-8d08-04f6e8522b3c" ?>
++  <?define CurrMingwLibsGUID="9c598e06-14c3-4891-983f-efd248f16cf4" ?>
++  <?define CurrGeoIPCacheGUID="67210dc4-7977-4499-bdd9-0b715d86352b" ?>
++  <?define CurrPolipoConfigGUID="6b2b749d-d0cc-420d-a3d3-e7b00bf0c81d" ?>
++  <?define CurrMarblePluginGUID="6999734b-dc3b-4751-8d69-65065650be80" ?>
++  <?define CurrPluginDataDirGUID="0876256d-40e7-4749-abd7-8929441af657" ?>
++  <?define CurrPluginImageFormatsGUID="712fa492-4ea3-4cd7-b1da-dd71703a7541" ?>
++  <?define CurrDocumentsGUID="e417b6c9-d8cf-4164-b905-9543ade71deb" ?>
++  <?define CurrConfigFileGUID="b311e9ea-e76c-42a6-a7c1-36047a092ad5" ?>
++  <?define CurrStartMenuGUID="0fd17444-4e1e-4c2d-8911-662ca544029a" ?>
++  <?define CurrDesktopGUID="14438a4e-629c-4c2b-bca1-709fd81ebc2b" ?>
++  <?define CurrDocsOnDesktopGUID="386daa5d-4bdd-464a-a010-df65562c3c80" ?>
++  <?define CurrStartupGUID="dfee2d3e-5d4a-41d8-b78a-6e59b8c64dec" ?>
++  <?define CurrLocalProgramsGUID="a4a11482-156d-43c7-8c87-bb52c3d410f4" ?>
  
 -  <?define VidaliaVersion="@VER_MAJOR at .@VER_MINOR at .@VER_PATCH@" ?>
 -  <?define VidaliaUpgradeCode="B7FBFE11-D7CA-4895-A1FB-1D7E065E4D04" ?>

Modified: torvm/trunk/build/win32/src/pkg/bundle.nsi
===================================================================
--- torvm/trunk/build/win32/src/pkg/bundle.nsi	2009-05-05 00:40:11 UTC (rev 19430)
+++ torvm/trunk/build/win32/src/pkg/bundle.nsi	2009-05-05 00:58:31 UTC (rev 19431)
@@ -2,7 +2,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
   
-!define VERSION "0.0.1.0"
+!define VERSION "0.0.2.0"
 !define INSTALLER "TorVMBundle.exe"
 !define WEBSITE "https://www.torproject.org/"
 !define LICENSE "LICENSE"

Modified: torvm/trunk/build/win32/src/pkg/license.wxs
===================================================================
--- torvm/trunk/build/win32/src/pkg/license.wxs	2009-05-05 00:40:11 UTC (rev 19430)
+++ torvm/trunk/build/win32/src/pkg/license.wxs	2009-05-05 00:58:31 UTC (rev 19431)
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="Windows-1252" ?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <?define ThisProductVersion="0.0.3" ?>
+  <?define ThisProductVersion="0.0.4" ?>
   <?define ThisProductVersionDisp="$(var.ThisProductVersion)" ?>
   <?define UpgradeCode="bda6a744-0815-4fdc-88a8-d40d8c154133" ?>
-  <?define CurrProductGUID="b7cdfe31-cf2f-4e50-bf13-900b6e46badc" ?>
-  <?define CurrDocsOnDesktopGUID="d54b7085-ac10-42c7-a82a-198020d97ab7" ?>
-  <?define CurrLocalProgramsGUID="7bcd39dd-9aae-48c7-92ad-95837ee2f6b7" ?>
+  <?define CurrProductGUID="5b286e81-56b4-4efb-bc59-9f6cce69a07d" ?>
+  <?define CurrDocsOnDesktopGUID="14b00c23-1dbe-4874-a035-5c1033fa9cd1" ?>
+  <?define CurrLocalProgramsGUID="e342387b-ab0f-4896-8106-76d9867282db" ?>
 
   <Product Name="Tor License Documents $(var.ThisProductVersionDisp)" Id="$(var.CurrProductGUID)"
            Language="!(loc.LCID)"

Modified: torvm/trunk/build/win32/src/pkg/netinst.nsi
===================================================================
--- torvm/trunk/build/win32/src/pkg/netinst.nsi	2009-05-05 00:40:11 UTC (rev 19430)
+++ torvm/trunk/build/win32/src/pkg/netinst.nsi	2009-05-05 00:58:31 UTC (rev 19431)
@@ -2,7 +2,7 @@
 !include "LogicLib.nsh"
 !include "FileFunc.nsh"
   
-!define VERSION "0.0.1.0"
+!define VERSION "0.0.2.0"
 !define INSTALLER "TorVMNetInstaller.exe"
 !define WEBSITE "https://www.torproject.org/"
 !define LICENSE "LICENSE"

Modified: torvm/trunk/build/win32/src/pkg/torvm.wxs
===================================================================
--- torvm/trunk/build/win32/src/pkg/torvm.wxs	2009-05-05 00:40:11 UTC (rev 19430)
+++ torvm/trunk/build/win32/src/pkg/torvm.wxs	2009-05-05 00:58:31 UTC (rev 19431)
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="Windows-1252" ?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <?define ThisProductVersion="0.0.2" ?>
-  <?define ThisProductVersionDisp="0.0.1-dev" ?>
+  <?define ThisProductVersionDisp="0.0.2" ?>
   <?define UpgradeCode="3f874171-34a0-4af8-8c66-27a681ac5fb6" ?>
   
-  <?define CurrProductGUID="b7b6edad-8da7-4b13-b9ac-31dde19747af" ?>
-  <?define CurrExecutableGUID="56f51f0a-53b7-4013-9b9e-70d827161f04" ?>
-  <?define CurrStartMenuGUID="449d8599-a423-40b6-bb0f-1694ea76d4e0" ?>
-  <?define CurrDesktopGUID="1f81b070-a7f4-49ec-adf4-6d95ede8cf6b" ?>
-  <?define CurrDocsOnDesktopGUID="5faf209e-7e99-46d8-94fe-3ac13f51bea5" ?>
-  <?define CurrStartupGUID="8e2d6296-7596-4740-b53e-f0cc3a49e3b6" ?>
+  <?define CurrProductGUID="44ba55fc-8812-4767-b5ae-596016f0fb5b" ?>
+  <?define CurrExecutableGUID="566f9def-df17-4e55-af5e-8f15ee458228" ?>
+  <?define CurrStartMenuGUID="f31bb770-7858-45d8-a626-76b75d20f566" ?>
+  <?define CurrDesktopGUID="dba2f82b-f158-47c9-b8b0-fd558acc4b4c" ?>
+  <?define CurrDocsOnDesktopGUID="275fad61-2dd9-4ed5-b3a2-aa388060e470" ?>
+  <?define CurrStartupGUID="c186dcb3-71d2-48d9-a478-17c450b143db" ?>
 
   <Product Name="Tor VM $(var.ThisProductVersionDisp)" Id="$(var.CurrProductGUID)"
            Language="!(loc.LCID)"

Modified: torvm/trunk/build/win32/src/torvm-w32/torvm.c
===================================================================
--- torvm/trunk/build/win32/src/torvm-w32/torvm.c	2009-05-05 00:40:11 UTC (rev 19430)
+++ torvm/trunk/build/win32/src/torvm-w32/torvm.c	2009-05-05 00:58:31 UTC (rev 19431)
@@ -2303,7 +2303,7 @@
    * restricted user log off and clean shutdown.
    */
   if (bundle) {
-    dispmsg("Waiting for Tor control port to open...");
+    dispmsg("Waiting for Tor control port to open.");
     /* try to confirm control port is up before launching vidalia... */
     int i = 10;
     while ( (!tryconnect(TOR_TAP_VMIP, 9051)) && (i > 0) ) {
@@ -2336,7 +2336,7 @@
     }
   }
 
-  dispmsg("Tor VM is running, waiting for exit...");
+  dispmsg("Tor VM is running.  Waiting for VM to exit...");
   dispmsg("");
   /* TODO: once the pcap bridge is up we can re-enable the firewall IF we
    * add an exception for the control port on the Tap adapter.
@@ -2344,7 +2344,7 @@
   waitforit(&pi);
 
   linfo ("Tor VM closed, restoring host network and services.");
-  dispmsg("Shutting down...");
+  dispmsg("Shutting down.");
   dispmsg("CAUTION: Do NOT close this window while restoring network settings!");
 
   if (bundle) {

More information about the tor-commits mailing list