You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@subversion.apache.org by "Hyrum K. Wright" <hy...@mail.utexas.edu> on 2008/08/16 04:08:29 UTC
Re: svn commit: r32501 - trunk/packages/windows-WiX/BuildSubversion
ebswift@tigris.org wrote:
> Author: ebswift
> Date: Fri Aug 15 21:02:58 2008
> New Revision: 32501
>
> Log:
> Update for 1.5.1 binaries. Modified bin folder structure to match the win32 binaries, added new files that were introduced in the new binary release.
I'm not familiar with the wxi format, and I didn't see 1.5.1 mentioned
explicitly in here anywhere, but is this something that could happen as part of
the rolling process? When we branch 1.6.x, this will be on that branch, and I
think we should attempt to do these updates on the branch as we release. It
could even happen pre-release, such as the bump of the version number.
Just some thoughts.
-Hyrum
> * ApacheFeature20x.wxi
> * ApacheFeature22x.wxi
> * ApacheFiles20x.wxi
> * ApacheFiles22x.wxi
> * BuildSubversion.wixproj
> * CommonBinaryFeature.wxi
> * CommonBinaryFiles.wxi
> * CommonSASLFiles.wxi
> * Files.wxs
> * LicensesCommon.wxi
> * LicensesCommonFeature.wxi
> * Setup.wxs
>
> Modified:
> trunk/packages/windows-WiX/BuildSubversion/ApacheFeature20x.wxi
> trunk/packages/windows-WiX/BuildSubversion/ApacheFeature22x.wxi
> trunk/packages/windows-WiX/BuildSubversion/ApacheFiles20x.wxi
> trunk/packages/windows-WiX/BuildSubversion/ApacheFiles22x.wxi
> trunk/packages/windows-WiX/BuildSubversion/BuildSubversion.wixproj
> trunk/packages/windows-WiX/BuildSubversion/CommonBinaryFeature.wxi
> trunk/packages/windows-WiX/BuildSubversion/CommonBinaryFiles.wxi
> trunk/packages/windows-WiX/BuildSubversion/CommonSASLFiles.wxi
> trunk/packages/windows-WiX/BuildSubversion/Files.wxs
> trunk/packages/windows-WiX/BuildSubversion/LicensesCommon.wxi
> trunk/packages/windows-WiX/BuildSubversion/LicensesCommonFeature.wxi
> trunk/packages/windows-WiX/BuildSubversion/Setup.wxs
>
> Modified: trunk/packages/windows-WiX/BuildSubversion/ApacheFeature20x.wxi
> URL: http://svn.collab.net/viewvc/svn/trunk/packages/windows-WiX/BuildSubversion/ApacheFeature20x.wxi?pathrev=32501&r1=32500&r2=32501
> ==============================================================================
> --- trunk/packages/windows-WiX/BuildSubversion/ApacheFeature20x.wxi Fri Aug 15 20:51:54 2008 (r32500)
> +++ trunk/packages/windows-WiX/BuildSubversion/ApacheFeature20x.wxi Fri Aug 15 21:02:58 2008 (r32501)
> @@ -22,5 +22,9 @@
> <ComponentRef Id="SvnserveExe"/>
> <ComponentRef Id="SvnsyncExe"/>
> <ComponentRef Id="SvnversionExe"/>
> + <ComponentRef Id="Svnmucc"/>
> + <ComponentRef Id="Svnpop"/>
> + <ComponentRef Id="Svnpush"/>
> + <ComponentRef Id="Svnauthval"/>
> <ComponentRef Id="READMETxtap20x"/>
> </Include>
> \ No newline at end of file
>
> Modified: trunk/packages/windows-WiX/BuildSubversion/ApacheFeature22x.wxi
> URL: http://svn.collab.net/viewvc/svn/trunk/packages/windows-WiX/BuildSubversion/ApacheFeature22x.wxi?pathrev=32501&r1=32500&r2=32501
> ==============================================================================
> --- trunk/packages/windows-WiX/BuildSubversion/ApacheFeature22x.wxi Fri Aug 15 20:51:54 2008 (r32500)
> +++ trunk/packages/windows-WiX/BuildSubversion/ApacheFeature22x.wxi Fri Aug 15 21:02:58 2008 (r32501)
> @@ -22,5 +22,9 @@
> <ComponentRef Id="SvnserveExe22x"/>
> <ComponentRef Id="SvnsyncExe22x"/>
> <ComponentRef Id="SvnversionExe22x"/>
> + <ComponentRef Id="Svnmucc22x"/>
> + <ComponentRef Id="Svnpop22x"/>
> + <ComponentRef Id="Svnpush22x"/>
> + <ComponentRef Id="Svnauthval22x"/>
> <ComponentRef Id="READMETxtap22x"/>
> </Include>
>
> Modified: trunk/packages/windows-WiX/BuildSubversion/ApacheFiles20x.wxi
> URL: http://svn.collab.net/viewvc/svn/trunk/packages/windows-WiX/BuildSubversion/ApacheFiles20x.wxi?pathrev=32501&r1=32500&r2=32501
> ==============================================================================
> --- trunk/packages/windows-WiX/BuildSubversion/ApacheFiles20x.wxi Fri Aug 15 20:51:54 2008 (r32500)
> +++ trunk/packages/windows-WiX/BuildSubversion/ApacheFiles20x.wxi Fri Aug 15 21:02:58 2008 (r32501)
> @@ -89,6 +89,22 @@
> <File Source="..\..\..\work\svn-win32-ap20x\bin\svnversion.exe" Name="svnversion.exe" Id="svnversion.exe" />
> <Condition>APACHEVERSION = "Apache20"</Condition>
> </Component>
> + <Component Guid="C48BC6A3-3789-4477-AB62-ABDB15E10664" Id="Svnmucc" DiskId="1">
> + <File Source="..\..\..\work\svn-win32-ap20x\bin\svnmucc.exe" Name="svnmucc.exe" Id="svnmucc.exe" />
> + <Condition>APACHEVERSION = "Apache20"</Condition>
> + </Component>
> + <Component Guid="8B8123F8-3CCB-4FD9-A238-5C8221C94E44" Id="Svnpop" DiskId="1">
> + <File Source="..\..\..\work\svn-win32-ap20x\bin\svn-populate-node-origins-index.exe" Name="svn-populate-node-origins-index.exe" Id="svnpopulatenodeoriginsindex.exe" />
> + <Condition>APACHEVERSION = "Apache20"</Condition>
> + </Component>
> + <Component Guid="EB638BAF-4FD9-4500-BA33-D20A4A728BE1" Id="Svnpush" DiskId="1">
> + <File Source="..\..\..\work\svn-win32-ap20x\bin\svn-push.exe" Name="svn-push.exe" Id="svnpush.exe" />
> + <Condition>APACHEVERSION = "Apache20"</Condition>
> + </Component>
> + <Component Guid="3F94F729-4184-447D-B266-43DD7CA5FBB3" Id="Svnauthval" DiskId="1">
> + <File Source="..\..\..\work\svn-win32-ap20x\bin\svnauthz-validate.exe" Name="svnauthz-validate.exe" Id="svnauthzvalidate.exe" />
> + <Condition>APACHEVERSION = "Apache20"</Condition>
> + </Component>
> <Component Guid="A58EE2D5-CADA-4233-947B-74CAE3779951" Id="READMETxtap20x" DiskId="1">
> <File Source="..\..\..\work\svn-win32-ap20x\README.txt" Name="README.txt" Id="flREADMEtxtap20x">
> <Shortcut Name="README" Id="readmesctap20x" Description="Subversion ReadMe" Directory="SubversionMenuFolder" Advertise="yes" Icon="readmeap20x.txt">
>
> Modified: trunk/packages/windows-WiX/BuildSubversion/ApacheFiles22x.wxi
> URL: http://svn.collab.net/viewvc/svn/trunk/packages/windows-WiX/BuildSubversion/ApacheFiles22x.wxi?pathrev=32501&r1=32500&r2=32501
> ==============================================================================
> --- trunk/packages/windows-WiX/BuildSubversion/ApacheFiles22x.wxi Fri Aug 15 20:51:54 2008 (r32500)
> +++ trunk/packages/windows-WiX/BuildSubversion/ApacheFiles22x.wxi Fri Aug 15 21:02:58 2008 (r32501)
> @@ -89,6 +89,22 @@
> <File Source="..\..\..\work\svn-win32-ap22x\bin\svnversion.exe" Name="svnversion.exe" Id="svnversion.exe22x" />
> <Condition>APACHEVERSION = "Apache22"</Condition>
> </Component>
> + <Component Guid="9AFBFBAC-8BDE-4919-92E7-6C7DD51A3A0A" Id="Svnmucc22x" DiskId="1">
> + <File Source="..\..\..\work\svn-win32-ap22x\bin\svnmucc.exe" Name="svnmucc.exe" Id="svnmucc.exe22x" />
> + <Condition>APACHEVERSION = "Apache22"</Condition>
> + </Component>
> + <Component Guid="40C123F9-D4A2-4BA1-B2DE-C6CEAA409ED4" Id="Svnpop22x" DiskId="1">
> + <File Source="..\..\..\work\svn-win32-ap22x\bin\svn-populate-node-origins-index.exe" Name="svn-populate-node-origins-index.exe" Id="svnpopulatenodeoriginsindex.exe22x" />
> + <Condition>APACHEVERSION = "Apache22"</Condition>
> + </Component>
> + <Component Guid="33F182D3-3628-42E7-A972-DB07BCFFB5D8" Id="Svnpush22x" DiskId="1">
> + <File Source="..\..\..\work\svn-win32-ap22x\bin\svn-push.exe" Name="svn-push.exe" Id="svnpush.exe22x" />
> + <Condition>APACHEVERSION = "Apache22"</Condition>
> + </Component>
> + <Component Guid="C7BBC2A1-4928-4DE6-A54B-BA065D935495" Id="Svnauthval22x" DiskId="1">
> + <File Source="..\..\..\work\svn-win32-ap22x\bin\svnauthz-validate.exe" Name="svnauthz-validate.exe" Id="svnauthzvalidate.exe22x" />
> + <Condition>APACHEVERSION = "Apache22"</Condition>
> + </Component>
> <Component Guid="34395389-E8B9-42E2-9232-D9CEBEF335A0" Id="READMETxtap22x" DiskId="1">
> <File Source="..\..\..\work\svn-win32-ap22x\README.txt" Name="README.txt" Id="flREADMEtxtap22x">
> <Shortcut Name="README" Id="readmesctap22x" Description="Subversion ReadMe" Directory="SubversionMenuFolder" Advertise="yes" Icon="readmeap22x.txt">
>
> Modified: trunk/packages/windows-WiX/BuildSubversion/BuildSubversion.wixproj
> URL: http://svn.collab.net/viewvc/svn/trunk/packages/windows-WiX/BuildSubversion/BuildSubversion.wixproj?pathrev=32501&r1=32500&r2=32501
> ==============================================================================
> --- trunk/packages/windows-WiX/BuildSubversion/BuildSubversion.wixproj Fri Aug 15 20:51:54 2008 (r32500)
> +++ trunk/packages/windows-WiX/BuildSubversion/BuildSubversion.wixproj Fri Aug 15 21:02:58 2008 (r32501)
> @@ -5,7 +5,7 @@ <Project ToolsVersion="3.5" DefaultTa
> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
> <OutputType>Package</OutputType>
> <RootNamespace>BuildSubversion</RootNamespace>
> - <OutputName>Setup-Subversion-1.5.0</OutputName>
> + <OutputName>Setup-Subversion-1.5.1</OutputName>
> <WixToolPath Condition=" '$(WixToolPath)' == '' ">$(SharpDevelopBinPath)\Tools\Wix</WixToolPath>
> <WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(WixToolPath)\wix.targets</WixTargetsPath>
> <WixTasksPath Condition=" '$(WixTasksPath)' == '' ">$(WixToolPath)\WixTasks.dll</WixTasksPath>
>
> Modified: trunk/packages/windows-WiX/BuildSubversion/CommonBinaryFeature.wxi
> URL: http://svn.collab.net/viewvc/svn/trunk/packages/windows-WiX/BuildSubversion/CommonBinaryFeature.wxi?pathrev=32501&r1=32500&r2=32501
> ==============================================================================
> --- trunk/packages/windows-WiX/BuildSubversion/CommonBinaryFeature.wxi Fri Aug 15 20:51:54 2008 (r32500)
> +++ trunk/packages/windows-WiX/BuildSubversion/CommonBinaryFeature.wxi Fri Aug 15 21:02:58 2008 (r32501)
> @@ -5,4 +5,8 @@
> <ComponentRef Id="Libeay32Dll"/>
> <ComponentRef Id="Ssleay32Dll"/>
> <ComponentRef Id="LibsaslDll"/>
> + <ComponentRef Id="OpensslEXE"/>
> + <ComponentRef Id="PlugVW"/>
> + <ComponentRef Id="SaslDB2"/>
> + <ComponentRef Id="SaslPW"/>
> </Include>
> \ No newline at end of file
>
> Modified: trunk/packages/windows-WiX/BuildSubversion/CommonBinaryFiles.wxi
> URL: http://svn.collab.net/viewvc/svn/trunk/packages/windows-WiX/BuildSubversion/CommonBinaryFiles.wxi?pathrev=32501&r1=32500&r2=32501
> ==============================================================================
> --- trunk/packages/windows-WiX/BuildSubversion/CommonBinaryFiles.wxi Fri Aug 15 20:51:54 2008 (r32500)
> +++ trunk/packages/windows-WiX/BuildSubversion/CommonBinaryFiles.wxi Fri Aug 15 21:02:58 2008 (r32501)
> @@ -15,6 +15,18 @@
> <Component Guid="540945A8-88AD-4427-AEEB-55B70F87DA2C" Id="Ssleay32Dll" DiskId="1">
> <File Source="..\..\..\work\svn-win32-ap20x\bin\ssleay32.dll" Name="ssleay32.dll" Id="ssleay32.dll" />
> </Component>
> + <Component Guid="18F16840-833E-4A81-9607-0CCDF2F94564" Id="OpensslEXE" DiskId="1">
> + <File Source="..\..\..\work\svn-win32-ap20x\bin\openssl.exe" Name="openssl.exe" Id="openssl.exe" />
> + </Component>
> + <Component Guid="9A0D7D07-08DA-45B2-8E73-470DD5AB1B7D" Id="PlugVW" DiskId="1">
> + <File Source="..\..\..\work\svn-win32-ap20x\bin\pluginviewer.exe" Name="pluginviewer.exe" Id="pluginviewer.exe" />
> + </Component>
> + <Component Guid="C0CC19EB-57C7-4256-A4BD-6BB026F1615B" Id="SaslDB2" DiskId="1">
> + <File Source="..\..\..\work\svn-win32-ap20x\bin\sasldblistusers2.exe" Name="sasldblistusers2.exe" Id="sasldblistusers2.exe" />
> + </Component>
> + <Component Guid="66B1636E-FA1D-4665-8BF2-987D110C310A" Id="SaslPW" DiskId="1">
> + <File Source="..\..\..\work\svn-win32-ap20x\bin\saslpasswd2.exe" Name="saslpasswd2.exe" Id="saslpasswd2.exe" />
> + </Component>
> <Component Guid="3516DB65-3E8F-48C1-ADCB-182914C4DB1B" Id="svnbookchm" DiskId="1">
> <File Source="..\..\..\SubversionTagSource\packages\windows-innosetup\in\doc\svn-book.chm" Name="svn-book.chm" Id="svnbookchmfl">
> <Shortcut Name="Subversion Documentation" Id="svnbooksct" Description="Subversion Documentation" Directory="SubversionMenuFolder" Advertise="yes" Icon="doc.chm">
>
> Modified: trunk/packages/windows-WiX/BuildSubversion/CommonSASLFiles.wxi
> URL: http://svn.collab.net/viewvc/svn/trunk/packages/windows-WiX/BuildSubversion/CommonSASLFiles.wxi?pathrev=32501&r1=32500&r2=32501
> ==============================================================================
> --- trunk/packages/windows-WiX/BuildSubversion/CommonSASLFiles.wxi Fri Aug 15 20:51:54 2008 (r32500)
> +++ trunk/packages/windows-WiX/BuildSubversion/CommonSASLFiles.wxi Fri Aug 15 21:02:58 2008 (r32501)
> @@ -1,24 +1,24 @@
> <?xml version="1.0" encoding="utf-8"?>
> <Include>
> <Component Guid="6B649B76-F991-4F91-931C-28A3D2835EA1" Id="saslanon" DiskId="1">
> - <File Source="..\..\..\work\svn-win32-ap20x\bin\sasl-plugins\saslANONYMOUS.dll" Name="saslANONYMOUS.dll" Id="saslanon" />
> + <File Source="..\..\..\work\svn-win32-ap20x\bin\saslANONYMOUS.dll" Name="saslANONYMOUS.dll" Id="saslanon" />
> </Component>
> <Component Guid="B370A704-3E8E-4D73-B3F0-AF7ACB5AF624" Id="saslcramm" DiskId="1">
> - <File Source="..\..\..\work\svn-win32-ap20x\bin\sasl-plugins\saslCRAMMD5.dll" Name="saslCRAMMD5.dll" Id="saslcramm" />
> + <File Source="..\..\..\work\svn-win32-ap20x\bin\saslCRAMMD5.dll" Name="saslCRAMMD5.dll" Id="saslcramm" />
> </Component>
> <Component Guid="17DCDDF9-3E2F-4A08-B3FC-E7CC12385BAD" Id="sasldig" DiskId="1">
> - <File Source="..\..\..\work\svn-win32-ap20x\bin\sasl-plugins\saslDIGESTMD5.dll" Name="saslDIGESTMD5.dll" Id="sasldig" />
> + <File Source="..\..\..\work\svn-win32-ap20x\bin\saslDIGESTMD5.dll" Name="saslDIGESTMD5.dll" Id="sasldig" />
> </Component>
> <Component Guid="3AD50FDC-B249-4D5E-960E-4A8357C2F67A" Id="sasllog" DiskId="1">
> - <File Source="..\..\..\work\svn-win32-ap20x\bin\sasl-plugins\saslLOGIN.dll" Name="saslLOGIN.dll" Id="sasllog" />
> + <File Source="..\..\..\work\svn-win32-ap20x\bin\saslLOGIN.dll" Name="saslLOGIN.dll" Id="sasllog" />
> </Component>
> <Component Guid="607227AC-A4EA-44A5-A660-BC3944FDC013" Id="saslntlm" DiskId="1">
> - <File Source="..\..\..\work\svn-win32-ap20x\bin\sasl-plugins\saslNTLM.dll" Name="saslNTLM.dll" Id="saslNTLM" />
> + <File Source="..\..\..\work\svn-win32-ap20x\bin\saslNTLM.dll" Name="saslNTLM.dll" Id="saslNTLM" />
> </Component>
> <Component Guid="70B56DD7-BCBC-42FF-8E3C-F6BF2DDFC432" Id="saslplain" DiskId="1">
> - <File Source="..\..\..\work\svn-win32-ap20x\bin\sasl-plugins\saslPLAIN.dll" Name="saslPLAIN.dll" Id="saslplain" />
> + <File Source="..\..\..\work\svn-win32-ap20x\bin\saslPLAIN.dll" Name="saslPLAIN.dll" Id="saslplain" />
> </Component>
> <Component Guid="78AE5C63-63E9-4353-88A6-7FA55C10A2A4" Id="sasldb" DiskId="1">
> - <File Source="..\..\..\work\svn-win32-ap20x\bin\sasl-plugins\saslSASLDB.dll" Name="saslSASLDB.dll" Id="sasldb" />
> + <File Source="..\..\..\work\svn-win32-ap20x\bin\saslSASLDB.dll" Name="saslSASLDB.dll" Id="sasldb" />
> </Component>
> </Include>
>
> Modified: trunk/packages/windows-WiX/BuildSubversion/Files.wxs
> URL: http://svn.collab.net/viewvc/svn/trunk/packages/windows-WiX/BuildSubversion/Files.wxs?pathrev=32501&r1=32500&r2=32501
> ==============================================================================
> --- trunk/packages/windows-WiX/BuildSubversion/Files.wxs Fri Aug 15 20:51:54 2008 (r32500)
> +++ trunk/packages/windows-WiX/BuildSubversion/Files.wxs Fri Aug 15 21:02:58 2008 (r32501)
> @@ -7,9 +7,7 @@ <Wix xmlns="http://schemas.microsoft.
> <?include CommonBinaryFiles.wxi ?>
> <?include ApacheFiles20x.wxi ?>
> <?include ApacheFiles22x.wxi ?>
> - <Directory Id="SASL" Name="sasl-plugins">
> - <?include CommonSASLFiles.wxi ?>
> - </Directory>
> + <?include CommonSASLFiles.wxi ?>
> </Directory>
> <Directory Id="iconv" Name="iconv">
> <?include iconvFiles20x.wxi ?>
>
> Modified: trunk/packages/windows-WiX/BuildSubversion/LicensesCommon.wxi
> URL: http://svn.collab.net/viewvc/svn/trunk/packages/windows-WiX/BuildSubversion/LicensesCommon.wxi?pathrev=32501&r1=32500&r2=32501
> ==============================================================================
> --- trunk/packages/windows-WiX/BuildSubversion/LicensesCommon.wxi Fri Aug 15 20:51:54 2008 (r32500)
> +++ trunk/packages/windows-WiX/BuildSubversion/LicensesCommon.wxi Fri Aug 15 21:02:58 2008 (r32501)
> @@ -37,7 +37,7 @@
> </Component>
> </Directory>
> <Directory Id="zlib" Name="zlib">
> - <Component Guid="451E1EBC-9E20-4BD7-8321-0D65C4C23A1B" Id="README" DiskId="1">
> + <Component Guid="451E1EBC-9E20-4BD7-8321-0D65C4C23A1B" Id="zlREADME" DiskId="1">
> <File Source="..\..\..\work\svn-win32-ap20x\licenses\zlib\README" Name="README.txt" Id="README">
> <Shortcut Name="ZLIB" Id="zlibsct" Description="ZLIB License" Directory="LicenseMenuFolder" Advertise="yes" Icon="zlib.txt">
> <Icon Id="zlib.txt" SourceFile="c:\windows\notepad.exe" />
> @@ -45,4 +45,22 @@
> </File>
> </Component>
> </Directory>
> + <Directory Id="cyrussasl" Name="cyrussasl">
> + <Component Guid="DF72B8AD-9A07-4CCB-BDB1-B317A1FF856A" Id="cyCOPYING" DiskId="1">
> + <File Source="..\..\..\work\svn-win32-ap20x\licenses\cyrus-sasl\COPYING" Name="COPYING.txt" Id="COPYING">
> + <Shortcut Name="CYRUSSSL" Id="cysslsct" Description="Cyrus SASL License" Directory="LicenseMenuFolder" Advertise="yes" Icon="copying.txt">
> + <Icon Id="copying.txt" SourceFile="c:\windows\notepad.exe" />
> + </Shortcut>
> + </File>
> + </Component>
> + </Directory>
> + <Directory Id="serf" Name="serf">
> + <Component Guid="B90EADE1-48B6-477F-83AF-FA8347E7A7AB" Id="serLICENSE" DiskId="1">
> + <File Source="..\..\..\work\svn-win32-ap20x\licenses\serf\LICENSE" Name="LICENSE.txt" Id="srfLICENSE">
> + <Shortcut Name="SERF" Id="serfsct" Description="Serf License" Directory="LicenseMenuFolder" Advertise="yes" Icon="license.txt">
> + <Icon Id="license.txt" SourceFile="c:\windows\notepad.exe" />
> + </Shortcut>
> + </File>
> + </Component>
> + </Directory>
> </Include>
>
> Modified: trunk/packages/windows-WiX/BuildSubversion/LicensesCommonFeature.wxi
> URL: http://svn.collab.net/viewvc/svn/trunk/packages/windows-WiX/BuildSubversion/LicensesCommonFeature.wxi?pathrev=32501&r1=32500&r2=32501
> ==============================================================================
> --- trunk/packages/windows-WiX/BuildSubversion/LicensesCommonFeature.wxi Fri Aug 15 20:51:54 2008 (r32500)
> +++ trunk/packages/windows-WiX/BuildSubversion/LicensesCommonFeature.wxi Fri Aug 15 21:02:58 2008 (r32501)
> @@ -4,4 +4,7 @@
> <ComponentRef Id="COPYINGLIB"/>
> <ComponentRef Id="OPENSSLLICENSE"/>
> <ComponentRef Id="SVNLICENSE"/>
> + <ComponentRef Id="zlREADME"/>
> + <ComponentRef Id="cyCOPYING"/>
> + <ComponentRef Id="serLICENSE"/>
> </Include>
> \ No newline at end of file
>
> Modified: trunk/packages/windows-WiX/BuildSubversion/Setup.wxs
> URL: http://svn.collab.net/viewvc/svn/trunk/packages/windows-WiX/BuildSubversion/Setup.wxs?pathrev=32501&r1=32500&r2=32501
> ==============================================================================
> --- trunk/packages/windows-WiX/BuildSubversion/Setup.wxs Fri Aug 15 20:51:54 2008 (r32500)
> +++ trunk/packages/windows-WiX/BuildSubversion/Setup.wxs Fri Aug 15 21:02:58 2008 (r32501)
> @@ -15,9 +15,9 @@ <?xml version="1.0"?>
> -->
> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
> <?define RTMProductVersion="1.0.0" ?>
> - <?define ProductVersion="1.5.0" ?> <!-- change for upgrade -->
> - <?define RevisionNumber="r31699" ?> <!-- change for upgrade -->
> - <?define ProductCode="{3F119C94-9F12-4C04-B7B6-852235AC1A73}" ?> <!-- change for upgrade -->
> + <?define ProductVersion="1.5.1" ?> <!-- change for upgrade -->
> + <?define RevisionNumber="r32289" ?> <!-- change for upgrade -->
> + <?define ProductCode="{0ED6E1BF-3604-45E9-A719-8DD3B5826706}" ?> <!-- change for upgrade -->
> <?define UpgradeCode="{032A49B2-32FB-4AE0-BAB0-6AB953CC94DA}" ?> <!-- leave this value -->
> <?define PackageCode="*" ?>
>
> @@ -75,8 +75,6 @@ <?xml version="1.0"?>
> <?include LicensesFeature20x.wxi ?>
> <?include LicensesFeature22x.wxi ?>
>
> - <ComponentRef Id="README"/>
> -
> <ComponentRef Id="svnbookchm"/>
>
> <!-- Program Files Folder -->
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: svn-unsubscribe@subversion.tigris.org
> For additional commands, e-mail: svn-help@subversion.tigris.org
>
>