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

Fixed incorrect relative filenames in setup. Fixed incorrect release output path in projects. 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@6307 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Matt Ward 15 years ago
parent
5fedaf0638
commit
868420a05e
5 changed files with 61 additions and 13 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. 2
      src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.csproj
  2. 2
      src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj
  3. 2
      src/AddIns/Misc/AddinScout/Project/AddinScout.csproj
  4. 56
      src/Setup/Files.wxs
  5. 12
      src/Setup/Setup.wxs

2
src/AddIns/DisplayBindings/HexEditor/Project/HexEditor.csproj
Unescape View File

@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
<StartProgram>..\..\..\..\..\bin\SharpDevelop.exe</StartProgram>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputPath>..\..\..\..\..\AddIns\AddIns\DisplayBindings\HexEditor</OutputPath>
<OutputPath>..\..\..\..\..\AddIns\DisplayBindings\HexEditor</OutputPath>
<DebugSymbols>false</DebugSymbols>
<DebugType>None</DebugType>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>

2
src/AddIns/DisplayBindings/ResourceEditor/Project/ResourceEditor.csproj
Unescape View File

@ -35,7 +35,7 @@ @@ -35,7 +35,7 @@
<DebugSymbols>False</DebugSymbols>
<Optimize>True</Optimize>
<CheckForOverflowUnderflow>False</CheckForOverflowUnderflow>
<OutputPath>..\..\..\..\..\AddIns\AddIns\DisplayBindings\ResourceEditor\</OutputPath>
<OutputPath>..\..\..\..\..\AddIns\DisplayBindings\ResourceEditor\</OutputPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

2
src/AddIns/Misc/AddinScout/Project/AddinScout.csproj
Unescape View File

@ -34,7 +34,7 @@ @@ -34,7 +34,7 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugSymbols>False</DebugSymbols>
<Optimize>True</Optimize>
<OutputPath>..\..\..\..\..\AddIns\AddIns\Misc\AddinScout\</OutputPath>
<OutputPath>..\..\..\..\..\AddIns\Misc\AddinScout\</OutputPath>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />

56
src/Setup/Files.wxs
Unescape View File

@ -707,34 +707,70 @@ @@ -707,34 +707,70 @@
</Directory>
<Directory Id="VBNetFileTemplatesFolder" Name="VBNet">
<Component Id="VBNetTemplatesFileCategorySortOrderXml" Guid="420F6EAA-8F64-4837-BDE4-034E7C40F112" DiskId="1">
<File Id="VBNetFileTemplateFileCategorySortOrder.xml" Name="FileCategorySortOrder.xml" Source="..\..\..\..\montferrer\SharpDevelop\data\templates\file\VBNet\FileCategorySortOrder.xml" KeyPath="yes" />
<File Id="VBNetFileTemplateFileCategorySortOrder.xml" Name="FileCategorySortOrder.xml" Source="..\..\data\templates\file\VBNet\FileCategorySortOrder.xml" KeyPath="yes" />
</Component>
<Component Id="VBNetEmptyFileTemplate" Guid="92D5B825-D5A1-4164-959D-0D1DBE4ADE0D" DiskId="1">
<File Id="VBNet.Empty.xft" Name="VBNet.Empty.xft" Source="..\..\..\..\montferrer\SharpDevelop\data\templates\file\VBNet\VBNet.Empty.xft" KeyPath="yes" />
<File Id="VBNet.Empty.xft" Name="VBNet.Empty.xft" Source="..\..\data\templates\file\VBNet\VBNet.Empty.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetEmptyClassFileTemplate" Guid="B1875095-14EF-459E-8546-A281019EBBCE" DiskId="1">
<File Id="VBNet.EmptyClass.xft" Name="VBNet.EmptyClass.xft" Source="..\..\..\..\montferrer\SharpDevelop\data\templates\file\VBNet\VBNet.EmptyClass.xft" KeyPath="yes" />
<File Id="VBNet.EmptyClass.xft" Name="VBNet.EmptyClass.xft" Source="..\..\data\templates\file\VBNet\VBNet.EmptyClass.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetFormFileTemplate" Guid="8DD19254-4E5E-4119-A3A8-7F0608B02B8C" DiskId="1">
<File Id="VBNet.VBNet.Forms.Form.xft" Name="VBNet.Forms.Form.xft" Source="..\..\..\..\montferrer\SharpDevelop\data\templates\file\VBNet\VBNet.Forms.Form.xft" KeyPath="yes" />
<File Id="VBNet.VBNet.Forms.Form.xft" Name="VBNet.Forms.Form.xft" Source="..\..\data\templates\file\VBNet\VBNet.Forms.Form.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetUserControlFileTemplate" Guid="BCBD5075-D39A-4D86-900F-EAACFD7644C4" DiskId="1">
<File Id="VBNet.VBNet.Forms.UserControl.xft" Name="VBNet.Forms.UserControl.xft" Source="..\..\..\..\montferrer\SharpDevelop\data\templates\file\VBNet\VBNet.Forms.UserControl.xft" KeyPath="yes" />
<File Id="VBNet.VBNet.Forms.UserControl.xft" Name="VBNet.Forms.UserControl.xft" Source="..\..\data\templates\file\VBNet\VBNet.Forms.UserControl.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetInterfaceFileTemplate" Guid="18F3CE0E-A859-48E4-A3E7-1666E8CE012E" DiskId="1">
<File Id="VBNet.VBNet.Interface.xft" Name="VBNet.Interface.xft" Source="..\..\..\..\montferrer\SharpDevelop\data\templates\file\VBNet\VBNet.Interface.xft" KeyPath="yes" />
<File Id="VBNet.VBNet.Interface.xft" Name="VBNet.Interface.xft" Source="..\..\data\templates\file\VBNet\VBNet.Interface.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetModuleFileTemplate" Guid="1ACB5E8A-CC5E-4673-A68E-A7F52DCB9DB7" DiskId="1">
<File Id="VBNet.VBNet.Module.xft" Name="VBNet.Module.xft" Source="..\..\..\..\montferrer\SharpDevelop\data\templates\file\VBNet\VBNet.Module.xft" KeyPath="yes" />
<File Id="VBNet.VBNet.Module.xft" Name="VBNet.Module.xft" Source="..\..\data\templates\file\VBNet\VBNet.Module.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetMyExtensionClassFileTemplate" Guid="EB4D7763-0491-4888-A288-07A3539CD36B" DiskId="1">
<File Id="VBNet.MyExtensionClass.xft" Name="VBNet.MyExtensionClass.xft" Source="..\..\..\..\montferrer\SharpDevelop\data\templates\file\VBNet\VBNet.MyExtensionClass.xft" KeyPath="yes" />
<File Id="VBNet.MyExtensionClass.xft" Name="VBNet.MyExtensionClass.xft" Source="..\..\data\templates\file\VBNet\VBNet.MyExtensionClass.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetPatternsSingletonFileTemplate" Guid="4912461E-4703-4F3B-9DDB-73D1A720FA48" DiskId="1">
<File Id="VBNet.Patterns.Singleton.xft" Name="VBNet.Patterns.Singleton.xft" Source="..\..\..\..\montferrer\SharpDevelop\data\templates\file\VBNet\VBNet.Patterns.Singleton.xft" KeyPath="yes" />
<File Id="VBNet.Patterns.Singleton.xft" Name="VBNet.Patterns.Singleton.xft" Source="..\..\data\templates\file\VBNet\VBNet.Patterns.Singleton.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetUnitTestFileTemplate" Guid="D5D60A9C-FE68-450F-9C65-6FE13741734C" DiskId="1">
<File Id="VBNet.UnitTest.xft" Name="VBNet.UnitTest.xft" Source="..\..\..\..\montferrer\SharpDevelop\data\templates\file\VBNet\VBNet.UnitTest.xft" KeyPath="yes" />
<File Id="VBNet.UnitTest.xft" Name="VBNet.UnitTest.xft" Source="..\..\data\templates\file\VBNet\VBNet.UnitTest.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetExceptionFileTemplate" Guid="907F9938-D226-40C9-A0FF-A4D7744E5B17" DiskId="1">
<File Id="VBNet.Exception.xft" Name="VBNet.Exception.xft" Source="..\..\data\templates\file\VBNet\VBNet.Exception.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetStructureFileTemplate" Guid="BC352A19-6F6C-4532-B0CF-4D1244C3FA63" DiskId="1">
<File Id="VBNet.Structure.xft" Name="VBNet.Structure.xft" Source="..\..\data\templates\file\VBNet\VBNet.Structure.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetWebControlFileTemplate" Guid="9BF5162E-D3DD-46BC-A845-249733B4B37E" DiskId="1">
<File Id="VBNet.Web.WebControl.xft" Name="VBNet.Web.WebControl.xft" Source="..\..\data\templates\file\VBNet\VBNet.Web.WebControl.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetWebFormFileTemplate" Guid="AFC4CC3D-55E6-47A5-8DB1-97DCE34BFE3B" DiskId="1">
<File Id="VBNet.Web.WebForm.xft" Name="VBNet.Web.WebForm.xft" Source="..\..\data\templates\file\VBNet\VBNet.Web.WebForm.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetWebHandlerFileTemplate" Guid="445D6E1E-4280-4E61-A01E-D12D65C33303" DiskId="1">
<File Id="VBNet.Web.WebHandler.xft" Name="VBNet.Web.WebHandler.xft" Source="..\..\data\templates\file\VBNet\VBNet.Web.WebHandler.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetWebServiceFileTemplate" Guid="E920D1F5-60EB-4FFC-9E78-8CD4C65AD02C" DiskId="1">
<File Id="VBNet.Web.WebService.xft" Name="VBNet.Web.WebService.xft" Source="..\..\data\templates\file\VBNet\VBNet.Web.WebService.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetWPFFlowDocumentFileTemplate" Guid="CA1F4A0A-C925-4A70-A399-6B88E6013DF7" DiskId="1">
<File Id="VBNet.WPFFlowDocument.xft" Name="VBNet.WPFFlowDocument.xft" Source="..\..\data\templates\file\VBNet\VBNet.WPFFlowDocument.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetWPFPageFileTemplate" Guid="B6FDFB3C-52C7-43FC-A6DE-F2637E6FD5E0" DiskId="1">
<File Id="VBNet.WPFPage.xft" Name="VBNet.WPFPage.xft" Source="..\..\data\templates\file\VBNet\VBNet.WPFPage.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetWPFPageFunctionFileTemplate" Guid="EE8BA0D0-5503-4FF6-AA84-BA60BE43B68A" DiskId="1">
<File Id="VBNet.WPFPageFunction.xft" Name="VBNet.WPFPageFunction.xft" Source="..\..\data\templates\file\VBNet\VBNet.WPFPageFunction.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetWPFResourceDictionaryFileTemplate" Guid="8A5ECBA7-9052-4648-84F4-6ECC73B37A12" DiskId="1">
<File Id="VBNet.WPFResourceDictionary.xft" Name="VBNet.WPFResourceDictionary.xft" Source="..\..\data\templates\file\VBNet\VBNet.WPFResourceDictionary.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetWPFUserControlFileTemplate" Guid="B00822BB-A76E-4B63-9926-A5FB7FAF3835" DiskId="1">
<File Id="VBNet.WPFUserControl.xft" Name="VBNet.WPFUserControl.xft" Source="..\..\data\templates\file\VBNet\VBNet.WPFUserControl.xft" KeyPath="yes" />
</Component>
<Component Id="VBNetWPFWindowFileTemplate" Guid="43DEB1E6-4A14-4F78-BEC0-BC20F30876D4" DiskId="1">
<File Id="VBNet.WPFWindow.xft" Name="VBNet.WPFWindow.xft" Source="..\..\data\templates\file\VBNet\VBNet.WPFWindow.xft" KeyPath="yes" />
</Component>
</Directory>
</Directory>

12
src/Setup/Setup.wxs
Unescape View File

@ -276,6 +276,7 @@ @@ -276,6 +276,7 @@
<ComponentRef Id="CSharpRecentFilesCollectionTemplateRecentFileElementClass"/>
<ComponentRef Id="CSharpRecentFilesCollectionTemplateRecentFilesCollectionClass"/>
<ComponentRef Id="VBNetTemplatesFileCategorySortOrderXml"/>
<ComponentRef Id="VBNetExceptionFileTemplate"/>
<ComponentRef Id="VBNetEmptyFileTemplate"/>
<ComponentRef Id="VBNetEmptyClassFileTemplate"/>
<ComponentRef Id="VBNetFormFileTemplate"/>
@ -285,6 +286,17 @@ @@ -285,6 +286,17 @@
<ComponentRef Id="VBNetMyExtensionClassFileTemplate"/>
<ComponentRef Id="VBNetPatternsSingletonFileTemplate"/>
<ComponentRef Id="VBNetUnitTestFileTemplate"/>
<ComponentRef Id="VBNetStructureFileTemplate"/>
<ComponentRef Id="VBNetWebControlFileTemplate"/>
<ComponentRef Id="VBNetWebFormFileTemplate"/>
<ComponentRef Id="VBNetWebHandlerFileTemplate"/>
<ComponentRef Id="VBNetWebServiceFileTemplate"/>
<ComponentRef Id="VBNetWPFFlowDocumentFileTemplate"/>
<ComponentRef Id="VBNetWPFPageFileTemplate"/>
<ComponentRef Id="VBNetWPFPageFunctionFileTemplate"/>
<ComponentRef Id="VBNetWPFResourceDictionaryFileTemplate"/>
<ComponentRef Id="VBNetWPFUserControlFileTemplate"/>
<ComponentRef Id="VBNetWPFWindowFileTemplate"/>
<ComponentRef Id="EmptyHTMLFileTemplate"/>
<ComponentRef Id="EmptyMsBuildFileTemplate"/>
<ComponentRef Id="EmptyResourceFileTemplate"/>

Write Preview
Loading…
Cancel
Save