[or-cvs] r17409: {tor} fix a few typos, clean up whitespace in comments (tor/trunk/contrib)
arma at seul.org
arma at seul.org
Sat Nov 29 12:09:05 UTC 2008
Author: arma
Date: 2008-11-29 07:09:05 -0500 (Sat, 29 Nov 2008)
New Revision: 17409
Modified:
tor/trunk/contrib/tor.wxs.in
Log:
fix a few typos, clean up whitespace in comments
Modified: tor/trunk/contrib/tor.wxs.in
===================================================================
--- tor/trunk/contrib/tor.wxs.in 2008-11-29 12:05:04 UTC (rev 17408)
+++ tor/trunk/contrib/tor.wxs.in 2008-11-29 12:09:05 UTC (rev 17409)
@@ -1,22 +1,25 @@
<?xml version="1.0" encoding="Windows-1252" ?>
<!--
- 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.
+ 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.
+ 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 contrib/*.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.
- misexec /i tor.msi INSTALLDIR=C:\path\to\install\to /qn
+ msiexec /i tor.msi INSTALLDIR=C:\path\to\install\to /qn
A repair operation can be performed with /f and remove via /x
- More msiexec command line details at: http://technet.microsoft.com/en-us/library/cc759262.aspx
+ More msiexec command line details at:
+ http://technet.microsoft.com/en-us/library/cc759262.aspx
-->
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<Product
@@ -26,9 +29,11 @@
Version="0.2.1.7"
Manufacturer="The Tor Project, Inc."
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.
+
+ <!-- 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="*"
@@ -52,8 +57,9 @@
Value="Tor Installation"
/>
- <!-- Most of the installation directives are for populating the "Program Files" directory
- with the Tor binaries, dynamic link libraries, configuration files, and other documents.
+ <!-- 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="ProgramFilesFolder" Name="ProgramFilesDir">
@@ -71,8 +77,9 @@
</Component>
<!-- 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.
+ 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="1dae9705-0bef-4588-be36-d8a5df5e47cc">
<File
@@ -91,7 +98,8 @@
</Component>
<!-- Tor OpenSSL shared libraries
- This optional component is required for shared builds of Tor. For static builds it is ignored.
+ This optional component is required for shared builds
+ of Tor. For static builds it is ignored.
-->
<Component Id="OpenSSLLibrary" Guid="4d99fd44-dc24-46c6-8825-25b9e5916b85">
<File
@@ -109,7 +117,8 @@
</Component>
<!-- msys shared libraries
- This optional component is required for shared builds of Tor. For static builds it is ignored.
+ This optional component is required for shared builds
+ of Tor. For static builds it is ignored.
-->
<Component Id="MSYSLibrary" Guid="451ffc02-2666-410e-984f-35fb303b05a2">
<File
@@ -157,7 +166,8 @@
</Directory>
<!-- Create shortcuts if requested
- Remember that shortcuts must always be tied to a "key" registry value for proper repair and removal.
+ 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">
@@ -187,7 +197,8 @@
</Directory>
<!-- Current version registry info
- This value can be used by third party applications to query for the current version installed on the system.
+ This value can be used by third party applications to query
+ for the current version installed on the system.
-->
<Component Id="TorRegistry" Guid="575de318-a649-49fe-95e5-ee091f6cb8c6">
<RegistryKey Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\Tor"
@@ -199,8 +210,9 @@
</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
+ 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"
@@ -219,7 +231,8 @@
<ComponentRef Id="TorRegistry" />
</Feature>
- <!-- Shorcuts on the Start Menu and Desktop are optional but provided by default. -->
+ <!-- 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.">
@@ -237,7 +250,8 @@
</Feature>
<!-- Set the UI options
- Use a custom UI sequence to avoid EULA and other extraneous parts of Mondo and other GUIs
+ Use a custom UI sequence to avoid EULA and other extraneous
+ parts of Mondo and other GUIs
-->
<UIRef Id="WixUI_Tor" />
<Icon Id="tor.ico" SourceFile="contrib/tor.ico" />
More information about the tor-commits
mailing list