- added automatic x64 build of Hook

- added Profiler back to setup

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@4997 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

clean.bat

@@ -1,4 +1,2 @@
 %windir%\microsoft.net\framework\v4.0.20506\msbuild /m /t:clean SharpDevelop.sln "/p:FSharpBuildTasksPath=%CD%\src\AddIns\BackendBindings\FSharp\RequiredLibraries" "/p:Platform=Any CPU"
-@IF %ERRORLEVEL% NEQ 0 PAUSE
-REM %windir%\microsoft.net\framework\v4.0.20506\msbuild /m /t:clean src\AddIns\Misc\Profiler\AutomatedBuild.proj
 @IF %ERRORLEVEL% NEQ 0 PAUSE

releasebuild.bat

@@ -1,7 +1,5 @@
 %windir%\microsoft.net\framework\v4.0.20506\msbuild /m /property:Configuration=Release SharpDevelop.sln "/p:FSharpBuildTasksPath=%CD%\src\AddIns\BackendBindings\FSharp\RequiredLibraries" "/p:Platform=Any CPU"
 @IF %ERRORLEVEL% NEQ 0 GOTO err
-rem %windir%\microsoft.net\framework\v4.0.20506\msbuild /m src\AddIns\Misc\Profiler\AutomatedBuild.proj /p:Configuration=Debug
-@IF %ERRORLEVEL% NEQ 0 GOTO err
 @exit /B 0
 :err
 @PAUSE

src/AddIns/Misc/Profiler/Hook/Hook.vcxproj

@@ -157,6 +157,11 @@
       <TargetMachine>MachineX64</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
+	<PostBuildEvent>
+	  <Command>$(MSBuildBinPath)\MSBuild Hook.vcxproj /p:Configuration=$(Configuration) /p:Platform=x64</Command>
+	</PostBuildEvent>
+  </ItemDefinitionGroup>
   <ItemGroup>
     <ClInclude Include="allocator.h" />
     <ClInclude Include="Callback.h" />

src/Setup/Files.wxs

@@ -1596,7 +1596,7 @@
 											<File Source="..\..\AddIns\AddIns\Misc\SharpRefactoring\SharpRefactoring.dll" Name="SharpRefactoring.dll" Id="SharpRefactoring.dll" KeyPath="yes" />
 										</Component>
 									</Directory>
-									<!--<Directory Id="Profiler" Name="Profiler">
+									<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>
@@ -1618,7 +1618,7 @@
 										<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 Id="UsageDataCollector" Name="UsageDataCollector">
 										<Component Guid="952BD2C8-F477-4C87-A869-80E4B5E955D6" Id="UDCSystemDataSQLiteDll" DiskId="1">
 											<File Source="..\..\AddIns\AddIns\Misc\UsageDataCollector\System.Data.SQLite.dll" Name="System.Data.SQLite.dll" Id="System.Data.SQLite.dll" KeyPath="yes" />

src/Setup/Setup.wxs

@@ -431,13 +431,13 @@
 				<ComponentRef Id="AvalonEditAddInAddin"/>
 				<ComponentRef Id="ICSharpCodeAvalonEditAddInDll"/>
 				
-				<!--<ComponentRef Id="Hook32Dll"/>
+				<ComponentRef Id="Hook32Dll"/>
 				<ComponentRef Id="Hook64Dll"/>
 				<ComponentRef Id="ICSharpCodeProfilerAddInAddin"/>
 				<ComponentRef Id="ICSharpCodeProfilerAddInDll"/>
 				<ComponentRef Id="ICSharpCodeProfilerControllerDll"/>
 				<ComponentRef Id="ICSharpCodeProfilerControlsDll"/>
-				<ComponentRef Id="SystemDataSQLiteDll"/>-->
+				<ComponentRef Id="SystemDataSQLiteDll"/>
 			
 				<ComponentRef Id="CppBindingAddin"/>
 				<ComponentRef Id="CppBindingDll"/>

src/Tools/Tools.build

@@ -92,6 +92,8 @@
 		<CleanupDirectories Include="..\..\bin\setup\help"/>
 		<CleanupDirectories Include="..\..\AddIns\Addins"/>
 		<CleanupDirectories Include="..\setup\bin"/>
+		<CleanupDirectories Include="..\AddIns\Misc\Profiler\bin"/>
+		<CleanupDirectories Include="..\AddIns\Misc\Profiler\Hook\obj"/>
 	</ItemGroup>
 	
 	<Target Name="Clean">