[or-cvs] r19008: {torvm} Change bundle default to normal vidalia, fix launch of torvm (in torvm/trunk/build/win32: patches src/pkg)
coderman at seul.org
coderman at seul.org
Sun Mar 15 07:05:36 UTC 2009
Author: coderman
Date: 2009-03-15 03:05:36 -0400 (Sun, 15 Mar 2009)
New Revision: 19008
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
Log:
Change bundle default to normal vidalia, fix launch of torvm.exe with bundle option at end of install.
Modified: torvm/trunk/build/win32/patches/vidalia-torvm.patch
===================================================================
--- torvm/trunk/build/win32/patches/vidalia-torvm.patch 2009-03-15 05:36:08 UTC (rev 19007)
+++ torvm/trunk/build/win32/patches/vidalia-torvm.patch 2009-03-15 07:05:36 UTC (rev 19008)
@@ -1,3 +1,15 @@
+diff -Naur a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2009-03-04 23:38:18.848228000 +0000
++++ b/CMakeLists.txt 2009-03-15 06:58:51.369290512 +0000
+@@ -13,7 +13,7 @@
+
+ set(VER_MAJOR "0")
+ set(VER_MINOR "2")
+-set(VER_PATCH "0")
++set(VER_PATCH "1")
+ set(VERSION "${VER_MAJOR}.${VER_MINOR}.${VER_PATCH}-svn")
+ message(STATUS "Configuring Vidalia ${VERSION}")
+ project(Vidalia)
diff -Naur a/pkg/win32/polipo.conf b/pkg/win32/polipo.conf
--- a/pkg/win32/polipo.conf 2008-04-06 00:00:07.066809000 +0000
+++ b/pkg/win32/polipo.conf 2009-03-07 12:47:21.712807024 +0000
@@ -31,7 +43,7 @@
### HTTP
diff -Naur a/pkg/win32/vidalia.wxs.in b/pkg/win32/vidalia.wxs.in
--- a/pkg/win32/vidalia.wxs.in 2009-02-24 05:46:46.615879000 +0000
-+++ b/pkg/win32/vidalia.wxs.in 2009-03-13 15:44:34.818550312 +0000
++++ b/pkg/win32/vidalia.wxs.in 2009-03-15 07:01:31.639925672 +0000
@@ -1,334 +1,371 @@
<?xml version="1.0" encoding="Windows-1252" ?>
<!--
@@ -61,23 +73,23 @@
+ <?define VidaliaBundleVersion="bundle- at VERSION@" ?>
+ <?define UpgradeCode="147903e8-fa6f-47f0-bf97-b7250337b2b7" ?>
+
-+ <?define CurrProductGUID="0a57c31b-6cce-4bd0-b3ef-652a6cceb914" ?>
-+ <?define CurrExecutableGUID="737794bc-3662-4f12-9755-86568c3164e0" ?>
-+ <?define CurrQtLibsGUID="90548e2f-390e-4b93-b844-24ee75a83d4e" ?>
-+ <?define CurrCryptoLibsGUID="d887b89a-984f-4301-9f18-7811361372d3" ?>
-+ <?define CurrMingwLibsGUID="86b879cf-306f-438e-b38f-b9e6d74152cb" ?>
-+ <?define CurrGeoIPCacheGUID="8686ff7a-d812-44db-8c11-b94478495096" ?>
-+ <?define CurrPolipoConfigGUID="2151ad60-10ce-4e91-ab44-d1895d3b001d" ?>
-+ <?define CurrMarblePluginGUID="0212a411-960d-4729-b03b-3c95777a4551" ?>
-+ <?define CurrPluginDataDirGUID="e72719f3-e92c-4b2c-a8bb-4865436f5734" ?>
-+ <?define CurrPluginImageFormatsGUID="26ad5c24-249d-4619-be36-fb701e5b3f81" ?>
-+ <?define CurrDocumentsGUID="abfaae86-352e-4b63-b9b3-c222936f24b3" ?>
-+ <?define CurrConfigFileGUID="4428ffd8-710d-4550-b51d-16e69e073981" ?>
-+ <?define CurrStartMenuGUID="69d3f4bb-755c-4ade-aeb1-771fd5f8ba60" ?>
-+ <?define CurrDesktopGUID="65ff7a92-7e27-4d20-b925-8b86387bc56c" ?>
-+ <?define CurrDocsOnDesktopGUID="1e141231-e111-4567-94a6-7f42def8a516" ?>
-+ <?define CurrStartupGUID="6073bd5b-8eee-465e-9eca-f1ec7c6ddd67" ?>
-+ <?define CurrLocalProgramsGUID="24aaf630-09aa-45ef-a3cc-4088302b3488" ?>
++ <?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 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-03-15 05:36:08 UTC (rev 19007)
+++ torvm/trunk/build/win32/src/pkg/bundle.nsi 2009-03-15 07:05:36 UTC (rev 19008)
@@ -10,7 +10,7 @@
SetCompressor /SOLID BZIP2
RequestExecutionLevel admin
OutFile ${INSTALLER}
-InstallDir "$PROGRAMFILES\TorVMInstPkgs"
+InstallDir "$PROGRAMFILES\TorInstPkgs"
SetOverWrite on
Name "Tor VM ${VERSION} Bundle"
Caption "Tor VM ${VERSION} Bundle Setup"
@@ -45,20 +45,20 @@
File "torbutton.msi"
File "thandy.msi"
File "polipo.msi"
- File "vidalia-marble.msi"
+ File "vidalia.msi"
FunctionEnd
Function RunInstallers
- ExecWait 'msiexec /i "$INSTDIR\license.msi" /qn'
ExecWait 'msiexec /i "$INSTDIR\torvm.msi" BUNDLE=1 /qn'
+ ExecWait 'msiexec /i "$INSTDIR\vidalia.msi" NOSC=1 /qn'
ExecWait 'msiexec /i "$INSTDIR\thandy.msi" NOSC=1 /qn'
ExecWait 'msiexec /i "$INSTDIR\polipo.msi" NOSC=1 /qn'
ExecWait 'msiexec /i "$INSTDIR\torbutton.msi" /qn'
- ExecWait 'msiexec /i "$INSTDIR\vidalia-marble.msi" NOSC=1 /qn'
+ ExecWait 'msiexec /i "$INSTDIR\license.msi" NOSC=1 /qn'
FunctionEnd
Function LaunchTorVM
SetOutPath "$PROGRAMFILES\Tor VM"
- Exec 'torvm.exe'
+ Exec 'torvm.exe --bundle'
FunctionEnd
Modified: torvm/trunk/build/win32/src/pkg/license.wxs
===================================================================
--- torvm/trunk/build/win32/src/pkg/license.wxs 2009-03-15 05:36:08 UTC (rev 19007)
+++ torvm/trunk/build/win32/src/pkg/license.wxs 2009-03-15 07:05:36 UTC (rev 19008)
@@ -10,12 +10,12 @@
<Product Name="Tor License Documents $(var.ThisProductVersionDisp)" Id="$(var.CurrProductGUID)"
Language="!(loc.LCID)"
Version="$(var.ThisProductVersion)"
- Manufacturer="www.torproject.org"
+ Manufacturer="https://www.torproject.org"
UpgradeCode="$(var.UpgradeCode)">
<Package Id="*" Keywords="Installer"
Description="Tor License $(var.ThisProductVersionDisp) Installer"
- Manufacturer="www.torproject.org"
+ Manufacturer="https://www.torproject.org"
InstallerVersion="200" Compressed="yes"
InstallPrivileges="limited" />
Modified: torvm/trunk/build/win32/src/pkg/netinst.nsi
===================================================================
--- torvm/trunk/build/win32/src/pkg/netinst.nsi 2009-03-15 05:36:08 UTC (rev 19007)
+++ torvm/trunk/build/win32/src/pkg/netinst.nsi 2009-03-15 07:05:36 UTC (rev 19008)
@@ -10,7 +10,7 @@
SetCompressor /SOLID BZIP2
RequestExecutionLevel admin
OutFile ${INSTALLER}
-InstallDir "$TEMP\TorVMInstTmp"
+InstallDir "$PROGRAMFILES\TorInstPkgs"
SetOverWrite on
Name "Tor VM Network Installer"
Caption "Tor VM Network Installer"
@@ -45,19 +45,19 @@
FunctionEnd
Function RunInstallers
- ExecWait 'msiexec /i "$INSTDIR\license.msi" /qn'
ExecWait 'msiexec /i "$INSTDIR\thandy.msi" NOSC=1 /qn'
+ ExecWait 'msiexec /i "$INSTDIR\license.msi" NOSC=1 /qn'
ExecWait '"$PROGRAMFILES\Thandy\thandy.exe" update "--repo=$PROGRAMFILES\Thandy\TorVM Updates" /bundleinfo/torvm/win32/'
ExecWait '"$PROGRAMFILES\Thandy\thandy.exe" update "--repo=$PROGRAMFILES\Thandy\Polipo Updates" /bundleinfo/polipo/win32/'
ExecWait '"$PROGRAMFILES\Thandy\thandy.exe" update "--repo=$PROGRAMFILES\Thandy\TorButton Updates" /bundleinfo/torbutton/win32/'
- ExecWait '"$PROGRAMFILES\Thandy\thandy.exe" update "--repo=$PROGRAMFILES\Thandy\Vidalia Marble Updates" /bundleinfo/vidalia-marble/win32/'
+ ExecWait '"$PROGRAMFILES\Thandy\thandy.exe" update "--repo=$PROGRAMFILES\Thandy\Vidalia Updates" /bundleinfo/vidalia/win32/'
ExecWait '"$PROGRAMFILES\Thandy\thandy.exe" update --install "--repo=$PROGRAMFILES\Thandy\TorVM Updates" /bundleinfo/torvm/win32/'
ExecWait '"$PROGRAMFILES\Thandy\thandy.exe" update --install "--repo=$PROGRAMFILES\Thandy\Polipo Updates" /bundleinfo/polipo/win32/'
ExecWait '"$PROGRAMFILES\Thandy\thandy.exe" update --install "--repo=$PROGRAMFILES\Thandy\TorButton Updates" /bundleinfo/torbutton/win32/'
- ExecWait '"$PROGRAMFILES\Thandy\thandy.exe" update --install "--repo=$PROGRAMFILES\Thandy\Vidalia Marble Updates" /bundleinfo/vidalia-marble/win32/'
+ ExecWait '"$PROGRAMFILES\Thandy\thandy.exe" update --install "--repo=$PROGRAMFILES\Thandy\Vidalia Updates" /bundleinfo/vidalia/win32/'
FunctionEnd
Function LaunchTorVM
SetOutPath "$PROGRAMFILES\Tor VM"
- Exec 'torvm.exe'
+ Exec 'torvm.exe --bundle'
FunctionEnd
Modified: torvm/trunk/build/win32/src/pkg/torvm.wxs
===================================================================
--- torvm/trunk/build/win32/src/pkg/torvm.wxs 2009-03-15 05:36:08 UTC (rev 19007)
+++ torvm/trunk/build/win32/src/pkg/torvm.wxs 2009-03-15 07:05:36 UTC (rev 19008)
@@ -14,7 +14,7 @@
<Product Name="Tor VM $(var.ThisProductVersionDisp)" Id="$(var.CurrProductGUID)"
Language="!(loc.LCID)"
Version="$(var.ThisProductVersion)"
- Manufacturer="www.torproject.org"
+ Manufacturer="https://www.torproject.org"
UpgradeCode="$(var.UpgradeCode)">
<Package Id="*" Keywords="Installer"
@@ -109,7 +109,7 @@
<RegistryKey Root="HKCU"
Key="Software\Microsoft\Windows\CurrentVersion\Run"
Action="createAndRemoveOnUninstall">
- <RegistryValue Name="Tor VM" Value='"[ProgramsInstDir]vidalia.exe"' Type="string" />
+ <RegistryValue Name="Tor VM" Value='"[ProgramsInstDir]torvm.exe"' Type="string" />
</RegistryKey>
</Component>
</Directory>
More information about the tor-commits
mailing list