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

Add profiler to setup. 

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@3860 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
shortcuts
Daniel Grunwald 17 years ago
parent
951e8971a6
commit
de103b0e1b
3 changed files with 42 additions and 9 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. 20
      src/Automated.proj
  2. 23
      src/Setup/Files.wxs
  3. 8
      src/Setup/Setup.wxs

20
src/Automated.proj
Unescape View File

@ -13,6 +13,7 @@ @@ -13,6 +13,7 @@
<MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\Tools\MSBuildCommunityTasks</MSBuildCommunityTasksPath>
<ArtefactPrefix>SharpDevelop_3.1.0.</ArtefactPrefix>
<NUnitToolPath>$(MSBuildProjectDirectory)\Tools\NUnit</NUnitToolPath>
<ProfilerSrc>$(SharpDevelopSrc)\AddIns\Misc\Profiler</ProfilerSrc>
<!-- we cannot use <MSBuild> to build a solution because -->
<!-- A) passing properties to a solution called with <MSBuild> doesn't make the
@ -37,20 +38,15 @@ @@ -37,20 +38,15 @@
<Message Text="ArtefactsOutputDir=$(ArtefactsOutputDir)" Importance="high"/>
<Message Text="BuildProperties=$(BuildProperties)" Importance="high"/>
<CallTarget Targets="cleanunittests"/>
<Exec WorkingDirectory="$(SharpDevelopSrc)"
Command="$(MSBuildExecutable) SharpDevelop.sln /t:Clean $(BuildProperties)"/>
<CallTarget Targets="clean"/>
<CallTarget Targets="build"/>
<CallTarget Targets="createsetup"/>
<CallTarget Targets="buildunittests"/>
<CallTarget Targets="rununittests"/>
<CallTarget Targets="cleanunittests"/>
<Exec WorkingDirectory="$(SharpDevelopSrc)"
Command="$(MSBuildExecutable) SharpDevelop.sln /t:Clean $(BuildProperties)"/>
<CallTarget Targets="clean"/>
<CallTarget Targets="zipsource"/>
</Target>
@ -73,6 +69,8 @@ @@ -73,6 +69,8 @@
<Exec WorkingDirectory="$(SharpDevelopSrc)"
Command="$(MSBuildExecutable) SharpDevelop.sln $(BuildProperties)"/>
<Exec WorkingDirectory="$(ProfilerSrc)"
Command="$(MSBuildExecutable) AutomatedBuild.proj $(BuildProperties)"/>
</Target>
<Target Name="buildunittests">
@ -92,9 +90,13 @@ @@ -92,9 +90,13 @@
ToolPath="$(NUnitToolPath)"/>
</Target>
<Target Name="cleanunittests">
<Target Name="clean">
<Exec WorkingDirectory="$(SharpDevelopSrc)"
Command="$(MSBuildExecutable) SharpDevelop.sln /t:Clean $(BuildProperties)"/>
<Exec WorkingDirectory="$(SharpDevelopSrc)"
Command="$(MSBuildExecutable) SharpDevelop.Tests.sln /t:Clean $(BuildProperties)"/>
<Exec WorkingDirectory="$(ProfilerSrc)"
Command="$(MSBuildExecutable) AutomatedBuild.proj /t:Clean $(BuildProperties)"/>
</Target>
<Target Name="createsetup">

23
src/Setup/Files.wxs
Unescape View File

@ -1549,6 +1549,29 @@ @@ -1549,6 +1549,29 @@
<File Source="..\..\AddIns\AddIns\DisplayBindings\HexEditor\HexEditor.dll" Name="HexEditor.dll" Id="HexEditor.dll" KeyPath="yes" Assembly=".net" AssemblyApplication="HexEditor.dll" AssemblyManifest="HexEditor.dll" />
</Component>
</Directory>
<Directory Id="Profiler" Name="Profiler">
<Component Guid="C46A4B2C-D5DE-4548-B4A9-4B0AB8C105F3" Id="Hook32Dll" DiskId="1">
<File Source="..\..\AddIns\AddIns\Misc\Profiler\Hook32.dll" Name="Hook32.dll" Id="Hook32.dll" KeyPath="yes" />
</Component>
<Component Guid="AC57D4D8-C5CE-4905-BB9E-D7DD2E1F218B" Id="Hook64Dll" DiskId="1">
<File Source="..\..\AddIns\AddIns\Misc\Profiler\Hook64.dll" Name="Hook64.dll" Id="Hook64.dll" KeyPath="yes" />
</Component>
<Component Guid="FFFF6CFB-4C20-4934-85CA-51EE4BBAB219" Id="ICSharpCodeProfilerAddInAddin" DiskId="1">
<File Source="..\..\AddIns\AddIns\Misc\Profiler\ICSharpCode.Profiler.AddIn.addin" Name="ICSharpCode.Profiler.AddIn.addin" Id="ICSharpCode.Profiler.AddIn.addin" KeyPath="yes" />
</Component>
<Component Guid="39658202-7209-4C48-BD2F-426B5115C640" Id="ICSharpCodeProfilerAddInDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\Misc\Profiler\ICSharpCode.Profiler.AddIn.dll" Name="ICSharpCode.Profiler.AddIn.dll" Id="ICSharpCode.Profiler.AddIn.dll" KeyPath="yes" />
</Component>
<Component Guid="A4130504-0AB7-4ACA-BC43-61BBD2D88415" Id="ICSharpCodeProfilerControllerDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\Misc\Profiler\ICSharpCode.Profiler.Controller.dll" Name="ICSharpCode.Profiler.Controller.dll" Id="ICSharpCode.Profiler.Controller.dll" KeyPath="yes" />
</Component>
<Component Guid="AF6BA5E6-0EF1-40D4-B78A-D97100F57E0F" Id="ICSharpCodeProfilerControlsDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\Misc\Profiler\ICSharpCode.Profiler.Controls.dll" Name="ICSharpCode.Profiler.Controls.dll" Id="ICSharpCode.Profiler.Controls.dll" KeyPath="yes" />
</Component>
<Component Guid="30373CF2-3D49-41E1-987F-5C870531FB75" Id="SystemDataSQLiteDll" DiskId="1">
<File Source="..\..\AddIns\AddIns\Misc\Profiler\System.Data.SQLite.dll" Name="System.Data.SQLite.dll" Id="System.Data.SQLite.dll" KeyPath="yes" />
</Component>
</Directory>
</Directory>
</Directory>
</Directory>

8
src/Setup/Setup.wxs
Unescape View File

@ -441,6 +441,14 @@ @@ -441,6 +441,14 @@
<ComponentRef Id="HexEditorAddin"/>
<ComponentRef Id="HexEditorDll"/>
<ComponentRef Id="Hook32Dll"/>
<ComponentRef Id="Hook64Dll"/>
<ComponentRef Id="ICSharpCodeProfilerAddInAddin"/>
<ComponentRef Id="ICSharpCodeProfilerAddInDll"/>
<ComponentRef Id="ICSharpCodeProfilerControllerDll"/>
<ComponentRef Id="ICSharpCodeProfilerControlsDll"/>
<ComponentRef Id="SystemDataSQLiteDll"/>
</Feature>
<Feature Id="SharpDevelopFileAssociations"
Level="2"

Write Preview
Loading…
Cancel
Save