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

Don't include WiX documentation in SharpDevelop setup. 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@5500 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Daniel Grunwald 16 years ago
parent
6991527a95
commit
c3ef772a34
3 changed files with 0 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 43
      src/Setup/Files.wxs
  2. 13
      src/Setup/Setup.wxs
  3. 2
      src/Tools/Tools.build

43
src/Setup/Files.wxs
Unescape View File

@ -281,49 +281,6 @@
<File Source="..\..\bin\Tools\Wix\Bitmaps\Up.ico" Name="Up.ico" Id="Up.ico" /> <File Source="..\..\bin\Tools\Wix\Bitmaps\Up.ico" Name="Up.ico" Id="Up.ico" />
</Component> </Component>
</Directory> </Directory>
<Directory Id="WixDocFolder" Name="doc">
<Component Guid="2F5AC556-CE36-47EA-AB6C-F8623AA4A6BE" Id="WixDocFiles" DiskId="1">
<File Source="..\..\bin\Tools\Wix\doc\WiX.chm" Name="Wix.chm" Id="Wix.chm" />
<File Source="..\..\bin\Tools\Wix\doc\wix.xsd" Name="wix.xsd" Id="wix.xsd" KeyPath="yes" />
<File Source="..\..\bin\Tools\Wix\doc\wixloc.xsd" Name="wixloc.xsd" Id="wixloc.xsd" />
</Component>
<Component Guid="709867E5-F226-4ADF-8204-E77ED2F67EEC" Id="NetFxSchema" DiskId="1">
<File Source="..\..\bin\Tools\Wix\doc\netfx.xsd" Name="netfx.xsd" Id="netfx.xsd" />
</Component>
<Component Guid="6CF70F72-AB78-4122-BC7F-0CA6B3CC6E97" Id="VSExtensionSchema" DiskId="1">
<File Source="..\..\bin\Tools\Wix\doc\vs.xsd" Name="vs.xsd" Id="vs.xsd" KeyPath="yes" />
</Component>
<Component Guid="878D4E54-755C-4D0B-967A-C78CDC7F04C9" Id="DIfxAppXsd" DiskId="1">
<File Source="..\..\bin\Tools\Wix\doc\difxapp.xsd" Name="difxapp.xsd" Id="difxapp.xsd" KeyPath="yes" />
</Component>
<Component Guid="38D4BD3C-F299-49B3-A5F7-5DFE9BE92830" Id="IisXsd" DiskId="1">
<File Source="..\..\bin\Tools\Wix\doc\iis.xsd" Name="iis.xsd" Id="iis.xsd" KeyPath="yes" />
</Component>
<Component Guid="E301BCF5-E98D-43F6-A47E-DC9BD51B70C1" Id="PsXsd" DiskId="1">
<File Source="..\..\bin\Tools\Wix\doc\ps.xsd" Name="ps.xsd" Id="ps.xsd" KeyPath="yes" />
</Component>
<Component Guid="474EF744-E3CF-4BED-A10E-7BC906CD1A80" Id="SqlXsd" DiskId="1">
<File Source="..\..\bin\Tools\Wix\doc\sql.xsd" Name="sql.xsd" Id="sql.xsd" KeyPath="yes" />
</Component>
<Component Guid="96DD82B8-5183-4C6C-BF15-455895F78A89" Id="UtilXsd" DiskId="1">
<File Source="..\..\bin\Tools\Wix\doc\util.xsd" Name="util.xsd" Id="util.xsd" KeyPath="yes" />
</Component>
<Component Guid="3E8291C1-F920-40C9-BFF2-3E0DD361EBB6" Id="MSMQXsd" DiskId="1">
<File Source="..\..\bin\Tools\Wix\doc\msmq.xsd" Name="msmq.xsd" Id="msmq.xsd" KeyPath="yes" />
</Component>
<Component Guid="5169B461-92D6-4C1C-B343-136C69092814" Id="WixDtfHelpFile" DiskId="1">
<File Source="..\..\bin\Tools\Wix\doc\DTF.chm" Name="DTF.chm" Id="WixDTF.chm" KeyPath="yes" />
</Component>
<Component Guid="8902BE9A-A694-4ACD-9271-9B4E4C07C6ED" Id="WixDtfApiHelpFile" DiskId="1">
<File Source="..\..\bin\Tools\Wix\doc\DTFAPI.chm" Name="DTFAPI.chm" Id="WixDtfApi.chm" KeyPath="yes" />
</Component>
<Component Guid="A85759C4-AEEB-46B6-BE15-0957348A3D50" Id="WixFirewallXsd" DiskId="1">
<File Source="..\..\bin\Tools\Wix\doc\firewall.xsd" Name="firewall.xsd" Id="WixFirewall.xsd" KeyPath="yes" />
</Component>
<Component Guid="4C41DDBD-CE42-4669-87B0-250F0BF83DA9" Id="WixGamingXsd" DiskId="1">
<File Source="..\..\bin\Tools\Wix\doc\gaming.xsd" Name="gaming.xsd" Id="WixGaming.xsd" KeyPath="yes" />
</Component>
</Directory>
<Component Guid="6D18FAA0-440D-47FA-B9C1-790A00ADF96D" Id="DariceCub" DiskId="1"> <Component Guid="6D18FAA0-440D-47FA-B9C1-790A00ADF96D" Id="DariceCub" DiskId="1">
<File Source="..\..\bin\Tools\Wix\darice.cub" Name="darice.cub" Id="darice.cub" KeyPath="yes" /> <File Source="..\..\bin\Tools\Wix\darice.cub" Name="darice.cub" Id="darice.cub" KeyPath="yes" />
</Component> </Component>

13
src/Setup/Setup.wxs
Unescape View File

@ -194,13 +194,7 @@
<ComponentRef Id="SharpDevelopProgramMenuItems"/> <ComponentRef Id="SharpDevelopProgramMenuItems"/>
<ComponentRef Id="DesktopFolderItems"/> <ComponentRef Id="DesktopFolderItems"/>
<ComponentRef Id="DIfxAppXsd"/>
<ComponentRef Id="IisXsd"/>
<ComponentRef Id="PsXsd"/>
<ComponentRef Id="SqlXsd"/>
<ComponentRef Id="UtilXsd"/>
<ComponentRef Id="DariceCub"/> <ComponentRef Id="DariceCub"/>
<ComponentRef Id="NetFxSchema"/>
<ComponentRef Id="HeatExe"/> <ComponentRef Id="HeatExe"/>
<ComponentRef Id="MeltExe"/> <ComponentRef Id="MeltExe"/>
<ComponentRef Id="MergeModCub"/> <ComponentRef Id="MergeModCub"/>
@ -234,18 +228,11 @@
<ComponentRef Id="WixVSSchema"/> <ComponentRef Id="WixVSSchema"/>
<ComponentRef Id="WixFirewallSchema"/> <ComponentRef Id="WixFirewallSchema"/>
<ComponentRef Id="WixGamingSchema"/> <ComponentRef Id="WixGamingSchema"/>
<ComponentRef Id="VSExtensionSchema"/>
<ComponentRef Id="WixLicenseFiles"/> <ComponentRef Id="WixLicenseFiles"/>
<ComponentRef Id="WixBitmapFiles"/> <ComponentRef Id="WixBitmapFiles"/>
<ComponentRef Id="WixDocFiles"/>
<ComponentRef Id="WixDtfHelpFile"/>
<ComponentRef Id="WixDtfApiHelpFile"/>
<ComponentRef Id="WixVSExtension"/> <ComponentRef Id="WixVSExtension"/>
<ComponentRef Id="Difxapp_x64Wixlib"/> <ComponentRef Id="Difxapp_x64Wixlib"/>
<ComponentRef Id="Difxapp_x86Wixlib"/> <ComponentRef Id="Difxapp_x86Wixlib"/>
<ComponentRef Id="MSMQXsd"/>
<ComponentRef Id="WixFirewallXsd"/>
<ComponentRef Id="WixGamingXsd"/>
<ComponentRef Id="EmptyWixFileTemplate"/> <ComponentRef Id="EmptyWixFileTemplate"/>
<ComponentRef Id="WixDefaultLicenseRtf"/> <ComponentRef Id="WixDefaultLicenseRtf"/>
<ComponentRef Id="EmptyWixProjectTemplate"/> <ComponentRef Id="EmptyWixProjectTemplate"/>

2
src/Tools/Tools.build
Unescape View File

@ -2,7 +2,6 @@
<ItemGroup> <ItemGroup>
<WixFiles Include="wix\*"/> <WixFiles Include="wix\*"/>
<WixBitmapFiles Include="wix\Bitmaps\*"/> <WixBitmapFiles Include="wix\Bitmaps\*"/>
<WixDocFiles Include="wix\doc\*"/>
<WixLibFiles Include="wix\lib\*"/> <WixLibFiles Include="wix\lib\*"/>
<NUnitFiles Include="NUnit\*.dll;NUnit\*.exe"/> <NUnitFiles Include="NUnit\*.dll;NUnit\*.exe"/>
<NUnitConfigFiles Include="NUnit\nunit-console.exe.config;NUnit\nunit-console-x86.exe.config"/> <NUnitConfigFiles Include="NUnit\nunit-console.exe.config;NUnit\nunit-console-x86.exe.config"/>
@ -14,7 +13,6 @@
<Target Name="Build"> <Target Name="Build">
<Copy SourceFiles="@(WixFiles)" DestinationFolder="..\..\bin\Tools\Wix" SkipUnchangedFiles="true"/> <Copy SourceFiles="@(WixFiles)" DestinationFolder="..\..\bin\Tools\Wix" SkipUnchangedFiles="true"/>
<Copy SourceFiles="@(WixDocFiles)" DestinationFolder="..\..\bin\Tools\Wix\doc" SkipUnchangedFiles="true"/>
<Copy SourceFiles="@(WixBitmapFiles)" DestinationFolder="..\..\bin\Tools\Wix\Bitmaps" SkipUnchangedFiles="true"/> <Copy SourceFiles="@(WixBitmapFiles)" DestinationFolder="..\..\bin\Tools\Wix\Bitmaps" SkipUnchangedFiles="true"/>
<Copy SourceFiles="@(WixLibFiles)" DestinationFolder="..\..\bin\Tools\Wix\lib" SkipUnchangedFiles="true"/> <Copy SourceFiles="@(WixLibFiles)" DestinationFolder="..\..\bin\Tools\Wix\lib" SkipUnchangedFiles="true"/>
<Copy SourceFiles="@(NUnitFiles)" DestinationFolder="..\..\bin\Tools\NUnit" SkipUnchangedFiles="true"/> <Copy SourceFiles="@(NUnitFiles)" DestinationFolder="..\..\bin\Tools\NUnit" SkipUnchangedFiles="true"/>

Write Preview
Loading…
Cancel
Save