From 7cac2b5418d2f18b5bb24ade3dfe3b8afb7f54e3 Mon Sep 17 00:00:00 2001
From: Rahul Kumar <rahku@microsoft.com>
Date: Wed, 13 Jan 2016 15:34:21 -0800
Subject: coreclr BuildTools for github builds - instead of building the tools
 (which do not change) create a nuget package This contains changes for
 following:      1. Binplace & sign following binaries        a.
 pdbtypematch.exe (only build in x86 ret .... build errors for other flavors) 
       b. dactableGen.exe        c. dialib.dll        d.
 GenClrDebugResource.exe        e. InjectResource.exe      2. add sources of
 PdbTypeMatch tools in github      3. bump up the version of coreclr
 buildtools package to 1.0.4      4. add above tools to coreclr buildtools
 package      5. remove bclrewriter from coreclr buildtools package      6.
 build dotnet.builtools.coreclr package only for x86 ret builds as
 pdbtypematch.exe only builds for ret flavor.

[tfs-changeset: 1564332]
---
 src/tools/GenClrDebugResource/GenClrDebugResource.nativeproj | 4 +++-
 src/tools/GenClrDebugResource/native.rc                      | 4 ++++
 src/tools/InjectResource/InjectResource.nativeproj           | 5 ++++-
 src/tools/InjectResource/native.rc                           | 4 ++++
 src/tools/dirs.proj                                          | 7 ++++++-
 5 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 src/tools/GenClrDebugResource/native.rc
 create mode 100644 src/tools/InjectResource/native.rc

(limited to 'src/tools')

diff --git a/src/tools/GenClrDebugResource/GenClrDebugResource.nativeproj b/src/tools/GenClrDebugResource/GenClrDebugResource.nativeproj
index d5ce2158ca..9bd544d8d0 100644
--- a/src/tools/GenClrDebugResource/GenClrDebugResource.nativeproj
+++ b/src/tools/GenClrDebugResource/GenClrDebugResource.nativeproj
@@ -10,7 +10,6 @@
     <OutputName>GenClrDebugResource</OutputName>
     <TargetType>PROGRAM</TargetType>
     <LinkSubsystem>console</LinkSubsystem>
-    <BinplaceSymbols>false</BinplaceSymbols>
     <LinkGenerateManifest>true</LinkGenerateManifest>
     <LinkAdditionalOptions>$(LinkAdditionalOptions) /MANIFEST</LinkAdditionalOptions>
     <UseMsvcrt>false</UseMsvcrt>
@@ -19,6 +18,9 @@
   <ItemGroup>
     <CppCompile Include="GenClrDebugResource.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <RCResourceFile Include="native.rc" />
+  </ItemGroup>
   <!--Import the targets-->
   <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/tools/GenClrDebugResource/native.rc b/src/tools/GenClrDebugResource/native.rc
new file mode 100644
index 0000000000..c4474f2ae4
--- /dev/null
+++ b/src/tools/GenClrDebugResource/native.rc
@@ -0,0 +1,4 @@
+#define FX_VER_FILEDESCRIPTION_STR "Microsoft\0"
+
+#include <fxver.h>
+#include <fxver.rc>
diff --git a/src/tools/InjectResource/InjectResource.nativeproj b/src/tools/InjectResource/InjectResource.nativeproj
index fc77425a2e..057d01f4ec 100644
--- a/src/tools/InjectResource/InjectResource.nativeproj
+++ b/src/tools/InjectResource/InjectResource.nativeproj
@@ -10,7 +10,7 @@
     <OutputName>InjectResource</OutputName>
     <TargetType>PROGRAM</TargetType>
     <LinkSubsystem>console</LinkSubsystem>
-    <BinplaceSymbols>false</BinplaceSymbols>
+    <BinplaceSymbols>true</BinplaceSymbols>
     <LinkGenerateManifest>true</LinkGenerateManifest>
     <LinkAdditionalOptions>$(LinkAdditionalOptions) /MANIFEST</LinkAdditionalOptions>
     <UseMsvcrt>false</UseMsvcrt>
@@ -19,6 +19,9 @@
   <ItemGroup>
     <CppCompile Include="InjectResource.cpp" />
   </ItemGroup>
+  <ItemGroup>
+    <RCResourceFile Include="native.rc" />
+  </ItemGroup>
   <!--Import the targets-->
   <Import Project="$(_NTDRIVE)$(_NTROOT)\ndp\clr\clr.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/tools/InjectResource/native.rc b/src/tools/InjectResource/native.rc
new file mode 100644
index 0000000000..c4474f2ae4
--- /dev/null
+++ b/src/tools/InjectResource/native.rc
@@ -0,0 +1,4 @@
+#define FX_VER_FILEDESCRIPTION_STR "Microsoft\0"
+
+#include <fxver.h>
+#include <fxver.rc>
diff --git a/src/tools/dirs.proj b/src/tools/dirs.proj
index 2a17d6d703..21f28331ca 100644
--- a/src/tools/dirs.proj
+++ b/src/tools/dirs.proj
@@ -48,7 +48,12 @@
     <ProjectFile Include="McjProfofileUtil\McjProfileUtil.csproj" Condition="'$(BuildArchitecture)' != 'arm' and '$(BuildArchitecture)' != 'arm64'" />
     <ProjectFile Include="winphoneintegrate\winphoneintegrate.csproj" />
     <ProjectFile Include="crossgen\crossgen.nativeproj" />
-    <ProjectFile Include="GenClrDebugResource\GenClrDebugResource.nativeproj" />
+    <ProjectFile Include="GenClrDebugResource\GenClrDebugResource.nativeproj" >
+        <ProductGroups>FX;PK</ProductGroups>
+    </ProjectFile>
+    <ProjectFile Include="InjectResource\InjectResource.nativeproj" Condition="'$(BuildArchitecture)' == 'i386'">
+        <ProductGroups>FX;PK</ProductGroups>
+    </ProjectFile>
   </ItemGroup>
   
   <!-- CoreClr -->
-- 
cgit v1.2.3