* build demo app into a single exe (embed dll using ILMerge)

ArthurHub · ArthurHub · commit 6b27a59fbf7d · 2014-01-17T16:58:59.000+02:00
diff --git a/Build/build.xml b/Build/build.xml
@@ -29,17 +29,17 @@
 
     <Message Importance="high" Text="====================== Build demo..."/>
     <CallTarget Targets="BuildDemo"/>
-
+    
     <Message Importance="high" Text="====================== Build libraries..."/>
     <CallTarget Targets="BuildLibrary"/>
-
+    
     <Message Importance="high" Text="====================== Get current version..."/>
     <GetAssemblyIdentity AssemblyFiles="$(OutputBinRoot)\NET20\HtmlRenderer.dll">
       <Output TaskParameter="Assemblies" ItemName="AsmInfo" />
     </GetAssemblyIdentity>
-
+    
     <Message Importance="high" Text="====================== Build demo..."/>
-    <CallTarget Targets="BuildDemo"/>
+    <CallTarget Targets="BuildDemo" />
 
     <Message Importance="high" Text="====================== Copy source..."/>
     <CallTarget Targets="CopySource"/>
@@ -56,9 +56,7 @@
     <Error Condition="!Exists('$(OutputBinRoot)\NET40\HtmlRenderer.dll')" Text="Validation failed (.NET 4.0)!" />
     <Error Condition="!Exists('$(OutputBinRoot)\NET45\HtmlRenderer.dll')" Text="Validation failed (.NET 4.5)!" />
     <Error Condition="!Exists('$(OutputSourceRoot)\HtmlRenderer.sln')" Text="Validation failed (Source)!" />
-    <Error Condition="!Exists('$(OutputRoot)\HtmlRendererDemo.exe')" Text="Validation failed (Demo)!" />
-    <Error Condition="!Exists('$(OutputRoot)\HtmlRenderer.dll')" Text="Validation failed (Demo)!" />
-    <Error Condition="!Exists('$(OutputRoot)\HtmlRenderer.dll')" Text="Validation failed (Demo)!" />
+    <Error Condition="!Exists('$(OutputRoot)\HtmlRendererDemo.WinForms.exe')" Text="Validation failed (Demo)!" />
     <Error Condition="!Exists('$(OutputRoot)\HtmlRenderer %(AsmInfo.Version).zip')" Text="Validation failed (zip)!" />
 
     <Message Importance="high" Text="====================== SUCCESS!"/>
@@ -90,13 +88,21 @@
     </CreateProperty>
   </Target>
 
-    <!--Build the demo application and delete the pdbs-->
+    <!--Build the demo application, merge to single exe and delete the rest of the files-->
   <Target Name="BuildDemo">
     <MSBuild Properties="$(BuildProperties);$(DemoBuildOutputPath);$(BuildWarn)" UseResultsCache="true" Targets="Rebuild" Projects="$(DemoRoot)\HtmlRenderer.Demo.csproj" />
+
+    <GetAssemblyIdentity AssemblyFiles="$(OutputRoot)\HtmlRenderer.dll">
+      <Output TaskParameter="Assemblies" ItemName="AsmInfo" />
+    </GetAssemblyIdentity>
+    
+    <Exec Command="ILMerge.exe $(OutputRoot)\HtmlRendererDemo.exe $(OutputRoot)\HtmlRenderer.dll /out:$(OutputRoot)\HtmlRendererDemo.WinForms.exe /ver:%(AsmInfo.Version)" />
+    
     <ItemGroup>
-      <files Include="$(OutputRoot)\*.*" Exclude="$(OutputRoot)\*.exe;$(OutputRoot)\*.dll;"/>
+      <files Include="$(OutputRoot)\*.*" Exclude="$(OutputRoot)\HtmlRendererDemo.WinForms.exe"/>
     </ItemGroup>
     <Delete Files="@(files)"/>
+    
   </Target>
 
   <!--Copy all the source and remove the bin and obj folders-->
