[Build][Installer] Closes #70. Adds installer for net-4.0 configurati…

…on with VS2010 integration support.
rsdn · Sep 1, 2011 · deb3187 · deb3187
1 parent 570d5eb
commit deb3187
Show file tree

Hide file tree

Showing 22 changed files with 826 additions and 17 deletions.
diff --git a/.gitignore b/.gitignore
@@ -25,4 +25,7 @@ snippets/WordToRsdnMlConverter/WordToRsdnMlConverter/Templates/Normal.dot
 VsIntegration/Nemerle.VisualStudio/Templates/Projects/Web/WSWebSite/Nemerle.Compiler.dll
 VsIntegration/Nemerle.VisualStudio/Templates/Projects/Web/WSWebSite/Nemerle.Macros.dll
 VsIntegration/Nemerle.VisualStudio/Templates/Projects/Web/WSWebSite/Nemerle.dll
-*~$*.dot
+*~$*.dot
+misc/packages/wix/net-?.?/bin/*.*
+misc/packages/wix/net-?.?/dist/*.*
+misc/packages/wix/net-?.?/obj/*.*
diff --git a/BuildInstallerFast-4.cmd b/BuildInstallerFast-4.cmd
@@ -0,0 +1,3 @@
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
+
+%MSBuild% NemerleAll.nproj /t:InstallerFast /tv:4.0 /p:TargetFrameworkVersion=v4.0;Configuration=Release
diff --git a/BuildInstallerFull-4.cmd b/BuildInstallerFull-4.cmd
@@ -0,0 +1,3 @@
+set MSBuild="%SystemRoot%\Microsoft.NET\Framework\v4.0.30319\msbuild.exe"
+
+%MSBuild% NemerleAll.nproj /t:InstallerFull /tv:4.0 /p:TargetFrameworkVersion=v4.0;Configuration=Release
diff --git a/misc/packages/wix/net-3.5/src/License.rtf → License.rtf b/misc/packages/wix/net-3.5/src/License.rtf → License.rtf
diff --git a/misc/packages/wix/net-3.5/nemerle.wixproj b/misc/packages/wix/net-3.5/nemerle.wixproj
@@ -88,13 +88,18 @@
     <Compile Include="src\vs-shell.wxs" />
     <Compile Include="src\vstudio.wxs" />
   </ItemGroup>
+  <PropertyGroup>
+    <NRoot>..\..\..\..</NRoot>
+    <VSBinDir>$(NRoot)\bin\$(Configuration)\net-3.5\VsIntegration</VSBinDir>
+    <VSObjDir>$(NRoot)\obj\$(Configuration)\net-3.5\VsIntegration</VSObjDir>
+  </PropertyGroup>
   <ItemGroup>
-    <Content Include="src\bannrbmp.bmp" />
-    <Content Include="src\Console.ico" />
-    <Content Include="src\dlgbmp.bmp" />
-    <Content Include="src\Help.ico" />
-    <Content Include="src\License.rtf" />
-    <Content Include="src\Nemerle.ico" />
+    <Content Include="..\resources\bannrbmp.bmp" />
+    <Content Include="..\resources\Console.ico" />
+    <Content Include="..\resources\dlgbmp.bmp" />
+    <Content Include="..\resources\Help.ico" />
+    <Content Include="..\resources\Nemerle.ico" />
+    <Content Include="$(NRoot)\License.rtf" />
     <Content Include="src\NemerleItemTemplates.wxi" />
     <Content Include="src\NemerleProjectTemplates.wxi" />
     <Content Include="src\NemerleWebAppItemTemplates.wxi" />
@@ -114,11 +119,6 @@
     </WixExtension>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets" />
-  <PropertyGroup>
-    <NRoot>..\..\..\..</NRoot>
-    <VSBinDir>$(NRoot)\bin\$(Configuration)\net-3.5\VsIntegration</VSBinDir>
-    <VSObjDir>$(NRoot)\obj\$(Configuration)\net-3.5\VsIntegration</VSObjDir>
-  </PropertyGroup>
   <ItemGroup>
     <Docs Include="..\docs\**\*.*" />
     <VSBin Include="$(VSBinDir)\*.*" />

diff --git a/misc/packages/wix/net-3.5/src/CompilerAndTools.wxs b/misc/packages/wix/net-3.5/src/CompilerAndTools.wxs
@@ -80,8 +80,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
         <?if $(var.IncludePdb) != false ?>
           <File Id="File_ncc.pdb" Name="ncc.pdb"  Source="dist\net-3.5\bin\"/>
         <?endif ?>
+        <!--
         <Environment Id="Env_Nemerle" Action="set" System="yes" Name="Nemerle" Value="[APPLICATIONFOLDER]" />
         <Environment Id="Env_Path" Action="set" Part="last" System="yes" Name="Path" Value="[APPLICATIONFOLDER]" />
+        -->
         <RegistryValue Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\ncc.exe"
          Value="[#File_ncc.exe]" Type="string"/>
       </Component>

diff --git a/misc/packages/wix/net-3.5/src/Documentation.wxs b/misc/packages/wix/net-3.5/src/Documentation.wxs
@@ -38,7 +38,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
   <Fragment>
 
-   	<Icon Id="Help.ico" SourceFile="src/Help.ico" />
+   	<Icon Id="Help.ico" SourceFile="../resources/Help.ico" />
 
     <ComponentGroup Id="CompGroup_Documentation">
 

diff --git a/misc/packages/wix/net-3.5/src/Product.wxs b/misc/packages/wix/net-3.5/src/Product.wxs
@@ -22,7 +22,7 @@
     <Media Id="1" Cabinet="Nemerle.cab" EmbedCab="yes" CompressionLevel="high" />
 
     <!-- Icons -->
-    <Icon Id="NemerleIcon" SourceFile="src/Nemerle.ico" />
+    <Icon Id="NemerleIcon" SourceFile="../resources/Nemerle.ico" />
 
     <!-- Properties -->
     <Property Id="ARPPRODUCTICON"   Value="NemerleIcon" /> 
@@ -33,9 +33,9 @@
     <Property Id="UNINSTALLARGS" Value="/X{$(var.ProductGuid)}" />
     <Property Id="UNINSTALLCMD" Value="MSIEXEC.EXE" />
 
-    <WixVariable Id="WixUILicenseRtf" Value="src/License.rtf" />
-    <WixVariable Id="WixUIBannerBmp" Value="src/bannrbmp.bmp" />
-    <WixVariable Id="WixUIDialogBmp" Value="src/dlgbmp.bmp" />
+    <WixVariable Id="WixUILicenseRtf" Value="../../../../License.rtf" />
+    <WixVariable Id="WixUIBannerBmp" Value="../resources/bannrbmp.bmp" />
+    <WixVariable Id="WixUIDialogBmp" Value="../resources/dlgbmp.bmp" />
 
     <!-- Root directories -->
     <Directory Id="TARGETDIR" Name="SourceDir">

diff --git a/misc/packages/wix/net-4.0/nemerle.sln b/misc/packages/wix/net-4.0/nemerle.sln
@@ -0,0 +1,32 @@
+
+Microsoft Visual Studio Solution File, Format Version 10.00
+# Visual Studio 2008
+Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "nemerle", "nemerle.wixproj", "{043F1AEC-0396-4498-9CFE-AE8F12B9D5F2}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Debug|Mixed Platforms = Debug|Mixed Platforms
+		Debug|x86 = Debug|x86
+		Release|Any CPU = Release|Any CPU
+		Release|Mixed Platforms = Release|Mixed Platforms
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{043F1AEC-0396-4498-9CFE-AE8F12B9D5F2}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{043F1AEC-0396-4498-9CFE-AE8F12B9D5F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{043F1AEC-0396-4498-9CFE-AE8F12B9D5F2}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{043F1AEC-0396-4498-9CFE-AE8F12B9D5F2}.Debug|Mixed Platforms.Build.0 = Debug|x86
+		{043F1AEC-0396-4498-9CFE-AE8F12B9D5F2}.Debug|x86.ActiveCfg = Debug|x86
+		{043F1AEC-0396-4498-9CFE-AE8F12B9D5F2}.Debug|x86.Build.0 = Debug|x86
+		{043F1AEC-0396-4498-9CFE-AE8F12B9D5F2}.Release|Any CPU.ActiveCfg = Release|x86
+		{043F1AEC-0396-4498-9CFE-AE8F12B9D5F2}.Release|Any CPU.Build.0 = Release|Any CPU
+		{043F1AEC-0396-4498-9CFE-AE8F12B9D5F2}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{043F1AEC-0396-4498-9CFE-AE8F12B9D5F2}.Release|Mixed Platforms.Build.0 = Release|x86
+		{043F1AEC-0396-4498-9CFE-AE8F12B9D5F2}.Release|x86.ActiveCfg = Release|x86
+		{043F1AEC-0396-4498-9CFE-AE8F12B9D5F2}.Release|x86.Build.0 = Release|x86
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/misc/packages/wix/net-4.0/nemerle.wixproj b/misc/packages/wix/net-4.0/nemerle.wixproj
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <ProductVersion>3.5</ProductVersion>
+    <ProjectGuid>{2d7a97ad-43ae-4ad3-97ed-f8868a03007d}</ProjectGuid>
+    <SchemaVersion>2.0</SchemaVersion>
+    <OutputName>NemerleSetup</OutputName>
+    <OutputType>Package</OutputType>
+    <WixToolPath>$(WIX)\bin\</WixToolPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
+    <OutputPath>bin\Debug\</OutputPath>
+    <IntermediateOutputPath>obj\Debug\</IntermediateOutputPath>
+    <DefineConstants>Debug;Type=Debug;IncludePdb=true</DefineConstants>
+    <IncludeSearchPaths>
+    </IncludeSearchPaths>
+    <Pedantic>False</Pedantic>
+    <ShowSourceTrace>False</ShowSourceTrace>
+    <SuppressSchemaValidation>False</SuppressSchemaValidation>
+    <SuppressSpecificWarnings>
+    </SuppressSpecificWarnings>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <VerboseOutput>False</VerboseOutput>
+    <AllowIdenticalRows>False</AllowIdenticalRows>
+    <CabinetCachePath>
+    </CabinetCachePath>
+    <CabinetCreationThreadCount>-1</CabinetCreationThreadCount>
+    <Cultures>
+    </Cultures>
+    <LeaveTemporaryFiles>False</LeaveTemporaryFiles>
+    <LinkerPedantic>False</LinkerPedantic>
+    <ReuseCabinetCache>False</ReuseCabinetCache>
+    <SetMsiAssemblyNameFileVersion>False</SetMsiAssemblyNameFileVersion>
+    <SuppressAclReset>False</SuppressAclReset>
+    <SuppressAssemblies>False</SuppressAssemblies>
+    <SuppressDefaultAdminSequenceActions>False</SuppressDefaultAdminSequenceActions>
+    <SuppressDefaultAdvSequenceActions>False</SuppressDefaultAdvSequenceActions>
+    <SuppressDefaultUISequenceActions>False</SuppressDefaultUISequenceActions>
+    <SuppressDroppingUnrealTables>False</SuppressDroppingUnrealTables>
+    <SuppressFileHashAndInfo>False</SuppressFileHashAndInfo>
+    <SuppressFiles>False</SuppressFiles>
+    <SuppressIces>
+    </SuppressIces>
+    <LinkerSuppressIntermediateFileVersionMatching>False</LinkerSuppressIntermediateFileVersionMatching>
+    <SuppressLayout>False</SuppressLayout>
+    <SuppressMsiAssemblyTableProcessing>False</SuppressMsiAssemblyTableProcessing>
+    <LinkerSuppressSchemaValidation>False</LinkerSuppressSchemaValidation>
+    <LinkerSuppressSpecificWarnings>
+    </LinkerSuppressSpecificWarnings>
+    <SuppressValidation>False</SuppressValidation>
+    <LinkerTreatWarningsAsErrors>False</LinkerTreatWarningsAsErrors>
+    <LinkerVerboseOutput>False</LinkerVerboseOutput>
+    <WixVariables>
+    </WixVariables>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <OutputPath>bin\Release\</OutputPath>
+    <IntermediateOutputPath>obj\Release\</IntermediateOutputPath>
+    <DefineConstants>Type=Release;IncludePdb=false</DefineConstants>
+    <IncludeSearchPaths>
+    </IncludeSearchPaths>
+    <Pedantic>False</Pedantic>
+    <ShowSourceTrace>False</ShowSourceTrace>
+    <SuppressSchemaValidation>False</SuppressSchemaValidation>
+    <SuppressSpecificWarnings>
+    </SuppressSpecificWarnings>
+    <TreatWarningsAsErrors>False</TreatWarningsAsErrors>
+    <VerboseOutput>False</VerboseOutput>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
+    <DefineConstants>Debug;Type=Debug;IncludePdb=true</DefineConstants>
+    <SuppressSpecificWarnings>1080</SuppressSpecificWarnings>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
+    <DefineConstants>Type=Release;IncludePdb=false</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <Folder Include="src" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="src\Documentation.wxs" />
+    <Compile Include="src\PowerPack.wxs" />
+    <Compile Include="src\Product.wxs" />
+    <Compile Include="src\NemerleRuntime.wxs" />
+    <Compile Include="src\CompilerAndTools.wxs" />
+    <Compile Include="src\Vs2010Extension.wxs" />
+  </ItemGroup>
+  <PropertyGroup>
+    <NRoot>..\..\..\..</NRoot>
+    <VSBinDir>$(NRoot)\bin\$(Configuration)\net-4.0\VsIntegration</VSBinDir>
+  </PropertyGroup>
+  <ItemGroup>
+    <Content Include="..\resources\bannrbmp.bmp" />
+    <Content Include="..\resources\Console.ico" />
+    <Content Include="..\resources\dlgbmp.bmp" />
+    <Content Include="..\resources\Nemerle.ico" />
+    <Content Include="$(NRoot)\License.rtf" />
+  </ItemGroup>
+  <ItemGroup>
+    <WixExtension Include="WixUIExtension">
+      <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
+      <Name>WixUIExtension</Name>
+    </WixExtension>
+    <WixExtension Include="WixNetFxExtension">
+      <HintPath>$(WixExtDir)\WixNetFxExtension.dll</HintPath>
+      <Name>WixNetFxExtension</Name>
+    </WixExtension>
+  </ItemGroup>
+  <Import Project="$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets" />
+  <ItemGroup>
+    <Docs Include="..\docs\**\*.*" />
+    <VSBin Include="$(VSBinDir)\Nemerle.VisualStudio.vsix" />
+    <NLinq Include="$(NRoot)\bin\$(Configuration)\net-4.0\Linq\Nemerle.Linq.*" />
+    <PowerPack Include="$(NRoot)\bin\$(Configuration)\net-4.0\PowerPack\*.*" />
+    <!--<CompilerBin Include="$(Nemerle)\*.*" />-->
+    <CompilerBin Include="$(NRoot)\bin\$(Configuration)\net-4.0\Stage4\*.*" />
+    <ToolsBin Include="$(NRoot)\bin\$(Configuration)\net-4.0\Tools\*.*" />
+  </ItemGroup>
+  <Target Name="BeforeBuild">
+    <RemoveDir Directories="dist" />
+    <Copy SourceFiles="@(CompilerBin)" DestinationFolder="dist\net-4.0\bin" />
+    <Copy SourceFiles="@(VSBin)" DestinationFolder="dist\net-4.0\bin" />
+    <Copy SourceFiles="@(NLinq)" DestinationFolder="dist\net-4.0\bin" />
+    <Copy SourceFiles="@(PowerPack)" DestinationFolder="dist\net-4.0\power-pack" />
+    <Copy SourceFiles="$(NRoot)\tools\msbuild-task\Nemerle.MSBuild.targets" DestinationFolder="dist\net-4.0\bin" />
+    <Copy SourceFiles="@(Docs)" DestinationFiles="@(Docs->'dist\net-4.0\docs\%(RecursiveDir)%(Filename)%(Extension)')" />
+    <Copy SourceFiles="@(ToolsBin)" DestinationFolder="dist\net-4.0\bin" />
+    <Copy SourceFiles="$(NRoot)\ExternalDependences\SetJunction.exe" DestinationFolder="dist\net-4.0\bin" />
+    <GetFrameworkSdkPath>
+      <Output TaskParameter="Path" PropertyName="SDK" />
+    </GetFrameworkSdkPath>
+    <PropertyGroup>
+      <Sed>"$(NRoot)\ExternalDependences\sed.exe"</Sed>
+    </PropertyGroup>
+    <GetAssemblyIdentity AssemblyFiles="dist\net-4.0\bin\Nemerle.dll">
+      <Output TaskParameter="Assemblies" ItemName="AssemblyVersion" />
+    </GetAssemblyIdentity>
+    <PropertyGroup>
+      <ActualVersion>%(AssemblyVersion.Version)</ActualVersion>
+    </PropertyGroup>
+    <Exec Command="$(Sed) s/\$AssemblyVersion\$/$(ActualVersion)/g src\Version.wxi.template > src\Version.wxi" WorkingDirectory="." />
+  </Target>
+  <Target Name="AfterBuild">
+    <ItemGroup>
+      <OutputFiles Include="$(OutputPath)\*.*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(OutputFiles)" DestinationFiles="@(OutputFiles->'$(NRoot)\bin\$(Configuration)\net-4.0\Installer\%(Filename)-net-4.0-v$(ActualVersion)%(Extension)')" />
+    <Delete Files="@(OutputFiles)" />
+    <Delete Files="src\Version.wxi" />
+  </Target>
+</Project>
diff --git a/misc/packages/wix/net-4.0/src/CompilerAndTools.wxs b/misc/packages/wix/net-4.0/src/CompilerAndTools.wxs
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
+ xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
+
+  <Fragment>
+    <ComponentGroup Id="CompGroup_NemerleBinaries">
+
+      <!-- Nemerle compiler (GAC folder) -->
+      <ComponentRef Id="Comp_NemerleCompilerGAC" />
+      <ComponentRef Id="Comp_NemerleMacrosGAC" />
+      <!-- Nemerle evaluation (GAC folder) -->
+      <ComponentRef Id="Comp_NemereEvaluationGAC" />
+
+      <!-- Nemerle compiler (bin folder) -->
+      <ComponentRef Id="Comp_NemerleCompiler" />
+      <ComponentRef Id="Comp_NemerleCompilerFrontEnd" />
+      <ComponentRef Id="Comp_NemerleMacros" />
+
+      <!-- MSBuild task (bin folder) -->
+      <ComponentRef Id="Comp_MSBuild" />
+
+      <!-- NAnt task (bin folder) -->
+      <ComponentRef Id="Comp_NAnt" />
+    </ComponentGroup>
+
+    <!--<DirectoryRef Id="BINDIR">-->
+    <DirectoryRef Id="APPLICATIONFOLDER">
+
+      <Component Id="Comp_NemerleCompiler" DiskId="1" Guid="d790d5a5-73c8-46fd-abd3-e628eadecb1f">
+        <File Id="File_Nemerle.Compiler.dll" Name="Nemerle.Compiler.dll"  Source="dist\net-4.0\bin\">
+           <netfx:NativeImage Priority="1" Platform="all" Id="Image_Nemerle.Compiler.dll" Dependencies="no" AppBaseDirectory="APPLICATIONFOLDER" />
+        </File>
+        <File Id="File_Nemerle.Compiler.xml" Name="Nemerle.Compiler.xml"  Source="dist\net-4.0\bin\"/>
+        <?if $(var.IncludePdb) != false ?>
+          <File Id="File_Nemerle.Compiler.pdb" Name="Nemerle.Compiler.pdb"  Source="dist\net-4.0\bin\"/>
+        <?endif ?>
+      </Component>      
+      <Component Id="Comp_NemerleMacros" DiskId="1" Guid="adcac690-a2ba-4165-864b-2342e5d96bee">
+        <File Id="File_Nemerle.Macros.dll"   Name="Nemerle.Macros.dll"    Source="dist\net-4.0\bin\">
+           <netfx:NativeImage Priority="1" Platform="all" Id="Image_Nemerle.Macros.dll" Dependencies="no" AppBaseDirectory="APPLICATIONFOLDER" />
+        </File>
+        <File Id="File_Nemerle.Macros.xml" Name="Nemerle.Macros.xml"  Source="dist\net-4.0\bin\"/>
+        <?if $(var.IncludePdb) != false ?>
+          <File Id="File_Nemerle.Macros.pdb" Name="Nemerle.Macros.pdb"  Source="dist\net-4.0\bin\"/>
+        <?endif ?>
+      </Component>      
+
+      <Component Id="Comp_NemerleCompilerFrontEnd" DiskId="1" Guid="df936f75-4632-4319-a958-93de25252778">
+        <File Id="File_ncc.exe" Name="ncc.exe" Source="dist\net-4.0\bin\" >
+           <netfx:NativeImage Priority="1" Platform="all" Id="Image_ncc.exe" Dependencies="no" AppBaseDirectory="APPLICATIONFOLDER" />
+        </File>
+        <?if $(var.IncludePdb) != false ?>
+          <File Id="File_ncc.pdb" Name="ncc.pdb"  Source="dist\net-4.0\bin\"/>
+        <?endif ?>
+        <!--
+        <Environment Id="Env_Nemerle" Action="set" System="yes" Name="Nemerle" Value="[APPLICATIONFOLDER]" />
+        <Environment Id="Env_Path" Action="set" Part="last" System="yes" Name="Path" Value="[APPLICATIONFOLDER]" />
+        <RegistryValue Root="HKLM" Key="SOFTWARE\Microsoft\Windows\CurrentVersion\App Paths\ncc.exe"
+         Value="[#File_ncc.exe]" Type="string"/>
+        -->
+      </Component>
+
+      <Component Id="Comp_MSBuild" DiskId="1" Guid="586d3bf5-9fa2-40d5-b232-238fbaeccc70">
+        <File Id="File_Nemerle.MSBuild.Tasks.dll" Name="Nemerle.MSBuild.Tasks.dll" Source="dist\net-4.0\bin\" >
+           <netfx:NativeImage Priority="1" Platform="all" Id="Image_Nemerle.MSBuild.Tasks.dll" Dependencies="no" AppBaseDirectory="APPLICATIONFOLDER" />
+        </File>
+        <!-- <File Id="File_Nemerle.MSBuild.Tasks.xml" Name="Nemerle.MSBuild.Tasks.xml" Source="dist\net-4.0\bin\" /> -->
+        <?if $(var.IncludePdb) != false ?>
+          <File Id="File_Nemerle.MSBuild.Tasks.pdb" Name="Nemerle.MSBuild.Tasks.pdb" Source="dist\net-4.0\bin\"/>
+        <?endif ?>
+        <File Id="File_Nemerle.MSBuild.targets" Name="Nemerle.MSBuild.targets" Source="dist\net-4.0\bin\" />
+        <RegistryKey Root="HKLM" Key="Software\Microsoft\VisualStudio\10.0\MSBuild\SafeImports">
+          <RegistryValue Name="Nemerle" Value="[#File_Nemerle.MSBuild.targets]" Type="string" />
+        </RegistryKey>
+      </Component>
+
+      <Component Id="Comp_NAnt" DiskId="1" Guid="8cf53a75-ee8e-479a-9196-0f1f43328bec">
+        <File Id="File_Nemerle.NAnt.Tasks.dll" Name="Nemerle.NAnt.Tasks.dll"       Source="dist\net-4.0\bin\" >
+           <!--
+            Nemerle.NAnt.Tasks.dll does not have a strong name and
+            therefore can not be compiled to a native executable.
+           -->
+           <!-- <netfx:NativeImage Priority="1" Platform="all" Id="Image_Nemerle.NAnt.Tasks.dll" Dependencies="no" AppBaseDirectory="APPLICATIONFOLDER" /> -->
+        </File>
+        <!--<File Id="File_Nemerle.NAnt.Tasks.xml" Name="Nemerle.NAnt.Tasks.xml"       Source="dist\net-4.0\bin\" />-->
+        <?if $(var.IncludePdb) != false ?>
+          <File Id="File_Nemerle.NAnt.Tasks.pdb" Name="Nemerle.NAnt.Tasks.pdb"  Source="dist\net-4.0\bin\"/>
+        <?endif ?>
+      </Component>
+
+    </DirectoryRef>
+
+    <DirectoryRef Id="APPLICATIONFOLDER">
+      <Directory Id = "CompilerGAC" Name="CompilerGAC">
+
+      <Component Id="Comp_NemerleCompilerGAC" DiskId="1" Guid="b8a9a537-bb79-44c0-b447-67d5fb036f0e">
+        <File Id="Gac_Nemerle.Compiler.dll" Name="Nemerle.Compiler.dll" Source="dist\net-4.0\bin\" Assembly=".net" KeyPath="yes" />
+      </Component>      
+      <Component Id="Comp_NemerleMacrosGAC" DiskId="1" Guid="cd739374-356a-4fb2-9041-37b769b55047">
+        <File Id="Gac_Nemerle.Macros.dll"   Name="Nemerle.Macros.dll" Source="dist\net-4.0\bin\" Assembly=".net" KeyPath="yes" />
+      </Component>      
+      <Component Id="Comp_NemereEvaluationGAC" DiskId="1" Guid="ce75d335-171e-4b33-9dad-c9b64c5007c1">
+        <File Id="Gac_Nemerle.Evaluation.dll" Name="Nemerle.Evaluation.dll" Source="dist\net-4.0\bin\" Assembly=".net" KeyPath="yes" />
+      </Component>
+      </Directory>
+    </DirectoryRef>
+
+  </Fragment>
+</Wix>