[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r3601: Move wxs files from tor/contrib to here for integration with (vidalia/trunk/pkg/win32)
Author: coderman
Date: 2009-03-06 07:22:28 -0500 (Fri, 06 Mar 2009)
New Revision: 3601
Added:
vidalia/trunk/pkg/win32/default-header.bmp
vidalia/trunk/pkg/win32/default-welcome.bmp
vidalia/trunk/pkg/win32/polipo.wxs.in
vidalia/trunk/pkg/win32/thandy.wxs.in
vidalia/trunk/pkg/win32/tor.wxs.in
vidalia/trunk/pkg/win32/torbutton.wxs.in
Modified:
vidalia/trunk/pkg/win32/CMakeLists.txt
Log:
Move wxs files from tor/contrib to here for integration with existing bundle translations and pootle tools.
Modified: vidalia/trunk/pkg/win32/CMakeLists.txt
===================================================================
--- vidalia/trunk/pkg/win32/CMakeLists.txt 2009-03-06 12:03:34 UTC (rev 3600)
+++ vidalia/trunk/pkg/win32/CMakeLists.txt 2009-03-06 12:22:28 UTC (rev 3601)
@@ -47,6 +47,26 @@
@ONLY
)
configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/polipo.wxs.in
+ ${CMAKE_CURRENT_BINARY_DIR}/polipo.wxs
+ @ONLY
+)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/thandy.wxs.in
+ ${CMAKE_CURRENT_BINARY_DIR}/thandy.wxs
+ @ONLY
+)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/torbutton.wxs.in
+ ${CMAKE_CURRENT_BINARY_DIR}/torbutton.wxs
+ @ONLY
+)
+configure_file(
+ ${CMAKE_CURRENT_SOURCE_DIR}/tor.wxs.in
+ ${CMAKE_CURRENT_BINARY_DIR}/tor.wxs
+ @ONLY
+)
+configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/WixUI_Custom.wxs
${CMAKE_CURRENT_BINARY_DIR}/WixUI_Custom.wxs
COPYONLY
Added: vidalia/trunk/pkg/win32/default-header.bmp
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/pkg/win32/default-header.bmp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/pkg/win32/default-welcome.bmp
===================================================================
(Binary files differ)
Property changes on: vidalia/trunk/pkg/win32/default-welcome.bmp
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Added: vidalia/trunk/pkg/win32/polipo.wxs.in
===================================================================
--- vidalia/trunk/pkg/win32/polipo.wxs.in (rev 0)
+++ vidalia/trunk/pkg/win32/polipo.wxs.in 2009-03-06 12:22:28 UTC (rev 3601)
@@ -0,0 +1,221 @@
+<?xml version="1.0" encoding="Windows-1252" ?>
+<!--
+ Copyright (C) 2008-2009 The Tor Project, Inc.
+ See LICENSE file for rights and terms.
+ -->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+ <?define ThisProductVersion="1.0.4" ?>
+ <?define ThisProductVersionDisp="1.0.4.1" ?>
+ <?define UpgradeCode="b45b9db8-8670-4546-8dd4-e9284ca81616" ?>
+
+ <?define CurrProductGUID="22c59fc2-8c94-4151-ad82-2c90bfa7ff99" ?>
+ <?define CurrExecutableGUID="cef195c5-817c-4963-a1f7-03e88c79985b" ?>
+ <?define CurrRegExLibsGUID="04b3e6f5-a4f3-4cc0-adb1-765c39050865" ?>
+ <?define CurrMingwLibsGUID="bd31ec38-27a3-415e-b19f-ccd61bc41d9a" ?>
+ <?define CurrDocumentsGUID="ff70f640-1a87-4eed-9897-277059e55c4f" ?>
+ <?define CurrConfigFileGUID="fbe1473f-de4d-4ca2-a8a4-66f3f92fff7d" ?>
+ <?define CurrStartMenuGUID="0b577f55-1ca5-43b8-9df2-3834843fc80b" ?>
+ <?define CurrDesktopGUID="0e7e07f2-b21b-49ea-a25e-569eae46e0ce" ?>
+ <?define CurrDocsOnDesktopGUID="783fb5f6-835d-4a81-988b-d46c683ac0e2" ?>
+ <?define CurrStartupGUID="60bc5fc3-74d2-4d7b-a659-8acebea93aa4" ?>
+ <?define CurrLocalProgramsGUID="e0c517aa-5eb7-4909-a23f-7fccd7fddeef" ?>
+
+ <Product Name="Polipo $(var.ThisProductVersionDisp)" Id="$(var.CurrProductGUID)"
+ Language="1033" Codepage="1252"
+ Version="$(var.ThisProductVersion)"
+ Manufacturer="mailto: coderman at gmail.com - test package for The Tor Project, Inc."
+ UpgradeCode="$(var.UpgradeCode)">
+
+ <Package Id="*" Keywords="Installer"
+ Description="Polipo $(var.ThisProductVersionDisp) Installer"
+ Manufacturer="mailto: coderman at gmail.com - test package for The Tor Project, Inc."
+ InstallerVersion="100" Compressed="yes"
+ Languages="1033" SummaryCodepage="1252"
+ InstallPrivileges="limited" />
+
+ <Media Id="1" Cabinet="Polipo.cab" CompressionLevel="high"
+ EmbedCab="yes" DiskPrompt="CD-ROM #1" />
+ <Property Id="DiskPrompt" Value="Polipo $(var.ThisProductVersionDisp) Installation Volume [1]" />
+ <Property Id="ALLUSERS" Secure="yes"/>
+ <Property Id="ReinstallModeText">omus</Property>
+
+ <!-- To avoid placing shortcuts all over the desktop / start menu during a
+ silent installation the NOSC=1 option can be passed to omit shortcuts.
+ This is useful if bundled with other applications like Vidalia that manage
+ configuration and Tor related processes themselves.
+ -->
+ <Property Id="NOSC" Secure="yes"/>
+
+ <!-- Associate this package with the upgrade code for this series
+ to ensure that upgrade installations by Thandy or other means work
+ as expected.
+ The OnlyDetect option must be false to ensure that existing files
+ from an older version are removed and replaced with current files.
+ -->
+ <Upgrade Id="$(var.UpgradeCode)">
+ <UpgradeVersion
+ Property="UPGRADEFOUND"
+ OnlyDetect="no"
+ Minimum="0.0.0"
+ IncludeMinimum="yes"
+ Maximum="$(var.ThisProductVersion)"
+ IncludeMaximum="no"
+ />
+ </Upgrade>
+
+
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="LocalAppDataFolder" Name="LocalAppData">
+ <Directory Id="LocalProgramsFolder" Name="Programs">
+
+ <!-- Until proper support for per-user installs is available we manage Programs folder.
+ Note that this directory will be left in place if it is in use by any other app.
+ -->
+ <Component Id="LocalProgramsFolderRef" Guid="$(var.CurrLocalProgramsGUID)">
+ <CreateFolder/>
+ <RemoveFolder Id="RemoveLocalProgramsFolder" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\Polipo" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="LocalProgramsFolderRef" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ </Component>
+
+ <Directory Id="LocalProgramsInstDir" Name="Polipo">
+
+ <!-- Main Polipo application files -->
+ <Component Id="PolipoExecutable" Guid="$(var.CurrExecutableGUID)">
+ <CreateFolder/>
+ <RemoveFolder Id="RemoveLocalProgramsInstDir" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\Polipo" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="Version" Value="$(var.ThisProductVersionDisp)" Type="string" KeyPath="yes" />
+ </RegistryKey>
+ <File Id="PolipoExe" DiskId="1"
+ Name="polipo.exe" Source="bin\polipo.exe" />
+ </Component>
+
+ <!-- MinGW-related library files -->
+ <Component Id="MinGWLibrary" Guid="$(var.CurrMingwLibsGUID)">
+ <RegistryKey Root="HKCU" Key="Software\Polipo" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="MinGWLibrary" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <File Id="MinGWDll" DiskId="1"
+ Name="mingwm10.dll" Source="bin\mingwm10.dll" />
+ </Component>
+
+ <!-- GNU RegEx library files -->
+ <Component Id="GnuRegExLibrary" Guid="$(var.CurrRegExLibsGUID)">
+ <RegistryKey Root="HKCU" Key="Software\Polipo" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="RegExLibrary" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <File Id="gnurxdll" DiskId="1"
+ Name="libgnurx-0.dll" Source="bin\libgnurx-0.dll" />
+ </Component>
+
+ </Directory>
+ </Directory>
+
+ <Directory Id="INSTALLDIR" Name="Polipo">
+ <Component Id="PolipoConfig" Guid="$(var.CurrConfigFileGUID)">
+ <CreateFolder/>
+ <RemoveFolder Id="RemoveINSTALLDIR" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\Polipo" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="ConfigFile" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <File
+ Id="PolipoConfigFile"
+ Name="config.txt"
+ Source="bin\polipo.conf"
+ Vital="yes"
+ ReadOnly="no"
+ DiskId="1">
+ <CopyFile
+ Id="PolipoSavedConfig"
+ DestinationName="save-cfg.txt"
+ />
+ </File>
+ </Component>
+
+ </Directory>
+ </Directory>
+
+ <Directory Id="ProgramMenuFolder" Name="Programs">
+ <Directory Id="ShortcutFolder" Name="Polipo">
+ <Component Id="AddPolipoToStartMenu" Guid="$(var.CurrStartMenuGUID)">
+ <Condition><![CDATA[NOSC <> 1]]> </Condition>
+ <RegistryKey Root="HKCU" Key="Software\Polipo" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="StartMenuShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="PolipoStartMenuShortcut"
+ Name="Polipo" Target="[LocalProgramsInstDir]polipo.exe"
+ Directory="ShortcutFolder" WorkingDirectory="LocalProgramsInstDir" />
+ <RemoveFolder Id="RemoveShortcutFolder" On="uninstall" />
+ </Component>
+ </Directory>
+ </Directory>
+
+ <Directory Id="DesktopFolder" Name="Desktop">
+ <Component Id="AddPolipoToDesktop" Guid="$(var.CurrDesktopGUID)">
+ <Condition><![CDATA[NOSC <> 1]]> </Condition>
+ <RegistryKey Root="HKCU" Key="Software\Polipo" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="DesktopShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="PolipoDesktopShortcut"
+ Name="Polipo" Target="[LocalProgramsInstDir]polipo.exe"
+ Directory="DesktopFolder" WorkingDirectory="LocalProgramsInstDir" />
+ </Component>
+ </Directory>
+
+ <Component Id="AddToStartupItems" Guid="$(var.CurrStartupGUID)">
+ <Condition><![CDATA[NOSC <> 1]]> </Condition>
+ <RegistryKey Root="HKCU"
+ Key="Software\Microsoft\Windows\CurrentVersion\Run"
+ Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="Polipo" Value='"[LocalProgramsInstDir]polipo.exe"' Type="string" />
+ </RegistryKey>
+ </Component>
+ </Directory>
+
+ <!-- Build up the feature hierarchy -->
+ <Feature Id="Complete" Title="Polipo"
+ Level="1" Display="expand" ConfigurableDirectory="INSTALLDIR"
+ Description="Polipo is application that helps you control, monitor, and configure the Tor software.">
+ <Feature Id="MainApplication" Title="Polipo $(var.ThisProductVersionDisp)"
+ AllowAdvertise="no" Absent="disallow" Level="1"
+ Description="Main application">
+ <ComponentRef Id="LocalProgramsFolderRef" />
+ <ComponentRef Id="PolipoExecutable" />
+ <ComponentRef Id="MinGWLibrary" />
+ <ComponentRef Id="GnuRegExLibrary" />
+ <ComponentRef Id="PolipoConfig" />
+ </Feature>
+ <Feature Id="Shortcuts" Title="Shortcuts"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add a shortcut to Polipo to your Start menu or Desktop.">
+ <Feature Id="StartMenuShortcuts" Title="Add to Start menu"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add Polipo to your Start menu">
+ <ComponentRef Id="AddPolipoToStartMenu" />
+ </Feature>
+ <Feature Id="DesktopShortcuts" Title="Add to Desktop"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add Polipo to your Desktop">
+ <ComponentRef Id="AddPolipoToDesktop" />
+ </Feature>
+ <Feature Id="RunAtStartup" Title="Run at Startup"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Run Polipo automatically when your system starts">
+ <ComponentRef Id="AddToStartupItems" />
+ </Feature>
+ </Feature>
+ </Feature>
+
+ <!-- Upgrade installation sequence. -->
+ <InstallExecuteSequence>
+ <RemoveExistingProducts After="InstallValidate" />
+ </InstallExecuteSequence>
+
+ <!-- Set the UI options -->
+ <UIRef Id="WixUI_Custom" />
+ <WixVariable Id="WixUIBannerBmp" Value="default-header.bmp" />
+ <WixVariable Id="WixUIDialogBmp" Value="default-welcome.bmp" />
+ </Product>
+</Wix>
Added: vidalia/trunk/pkg/win32/thandy.wxs.in
===================================================================
--- vidalia/trunk/pkg/win32/thandy.wxs.in (rev 0)
+++ vidalia/trunk/pkg/win32/thandy.wxs.in 2009-03-06 12:22:28 UTC (rev 3601)
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="Windows-1252" ?>
+<!--
+ Copyright (C) 2008-2009 The Tor Project, Inc.
+ See LICENSE file for rights and terms.
+ -->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+ <?define ThisProductVersion="0.0.1" ?>
+ <?define ThisProductVersionDisp="0.0.1" ?>
+ <?define UpgradeCode="d0465b47-1872-4766-874d-add2a320687e" ?>
+
+ <?define CurrProductGUID="7aef0490-9ba5-40c2-9d33-4353063c475e" ?>
+ <?define CurrExecutableGUID="8609afe7-c272-48ce-a6a3-ac80759b0c49" ?>
+ <?define CurrLocalProgramsGUID="c5971fba-b0bc-46e1-881c-a9139122a45d" ?>
+
+ <Product Name="Thandy $(var.ThisProductVersionDisp)" Id="$(var.CurrProductGUID)"
+ Language="1033" Codepage="1252"
+ Version="$(var.ThisProductVersion)"
+ Manufacturer="mailto: coderman at gmail.com - test package for The Tor Project, Inc."
+ UpgradeCode="$(var.UpgradeCode)">
+
+ <Package Id="*" Keywords="Installer"
+ Description="Thandy $(var.ThisProductVersionDisp) Installer"
+ Manufacturer="mailto: coderman at gmail.com - test package for The Tor Project, Inc."
+ InstallerVersion="100" Compressed="yes"
+ Languages="1033" SummaryCodepage="1252"
+ InstallPrivileges="limited" />
+
+ <Media Id="1" Cabinet="Thandy.cab" CompressionLevel="high"
+ EmbedCab="yes" DiskPrompt="CD-ROM #1" />
+ <Property Id="DiskPrompt" Value="Thandy $(var.ThisProductVersionDisp) Installation Volume [1]" />
+ <Property Id="ALLUSERS" Secure="yes"/>
+ <Property Id="ReinstallModeText">omus</Property>
+
+ <!-- Associate this package with the upgrade code for this series
+ to ensure that upgrade installations by Thandy or other means work
+ as expected.
+ The OnlyDetect option must be false to ensure that existing files
+ from an older version are removed and replaced with current files.
+ -->
+ <Upgrade Id="$(var.UpgradeCode)">
+ <UpgradeVersion
+ Property="UPGRADEFOUND"
+ OnlyDetect="no"
+ Minimum="0.0.0"
+ IncludeMinimum="yes"
+ Maximum="$(var.ThisProductVersion)"
+ IncludeMaximum="no"
+ />
+ </Upgrade>
+
+
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="LocalAppDataFolder" Name="LocalAppData">
+ <Directory Id="LocalProgramsFolder" Name="Programs">
+
+ <!-- Until proper support for per-user installs is available we manage Programs folder.
+ Note that this directory will be left in place if it is in use by any other app.
+ -->
+ <Component Id="LocalProgramsFolderRef" Guid="$(var.CurrLocalProgramsGUID)">
+ <CreateFolder/>
+ <RemoveFolder Id="RemoveLocalProgramsFolder" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\Thandy" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="LocalProgramsFolderRef" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ </Component>
+
+ <Directory Id="INSTALLDIR" Name="Thandy">
+
+ <!-- Main Thandy application files -->
+ <Component Id="ThandyExecutable" Guid="$(var.CurrExecutableGUID)">
+ <CreateFolder/>
+ <RemoveFolder Id="RemoveINSTALLDIR" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\Thandy" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="Version" Value="$(var.ThisProductVersionDisp)" Type="string" KeyPath="yes" />
+ </RegistryKey>
+ <File Id="ThandyExe" DiskId="1"
+ Name="thandy.exe" Source="bin\Thandy.exe" />
+ </Component>
+
+ </Directory>
+ </Directory>
+ </Directory>
+ </Directory>
+
+ <!-- Build up the feature hierarchy -->
+ <Feature Id="Complete" Title="Thandy"
+ Level="1" Display="expand" ConfigurableDirectory="INSTALLDIR"
+ Description="Thandy is an automatic update client for Tor software.">
+ <Feature Id="MainApplication" Title="Thandy $(var.ThisProductVersionDisp)"
+ AllowAdvertise="no" Absent="disallow" Level="1"
+ Description="Main application">
+ <ComponentRef Id="LocalProgramsFolderRef" />
+ <ComponentRef Id="ThandyExecutable" />
+ </Feature>
+ </Feature>
+
+ <!-- Upgrade installation sequence. -->
+ <InstallExecuteSequence>
+ <RemoveExistingProducts After="InstallValidate" />
+ </InstallExecuteSequence>
+
+ <!-- Set the UI options -->
+ <UIRef Id="WixUI_Custom" />
+ <WixVariable Id="WixUIBannerBmp" Value="default-header.bmp" />
+ <WixVariable Id="WixUIDialogBmp" Value="default-welcome.bmp" />
+ </Product>
+</Wix>
Added: vidalia/trunk/pkg/win32/tor.wxs.in
===================================================================
--- vidalia/trunk/pkg/win32/tor.wxs.in (rev 0)
+++ vidalia/trunk/pkg/win32/tor.wxs.in 2009-03-06 12:22:28 UTC (rev 3601)
@@ -0,0 +1,405 @@
+<?xml version="1.0" encoding="Windows-1252" ?>
+<!--
+ Copyright (C) 2008-2009 The Tor Project, Inc.
+ See LICENSE file for rights and terms.
+
+ WiX is a Microsoft Installer tool that parses an installation
+ specification XML document and produces an MSI package for use on
+ updated Windows 2000 and newer systems.
+
+ The MSI package format provides some advantages over the existing NSIS
+ packages when used in an automated fashion. A modified version of
+ the Mondo UI installer is included without EULA and other unnecessary
+ dialogs. You must update the UIRef element below to change UI.
+
+ Compile MSI installer via WiX:
+ candle.exe *.wxs
+ light.exe *.wixobj -out tor.msi -ext C:\Path\to\Wix\bin\WixUIExtension.dll
+
+ A silent installation can be performed with a /quiet option passed.
+ msiexec /i tor.msi /log debug.txt /qn
+
+ A repair operation can be performed with /f and remove via /x
+
+ Language transforms can be explicitly set via TRANFORMS, for example:
+ msiexec /i tor.msi TRANSFORMS=:en
+
+ More msiexec command line details at:
+ http://technet.microsoft.com/en-us/library/cc759262.aspx
+ -->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+ <!-- Definitions for critical elements of this MSI package.
+ Note that the product version is compressed into a X.X.X format. If the four
+ element version is used, the last octet is ignored when comparing versions
+ for upgrade, thus forcing the use of the three element version format.
+ UpgradeCode must remain the same for all packages of this type regardless of
+ Product or Package ID's. This is how existing versions are located.
+ -->
+ <?define ThisProductVersion="2.1.12" ?>
+ <?define ThisProductVersionDisp="@VERSION@" ?>
+ <?define UpgradeCode="64323a0c-9712-4a7a-8db8-d3c5c0b963df" ?>
+ <?define TPI="The Tor Project, Inc." ?>
+
+ <!-- The remaining GUIDs are assigned to components or other variable
+ identifiers. Whenever a new package is built these values MUST be
+ modified for upgrades to work correctly! Note that future MSI packages should
+ re-use components that haven't changed to speed installation.
+ -->
+ <?define CurrTorProductGUID="cfe3de89-4407-4af2-ac2c-4443bd68a61b" ?>
+ <?define CurrTorExecutableGUID="9c3db54b-05d7-4800-a84c-569105f99b93" ?>
+ <?define CurrTorSvcLinksGUID="4ef7f1e7-282f-4540-93a1-dbe66326d8f2" ?>
+ <?define CurrOpenSSLLibraryGUID="bf2b03ec-f86b-4e71-b59d-268a7b21eb4a" ?>
+ <?define CurrTorDocumentsGUID="46abcd7a-3ff2-45c8-9e58-120cb60d8291" ?>
+ <?define CurrTorConfigFileGUID="994cc2a2-63f9-44f9-950d-4012fd79e945" ?>
+ <?define CurrTorGeoIPFileGUID="0934c295-8d97-4588-924a-9572e7334f59" ?>
+ <?define CurrAddTorToStartMenuGUID="0cb459e2-1c31-4dca-a143-badbb2273170" ?>
+ <?define CurrAddTorToDesktopGUID="a5aee150-186c-4db6-90be-faba50bb0d49" ?>
+ <?define CurrAddTorDocsToDesktopGUID="1b5bd78c-bb4d-4271-a2c4-aeb409aa1774" ?>
+ <?define CurrAddTorEditConfToDesktopGUID="5fef2413-86ad-4ee5-a843-c4432051820c" ?>
+ <?define CurrLocalProgramsGUID="25f95ae1-70f9-4ef4-b709-3412a31f5248" ?>
+
+ <Product
+ Name="Tor $(var.ThisProductVersionDisp)"
+ Id="$(var.CurrTorProductGUID)"
+ UpgradeCode="$(var.UpgradeCode)"
+ Version="$(var.ThisProductVersion)"
+ Manufacturer="$(var.TPI)"
+ Language="1033" Codepage="1252">
+
+ <!-- Common package definitions. Most of these elements are self
+ explanatory or do not need modification.
+ Note that there is no support for signature verification nor
+ patched upgrades at this time.
+ -->
+ <Package
+ Id="*"
+ Keywords="Tor,Installer"
+ Description="Tor $(var.ThisProductVersionDisp) Installer"
+ Manufacturer="$(var.TPI)"
+ Compressed="yes"
+ InstallerVersion="100"
+ Languages="1033"
+ SummaryCodepage="1252"
+ InstallPrivileges="limited"
+ />
+ <Media Id="1"
+ Cabinet="Tor.cab"
+ CompressionLevel="high"
+ EmbedCab="yes"
+ DiskPrompt="na"
+ />
+
+ <!-- Associate this package with the upgrade code for this series
+ to ensure that upgrade installations by Thandy or other means work
+ as expected.
+ The OnlyDetect option must be false to ensure that existing files
+ from an older version are removed and replaced with current files.
+ -->
+ <Upgrade Id="$(var.UpgradeCode)">
+ <UpgradeVersion
+ Property="UPGRADEFOUND"
+ OnlyDetect="no"
+ Minimum="0.0.1"
+ IncludeMinimum="yes"
+ Maximum="$(var.ThisProductVersion)"
+ IncludeMaximum="no"
+ />
+ </Upgrade>
+
+ <!-- for now force per-user installation until run as service is completed. -->
+ <Property Id="ALLUSERS" Secure="yes"/>
+
+ <!-- To avoid placing shortcuts all over the desktop / start menu during a
+ silent installation the NOSC=1 option can be passed to omit shortcuts.
+ This is useful if bundled with other applications like Vidalia that manage
+ configuration and Tor related processes themselves.
+ -->
+ <Property Id="NOSC" Secure="yes"/>
+
+ <!-- Properties used to control installation or repair features
+ and other invocation options.
+ -->
+ <Property Id="ReinstallModeText">omus</Property>
+ <Property Id="DiskPrompt">Tor Installation</Property>
+
+ <!-- Support for service type Tor installations (soon). -->
+ <Property Id="SVCINSTALL">0</Property>
+ <Property Id="SERVICENAME">Tor</Property>
+ <Property Id="SERVICEINTERNALNAME">Tor</Property>
+ <Property Id="EXISTING_TOR_SERVICE_PATH">
+ <RegistrySearch
+ Id="ExistingTorService"
+ Root="HKLM"
+ Key="System\CurrentControlSet\Services\[SERVICEINTERNALNAME]"
+ Name="TorSvcPath"
+ Type="raw"
+ />
+ </Property>
+
+ <!-- Most of the installation directives are for populating the
+ "Program Files" directory with the Tor binaries, dynamic link
+ libraries, configuration files, and other documents.
+ -->
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="LocalAppDataFolder" Name="LocalAppData">
+ <Directory Id="LocalProgramsFolder" Name="Programs">
+
+ <!-- Until proper support for per-user installs is available we manage Programs folder.
+ Note that this directory will be left in place if it is in use by any other app.
+ -->
+ <Component Id="LocalProgramsFolderRef" Guid="$(var.CurrLocalProgramsGUID)">
+ <CreateFolder/>
+ <RemoveFolder Id="RemoveLocalProgramsFolder" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="LocalProgramsFolderRef" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ </Component>
+
+ <Directory Id="LocalProgramsInstDir" Name="Tor">
+ <!-- Tor application file -->
+ <Component Id="TorExecutable" Guid="$(var.CurrTorExecutableGUID)">
+ <CreateFolder/>
+ <RemoveFolder Id="RemoveLocalProgramsInstDir" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="Version" Value="$(var.ThisProductVersionDisp)" Type="string" KeyPath="yes" />
+ </RegistryKey>
+ <File
+ Id="TorExe"
+ Name="Tor.exe"
+ Source="bin/tor.exe"
+ Vital="yes"
+ DiskId="1"
+ />
+ </Component>
+
+ <!-- Tor OpenSSL shared libraries
+ This optional component is required for shared builds
+ of Tor. For static builds it is ignored.
+ -->
+ <Component Id="OpenSSLLibrary" Guid="$(var.CurrOpenSSLLibraryGUID)">
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="UserSSLLibrary" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <File
+ Id="cryptoeay32dll"
+ Name="cryptoeay32-0.9.8.dll"
+ Source="bin/cryptoeay32-0.9.8.dll"
+ DiskId="1"
+ />
+ <File
+ Id="ssleay32dll"
+ Name="ssleay32-0.9.8.dll"
+ Source="bin/ssleay32-0.9.8.dll"
+ DiskId="1"
+ />
+ </Component>
+ </Directory>
+ </Directory>
+
+ <Directory Id="INSTALLDIR" Name="Tor">
+ <!-- Tor configuration files
+ The sample config is always kept up to date and the torrc
+ is left as is if it exists and copied from the sample
+ config otherwise.
+ -->
+ <Component Id="TorConfigFile" Guid="$(var.CurrTorConfigFileGUID)">
+ <CreateFolder/>
+ <RemoveFolder Id="RemoveINSTALLDIR" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="UserConfigFile" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <File
+ Id="TorSampleConfig"
+ Name="torrc-example.txt"
+ Source="torrc.sample"
+ Vital="yes"
+ ReadOnly="no"
+ DiskId="1"
+ >
+ <CopyFile
+ Id="TorConfig"
+ DestinationName="torrc.txt"
+ />
+ </File>
+ </Component>
+
+ <!-- GeoIP data file. This is an optional component. -->
+ <Component Id="TorGeoIPFile" Guid="$(var.CurrTorGeoIPFileGUID)">
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="UserGeoIPFile" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <File
+ Id="GeoIPFile"
+ Name="geoip"
+ Source="geoip"
+ Vital="no"
+ ReadOnly="yes"
+ DiskId="1"
+ />
+ </Component>
+
+ <!-- Tor docs. unix2dos.exe on each text file is recommended for win32 packages. -->
+ <Directory Id="TorDocsDirectory" Name="docs">
+ <Component Id="TorDocuments" Guid="$(var.CurrTorDocumentsGUID)">
+ <CreateFolder/>
+ <RemoveFolder Id="RemoveTorDocsDirectory" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="UserDocs" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <File
+ Id="TorReadme"
+ Name="README.txt"
+ Source="README"
+ DiskId="1"
+ />
+ <!-- HTML generated via: groff -man doc/tor.1 -T html > Usage.html -->
+ <File
+ Id="TorUsage"
+ Name="Usage.html"
+ Source="Usage.html"
+ DiskId="1"
+ />
+ <File
+ Id="TorAuthors"
+ Name="Authors.txt"
+ Source="Authors"
+ DiskId="1"
+ />
+ <File
+ Id="TorChangelog"
+ Name="ChangeLog.txt"
+ Source="ChangeLog"
+ DiskId="1"
+ />
+ <File
+ Id="TorLicense"
+ Name="LICENSE.txt"
+ Source="LICENSE"
+ DiskId="1"
+ />
+ </Component>
+ </Directory>
+ </Directory>
+ </Directory>
+
+ <!-- Create shortcuts if requested
+ Remember that shortcuts must always be tied to a "key"
+ registry value for proper repair and removal.
+ -->
+ <Directory Id="ProgramMenuFolder" Name="Programs">
+ <Directory Id="ShortcutFolder" Name="Tor">
+ <Component Id="AddTorToStartMenu" Guid="$(var.CurrAddTorToStartMenuGUID)">
+ <Condition><![CDATA[NOSC <> 1]]> </Condition>
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="StartMenuShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="TorStartMenuShortcut"
+ Name="Tor" Target="[LocalProgramsInstDir]tor.exe"
+ Directory="ShortcutFolder" WorkingDirectory="LocalProgramsInstDir"
+ Icon="tor.ico" IconIndex="0" />
+ <RemoveFolder Id="RemoveShortcutFolder" On="uninstall" />
+ </Component>
+ </Directory>
+ </Directory>
+
+ <Directory Id="DesktopFolder" Name="Desktop">
+ <Component Id="AddTorToDesktop" Guid="$(var.CurrAddTorToDesktopGUID)">
+ <Condition><![CDATA[NOSC <> 1]]> </Condition>
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="DesktopShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="TorDesktopShortcut"
+ Name="Tor" Target="[LocalProgramsInstDir]tor.exe"
+ Directory="DesktopFolder" WorkingDirectory="LocalProgramsInstDir"
+ Icon="tor.ico" IconIndex="0" />
+ </Component>
+ <Component Id="AddTorDocsToDesktop" Guid="$(var.CurrAddTorDocsToDesktopGUID)">
+ <Condition><![CDATA[NOSC <> 1]]> </Condition>
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="DesktopDocsShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="TorDocsDesktopShortcut"
+ Name="Tor Docs" Target="[TorDocsDirectory]"
+ Directory="DesktopFolder" WorkingDirectory="INSTDIR" />
+ </Component>
+ <Component Id="AddTorEditConfToDesktop" Guid="$(var.CurrAddTorEditConfToDesktopGUID)">
+ <Condition><![CDATA[NOSC <> 1]]> </Condition>
+ <RegistryKey Root="HKCU" Key="Software\Tor" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="DesktopEditConfShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="TorEditConfDesktopShortcut"
+ Name="Edit Tor Config"
+ Target="[WindowsFolder]notepad.exe"
+ Arguments="[INSTALLDIR]torrc.txt"
+ Directory="DesktopFolder" WorkingDirectory="INSTDIR" />
+ </Component>
+ </Directory>
+ </Directory>
+
+ <!-- Define list of application features available for install
+ There are two main sections to this list. The "MainApplication"
+ section which defines a core set of mandatory files and setup
+ and the other optional components like shortcuts which are not
+ required for functional installation.
+ -->
+ <Feature Id="Complete" Title="Tor"
+ Level="1" Display="expand" ConfigurableDirectory="INSTALLDIR"
+ Description="Tor is an implementation of Onion Routing. You can read more at https://www.torproject.org/";>
+
+ <!-- Core files and setup tasks that must always be included in installation -->
+ <Feature Id="MainApplication" Title="Tor Application"
+ AllowAdvertise="no" Absent="disallow" Level="1"
+ Description="Main Tor application">
+ <ComponentRef Id="LocalProgramsFolderRef" />
+ <ComponentRef Id="TorExecutable" />
+ <ComponentRef Id="TorConfigFile" />
+ <ComponentRef Id="TorGeoIPFile" />
+ <ComponentRef Id="OpenSSLLibrary" />
+ <ComponentRef Id="TorDocuments" />
+ </Feature>
+
+ <!-- Shortcuts on the Start Menu and Desktop are optional but
+ provided by default. -->
+ <Feature Id="Shortcuts" Title="Shortcuts"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add shortcuts to Tor.">
+
+ <Feature Id="StartMenuShortcuts" Title="Add Tor to Start menu"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add Tor to your Start menu">
+ <ComponentRef Id="AddTorToStartMenu" />
+ </Feature>
+ <Feature Id="DesktopShortcuts" Title="Add Tor shortcut to Desktop"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add shortcut to launch Tor on Desktop">
+ <ComponentRef Id="AddTorToDesktop" />
+ </Feature>
+ <Feature Id="DesktopDocsShortcuts" Title="Add Tor docs folder to Desktop"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add Tor documentation folder to Desktop">
+ <ComponentRef Id="AddTorDocsToDesktop" />
+ </Feature>
+ <Feature Id="DesktopEditConfShortcuts" Title="Edit Tor config shortcut on Desktop"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Edit Tor config file shortcut on Desktop">
+ <ComponentRef Id="AddTorEditConfToDesktop" />
+ </Feature>
+ </Feature>
+ </Feature>
+
+ <!-- Upgrade installation sequence. -->
+ <InstallExecuteSequence>
+ <RemoveExistingProducts After="InstallValidate" />
+ </InstallExecuteSequence>
+
+ <!-- Set the UI options
+ Use a custom UI sequence to avoid EULA and other extraneous
+ parts of Mondo and other GUIs
+ -->
+ <UIRef Id="WixUI_Custom" />
+ <Icon Id="tor.ico" SourceFile="tor.ico" />
+ <WixVariable Id="WixUIBannerBmp" Value="default-header.bmp" />
+ <WixVariable Id="WixUIDialogBmp" Value="default-welcome.bmp" />
+ </Product>
+</Wix>
+
Added: vidalia/trunk/pkg/win32/torbutton.wxs.in
===================================================================
--- vidalia/trunk/pkg/win32/torbutton.wxs.in (rev 0)
+++ vidalia/trunk/pkg/win32/torbutton.wxs.in 2009-03-06 12:22:28 UTC (rev 3601)
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="Windows-1252" ?>
+<!--
+ Copyright (C) 2008-2009 The Tor Project, Inc.
+ See LICENSE file for rights and terms.
+ -->
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi";>
+ <?define ThisProductVersion="1.2.0" ?>
+ <?define ThisProductVersionDisp="1.2.0" ?>
+ <?define UpgradeCode="e13a294d-6ac6-4ddd-a300-8ee8dee768c6" ?>
+
+ <?define CurrProductGUID="5c09de77-eceb-44b7-a9cc-7308ed7dd0fa" ?>
+ <?define CurrExtensionGUID="cb29b0ed-4fb0-4f69-ab87-98cc3ae96eec" ?>
+ <?define CurrStartMenuGUID="24cabe82-2fd6-408e-9af4-e3792cac9feb" ?>
+ <?define CurrDesktopGUID="c1352049-ec2e-4b72-ab34-313b20016e84" ?>
+
+ <Product Name="TorButton $(var.ThisProductVersionDisp)" Id="$(var.CurrProductGUID)"
+ Language="1033" Codepage="1252"
+ Version="$(var.ThisProductVersion)"
+ Manufacturer="mailto: coderman at gmail.com - test package for The Tor Project, Inc."
+ UpgradeCode="$(var.UpgradeCode)">
+
+ <Package Id="*" Keywords="Installer"
+ Description="TorButton $(var.ThisProductVersionDisp) Installer"
+ Manufacturer="mailto: coderman at gmail.com - test package for The Tor Project, Inc."
+ InstallerVersion="100" Compressed="yes"
+ Languages="1033" SummaryCodepage="1252"
+ InstallPrivileges="limited" />
+
+ <Media Id="1" Cabinet="TorButton.cab" CompressionLevel="high"
+ EmbedCab="yes" DiskPrompt="CD-ROM #1" />
+ <Property Id="DiskPrompt" Value="TorButton $(var.ThisProductVersionDisp) Installation Volume [1]" />
+ <Property Id="ALLUSERS" Secure="yes"/>
+ <Property Id="ReinstallModeText">omus</Property>
+
+ <!-- To avoid placing shortcuts all over the desktop / start menu during a
+ silent installation the NOSC=1 option can be passed to omit shortcuts.
+ This is useful if bundled with other applications like Vidalia that manage
+ configuration and Tor related processes themselves.
+ -->
+ <Property Id="NOSC" Secure="yes"/>
+
+ <!-- Associate this package with the upgrade code for this series
+ to ensure that upgrade installations by Thandy or other means work
+ as expected.
+ The OnlyDetect option must be false to ensure that existing files
+ from an older version are removed and replaced with current files.
+ -->
+ <Upgrade Id="$(var.UpgradeCode)">
+ <UpgradeVersion
+ Property="UPGRADEFOUND"
+ OnlyDetect="no"
+ Minimum="0.0.0"
+ IncludeMinimum="yes"
+ Maximum="$(var.ThisProductVersion)"
+ IncludeMaximum="no"
+ />
+ </Upgrade>
+
+
+ <Directory Id="TARGETDIR" Name="SourceDir">
+ <Directory Id="LocalAppDataFolder" Name="LocalAppData">
+
+ <Directory Id="INSTALLDIR" Name="TorButton">
+ <Component Id="TorButtonExtension" Guid="$(var.CurrExtensionGUID)">
+ <CreateFolder/>
+ <RemoveFolder Id="RemoveINSTALLDIR" On="uninstall" />
+ <RegistryKey Root="HKCU" Key="Software\TorButton" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="Version" Value="$(var.ThisProductVersion)" Type="string" KeyPath="yes" />
+ </RegistryKey>
+ <File
+ Id="TorButtonExtensionFile"
+ Name="torbutton.xpi"
+ Source="torbutton.xpi"
+ Vital="yes"
+ ReadOnly="no"
+ DiskId="1">
+ </File>
+ </Component>
+
+ </Directory>
+ </Directory>
+
+ <Directory Id="ProgramMenuFolder" Name="Programs">
+ <Directory Id="ShortcutFolder" Name="TorButton">
+ <Component Id="AddTorButtonToStartMenu" Guid="$(var.CurrStartMenuGUID)">
+ <Condition><![CDATA[NOSC <> 1]]> </Condition>
+ <RegistryKey Root="HKCU" Key="Software\TorButton" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="StartMenuShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="TorButtonStartMenuShortcut"
+ Name="Install TorButton" Target="[ProgramFilesFolder]Mozilla Firefox\firefox.exe"
+ Arguments="torbutton.xpi"
+ Directory="ShortcutFolder" WorkingDirectory="INSTALLDIR" />
+ <RemoveFolder Id="RemoveShortcutFolder" On="uninstall" />
+ </Component>
+ </Directory>
+ </Directory>
+
+ <Directory Id="DesktopFolder" Name="Desktop">
+ <Component Id="AddTorButtonToDesktop" Guid="$(var.CurrDesktopGUID)">
+ <Condition><![CDATA[NOSC <> 1]]> </Condition>
+ <RegistryKey Root="HKCU" Key="Software\TorButton" Action="createAndRemoveOnUninstall">
+ <RegistryValue Name="DesktopShortcut" Value="1" Type="integer" KeyPath="yes" />
+ </RegistryKey>
+ <Shortcut Id="TorButtonDesktopShortcut"
+ Name="Install TorButton" Target="[ProgramFilesFolder]Mozilla Firefox\firefox.exe"
+ Arguments="torbutton.xpi"
+ Directory="DesktopFolder" WorkingDirectory="INSTALLDIR" />
+ </Component>
+ </Directory>
+ </Directory>
+
+ <!-- Build up the feature hierarchy -->
+ <Feature Id="Complete" Title="TorButton"
+ Level="1" Display="expand" ConfigurableDirectory="INSTALLDIR"
+ Description="TorButton protects your FireFox browser while using the Tor network.">
+ <Feature Id="MainApplication" Title="TorButton $(var.ThisProductVersionDisp)"
+ AllowAdvertise="no" Absent="disallow" Level="1"
+ Description="Main application">
+ <ComponentRef Id="TorButtonExtension" />
+ </Feature>
+ <Feature Id="Shortcuts" Title="Shortcuts"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add a shortcut to TorButton to your Start menu or Desktop.">
+ <Feature Id="StartMenuShortcuts" Title="Add to Start menu"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add TorButton to your Start menu">
+ <ComponentRef Id="AddTorButtonToStartMenu" />
+ </Feature>
+ <Feature Id="DesktopShortcuts" Title="Add to Desktop"
+ AllowAdvertise="no" Absent="allow" Level="1"
+ Description="Add TorButton to your Desktop">
+ <ComponentRef Id="AddTorButtonToDesktop" />
+ </Feature>
+ </Feature>
+ </Feature>
+
+ <!-- Upgrade installation sequence. -->
+ <InstallExecuteSequence>
+ <RemoveExistingProducts After="InstallValidate" />
+ </InstallExecuteSequence>
+
+ <!-- Set the UI options -->
+ <UIRef Id="WixUI_Custom" />
+ <WixVariable Id="WixUIBannerBmp" Value="default-header.bmp" />
+ <WixVariable Id="WixUIDialogBmp" Value="default-welcome.bmp" />
+ </Product>
+</Wix>