pimhwang
/
SharpDevelop
mirror of https://github.com/icsharpcode/SharpDevelop.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Updated to WiX 2.0.5325 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/2.1@2557 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Matt Ward 18 years ago
parent
69e1ad3b64
commit
eb7c9a8f91
5 changed files with 770 additions and 298 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1003
      data/schemas/wix.xsd
  2. 8
      data/schemas/wixloc.xsd
  3. 46
      src/Setup/Files.wxs
  4. 9
      src/Setup/Setup.wxs
  5. 2
      src/Tools/Tools.build

1003
data/schemas/wix.xsd
View File

File diff suppressed because it is too large Load Diff

8
data/schemas/wixloc.xsd
Unescape View File

@ -5,14 +5,6 @@ @@ -5,14 +5,6 @@
<xs:annotation>
<xs:documentation>
Copyright (c) Microsoft Corporation. All rights reserved.
The use and distribution terms for this software are covered by the
Common Public License 1.0 (http://opensource.org/licenses/cpl.php)
which can be found in the file CPL.TXT at the root of this distribution.
By using this software in any fashion, you are agreeing to be bound by
the terms of this license.
You must not remove this notice, or any other, from this software.
Schema for describing Windows Installer Xml Localization files (.wxl).
</xs:documentation>

46
src/Setup/Files.wxs
Unescape View File

@ -283,8 +283,7 @@ @@ -283,8 +283,7 @@
<File Source="..\..\bin\Tools\Wix\candle.exe" Name="candle.exe" Id="candle.exe" Assembly=".net" AssemblyApplication="candle.exe" AssemblyManifest="candle.exe" KeyPath="yes" />
<File Source="..\..\bin\Tools\Wix\candle.exe.config" Name="CANDLE_1.CON" Id="candle.exe.config" LongName="candle.exe.config" />
</Component>
<Component Id="WixLicenseFiles" Guid="35784338-0E6A-4046-A82F-79BCE7549F08" DiskId="1">
<File Source="..\..\bin\Tools\Wix\CPL.TXT" Name="CPL.TXT" Id="CPL.TXT" />
<Component Id="WixLicenseFiles" Guid="3EA29F1C-0855-4521-BEFE-7C6D5C4A5D30" DiskId="1">
<File Source="..\..\bin\Tools\Wix\License.rtf" Name="License.rtf" Id="License.rtf" />
</Component>
<Component Id="DarkExe" Guid="45BAAB13-6E19-42DA-80BE-8C44EAD8A24E" DiskId="1">
@ -311,18 +310,6 @@ @@ -311,18 +310,6 @@
<Component Id="NetFxCaDll" Guid="F5970A44-7122-4660-ABCD-821360690CCC" DiskId="1">
<File Source="..\..\bin\Tools\Wix\netfxca.dll" Name="netfxca.dll" Id="netfxca.dll" />
</Component>
<Component Id="PcaExecDll" Guid="978F8CBF-CB97-492F-B787-C4C9049AAFCD" DiskId="1">
<File Source="..\..\bin\Tools\Wix\pcaexec.dll" Name="pcaexec.dll" Id="pcaexec.dll" />
</Component>
<Component Id="PcaExtDll" Guid="993733F6-DE48-4723-B1BF-6BC9BD395AEF" DiskId="1">
<File Source="..\..\bin\Tools\Wix\pcaext.dll" Name="pcaext.dll" Id="pcaext.dll" Assembly=".net" AssemblyApplication="pcaext.dll" AssemblyManifest="pcaext.dll" KeyPath="yes" />
</Component>
<Component Id="PcaSchedDll" Guid="4296DDD0-93F0-4341-AAAC-9D64B7974EE7" DiskId="1">
<File Source="..\..\bin\Tools\Wix\pcasched.dll" Name="pcasched.dll" Id="pcasched.dll" />
</Component>
<Component Id="PubCaWixLib" Guid="FA9D7586-CE64-45EF-B8F4-8104B53BA7D2" DiskId="1">
<File Source="..\..\bin\Tools\Wix\pubca.wixlib" Name="pubca.lib" LongName="pubca.wixlib" Id="pubca.wixlib" />
</Component>
<Component Id="ScaWixLib" Guid="97C97B61-27B2-4520-8406-AFD3C0627081" DiskId="1">
<File Source="..\..\bin\Tools\Wix\sca.wixlib" Name="sca.lib" Id="sca.wixlib" LongName="sca.wixlib" />
</Component>
@ -364,11 +351,8 @@ @@ -364,11 +351,8 @@
<Component Id="WixUiWixLib" Guid="EC84F252-770A-457F-8701-99C93684D6B6" DiskId="1">
<File Source="..\..\bin\Tools\Wix\wixui.wixlib" Name="wixui.lib" LongName="wixui.wixlib" Id="wixui.wixlib" />
</Component>
<Component Id="WixLocalisationFiles" Guid="5BBC8B25-5495-4AFA-B4C3-1A2ABD907314" DiskId="1">
<File Source="..\..\bin\Tools\Wix\WixUI_de-de.wxl" Name="wixuide.wxl" Id="WixUI_de_de.wxl" LongName="WixUI_de-de.wxl" />
<Component Id="WixUiEnUsWxl" Guid="20AAD10C-F5C9-46E8-A515-B516C494235B" DiskId="1">
<File Source="..\..\bin\Tools\Wix\WixUI_en-us.wxl" Name="wixuien.wxs" Id="WixUI_en_us.wxl" LongName="WixUI_en-us.wxl" />
<File Source="..\..\bin\Tools\Wix\WixUI_es-es.wxl" Name="wixuies.wxl" Id="WixUI_es_es.wxl" LongName="WixUI_es-es.wxl" />
<File Source="..\..\bin\Tools\Wix\WixUI_nl-nl.wxl" Name="wixuinl.wxl" Id="WixUI_nl_nl.wxl" LongName="WixUI_nl-nl.wxl" />
</Component>
<Directory Id="WixBitmapsFolder" Name="Bitmaps">
<Component Guid="363E0512-B16C-43ED-A1BE-CE91DBD2463E" Id="WixBitmapFiles" DiskId="1">
@ -393,35 +377,9 @@ @@ -393,35 +377,9 @@
<File Source="..\..\bin\Tools\Wix\doc\vs.xsd" Name="vs.xsd" Id="vs.xsd" />
</Component>
</Directory>
<Directory Id="WixIncFolder" Name="inc">
<Component Guid="07E93366-FFBD-4C7A-AF4B-F557EC5B42DD" Id="WixIncFiles" DiskId="1">
<File Source="..\..\bin\Tools\Wix\inc\aclutil.h" Name="aclutil.h" Id="aclutil.h" />
<File Source="..\..\bin\Tools\Wix\inc\cabcutil.h" Name="cabcutil.h" Id="cabcutil.h" />
<File Source="..\..\bin\Tools\Wix\inc\cabutil.h" Name="cabutil.h" Id="cabutil.h" />
<File Source="..\..\bin\Tools\Wix\inc\dirutil.h" Name="dirutil.h" Id="dirutil.h" />
<File Source="..\..\bin\Tools\Wix\inc\dutil.h" Name="dutil.h" Id="dutil.h" />
<File Source="..\..\bin\Tools\Wix\inc\fileutil.h" Name="fileutil.h" Id="fileutil.h" />
<File Source="..\..\bin\Tools\Wix\inc\memutil.h" Name="memutil.h" Id="memutil.h" />
<File Source="..\..\bin\Tools\Wix\inc\metautil.h" Name="metautil.h" Id="metautil.h" />
<File Source="..\..\bin\Tools\Wix\inc\perfutil.h" Name="perfutil.h" Id="perfutil.h" />
<File Source="..\..\bin\Tools\Wix\inc\sqlutil.h" Name="sqlutil.h" Id="sqlutil.h" />
<File Source="..\..\bin\Tools\Wix\inc\strutil.h" Name="strutil.h" Id="strutil.h" />
<File Source="..\..\bin\Tools\Wix\inc\wcautil.h" Name="wcautil.h" Id="wcautil.h" />
<File Source="..\..\bin\Tools\Wix\inc\xmlutil.h" Name="xmlutil.h" Id="xmlutil.h" />
</Component>
</Directory>
<Directory Id="WixLibFolder" Name="lib">
<Component Guid="B2006977-986A-40C2-8C36-C349AC90DF5E" Id="WixLibFiles" DiskId="1">
<File Source="..\..\bin\Tools\Wix\lib\dutil.lib" Name="dutil.lib" Id="dutil.lib" />
<File Source="..\..\bin\Tools\Wix\lib\wcautil.lib" Name="wcautil.lib" Id="wcautil.lib" />
</Component>
</Directory>
<Component Guid="6B84E84F-C796-4104-981C-07C16CAAB0F8" Id="WixMMCExtensionDll" DiskId="1">
<File Source="..\..\bin\Tools\Wix\WixMMCExtension.dll" Name="WIXMMC.DLL" Id="WixMMCExtension.dll" LongName="WixMMCExtension.dll" Assembly=".net" AssemblyApplication="WixMMCExtension.dll" AssemblyManifest="WixMMCExtension.dll" KeyPath="yes" />
</Component>
<Component Guid="CB3536B4-5A4E-4578-9FDE-808367353C51" Id="WixUIhuhuWxl" DiskId="1">
<File Source="..\..\bin\Tools\Wix\WixUI_hu-hu.wxl" Name="WIXUI.WXL" Id="WixUI_hu_hu.wxl" LongName="WixUI_hu-hu.wxl" KeyPath="yes" />
</Component>
</Directory>
<Directory Id="NUnitFolder" Name="NUnit">
<Component Guid="264B36E0-A168-432B-A227-F628D0159370" Id="NUnitCoreExtensionsDll" DiskId="1">

9
src/Setup/Setup.wxs
Unescape View File

@ -201,8 +201,6 @@ @@ -201,8 +201,6 @@
<ComponentRef Id="WixDocFiles"/>
<ComponentRef Id="NetFxSchema"/>
<ComponentRef Id="VSExtensionSchema"/>
<ComponentRef Id="WixIncFiles"/>
<ComponentRef Id="WixLibFiles"/>
<ComponentRef Id="WixVSExtension"/>
<ComponentRef Id="CandleExe"/>
<ComponentRef Id="DarkExe"/>
@ -212,10 +210,6 @@ @@ -212,10 +210,6 @@
<ComponentRef Id="MicrosoftToolsWindowsInstallerXmlNAntTasksDll"/>
<ComponentRef Id="NetFxWixLib"/>
<ComponentRef Id="NetFxCaDll"/>
<ComponentRef Id="PcaExecDll"/>
<ComponentRef Id="PcaExtDll"/>
<ComponentRef Id="PcaSchedDll"/>
<ComponentRef Id="PubCaWixLib"/>
<ComponentRef Id="ScaWixLib"/>
<ComponentRef Id="ScaExecDll"/>
<ComponentRef Id="ScashedDll"/>
@ -230,8 +224,7 @@ @@ -230,8 +224,7 @@
<ComponentRef Id="WixNetFxExtensionDll"/>
<ComponentRef Id="WixTasksDll"/>
<ComponentRef Id="WixUiWixLib"/>
<ComponentRef Id="WixLocalisationFiles"/>
<ComponentRef Id="WixUIhuhuWxl"/>
<ComponentRef Id="WixUiEnUsWxl"/>
<ComponentRef Id="NUnitCoreExtensionsDll"/>
<ComponentRef Id="NUnitUiKitDll"/>
<ComponentRef Id="NUnitUtilDll"/>

2
src/Tools/Tools.build
Unescape View File

@ -5,7 +5,6 @@ @@ -5,7 +5,6 @@
<WixBitmapFiles Include="wix\Bitmaps\*"/>
<WixDocFiles Include="wix\doc\*"/>
<WixLibFiles Include="wix\lib\*"/>
<WixIncFiles Include="wix\inc\*"/>
<NUnitFiles Include="NUnit\*.dll;NUnit\*.exe"/>
<NUnitConfigFileNetv11 Include="NUnit\nunit-console-netv11.exe.config"/>
<NUnitConfigFile Include="NUnit\nunit-console.exe.config"/>
@ -17,7 +16,6 @@ @@ -17,7 +16,6 @@
<Copy SourceFiles="@(WixFiles)" DestinationFolder="..\..\bin\Tools\Wix"/>
<Copy SourceFiles="@(WixDocFiles)" DestinationFolder="..\..\bin\Tools\Wix\doc"/>
<Copy SourceFiles="@(WixBitmapFiles)" DestinationFolder="..\..\bin\Tools\Wix\Bitmaps"/>
<Copy SourceFiles="@(WixIncFiles)" DestinationFolder="..\..\bin\Tools\Wix\inc"/>
<Copy SourceFiles="@(WixLibFiles)" DestinationFolder="..\..\bin\Tools\Wix\lib"/>
<Copy SourceFiles="@(NUnitFiles)" DestinationFolder="..\..\bin\Tools\NUnit"/>
<Copy SourceFiles="@(NUnitFiles)" DestinationFolder="..\..\bin\Tools\NUnit\Net-1.1"/>

Write Preview
Loading…
Cancel
Save