From 7756b2e4706b67790378e4091baa8d4e277771a2 Mon Sep 17 00:00:00 2001
From: Fredrik Orderud <fredrik.orderud@ge.com>
Date: Sun, 4 Feb 2018 22:44:22 +0100
Subject: [PATCH 1/4] Generate type libraries directly in $(OutDir) and run
 tlbimp directly in that folder. Postpone copying of file to
 $(SolutionDir)$(Platform) to the end.

Done to make it possible to separate debug- from release-builds of the type libraries.
---
 Image3dAPI/Image3dAPI.vcxproj | 44 ++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 16 deletions(-)

diff --git a/Image3dAPI/Image3dAPI.vcxproj b/Image3dAPI/Image3dAPI.vcxproj
index ee1ecac..bba0bbf 100644
--- a/Image3dAPI/Image3dAPI.vcxproj
+++ b/Image3dAPI/Image3dAPI.vcxproj
@@ -85,13 +85,16 @@
     <Midl>
       <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>$(ProjectName).tlb</TypeLibraryName>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
     </Midl>
     <PostBuildEvent>
-      <Command>xcopy /Y /D "$(IntDir)$(TargetName).tlb"  "$(SolutionDir)$(Platform)"
-TlbImp.exe /machine:x86 "$(IntDir)$(TargetName).tlb" /out:$(SolutionDir)$(Platform)\$(TargetName).dll
+      <Command>TlbImp.exe /machine:x86 "$(OutDir)$(TargetName).tlb" /out:$(OutDir)$(TargetName).dll
+:: Copy interface definitions to shared project dir
 xcopy /Y /D "$(IntDir)*.h"  "$(ProjectDir)"
-xcopy /Y /D "$(IntDir)*.c"  "$(ProjectDir)"</Command>
+xcopy /Y /D "$(IntDir)*.c"  "$(ProjectDir)"
+:: Copy type libraries to shared platform folder
+xcopy /Y /D "$(OutDir)$(TargetName).tlb"  "$(SolutionDir)$(Platform)"
+xcopy /Y /D "$(OutDir)$(TargetName).dll"  "$(SolutionDir)$(Platform)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -106,13 +109,16 @@ xcopy /Y /D "$(IntDir)*.c"  "$(ProjectDir)"</Command>
     <Midl>
       <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>$(ProjectName).tlb</TypeLibraryName>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
     </Midl>
     <PostBuildEvent>
-      <Command>xcopy /Y /D "$(IntDir)$(TargetName).tlb"  "$(SolutionDir)$(Platform)"
-TlbImp.exe /machine:x64 "$(IntDir)$(TargetName).tlb" /out:$(SolutionDir)$(Platform)\$(TargetName).dll
+      <Command>TlbImp.exe /machine:x64 "$(OutDir)$(TargetName).tlb" /out:$(OutDir)$(TargetName).dll
+:: Copy interface definitions to shared project dir
 xcopy /Y /D "$(IntDir)*.h"  "$(ProjectDir)"
-xcopy /Y /D "$(IntDir)*.c"  "$(ProjectDir)"</Command>
+xcopy /Y /D "$(IntDir)*.c"  "$(ProjectDir)"
+:: Copy type libraries to shared platform folder
+xcopy /Y /D "$(OutDir)$(TargetName).tlb"  "$(SolutionDir)$(Platform)"
+xcopy /Y /D "$(OutDir)$(TargetName).dll"  "$(SolutionDir)$(Platform)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -131,13 +137,16 @@ xcopy /Y /D "$(IntDir)*.c"  "$(ProjectDir)"</Command>
     <Midl>
       <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>$(ProjectName).tlb</TypeLibraryName>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
     </Midl>
     <PostBuildEvent>
-      <Command>xcopy /Y /D "$(IntDir)$(TargetName).tlb"  "$(SolutionDir)$(Platform)"
-TlbImp.exe /machine:x86 "$(IntDir)$(TargetName).tlb" /out:$(SolutionDir)$(Platform)\$(TargetName).dll
+      <Command>TlbImp.exe /machine:x86 "$(OutDir)$(TargetName).tlb" /out:$(OutDir)$(TargetName).dll
+:: Copy interface definitions to shared project dir
 xcopy /Y /D "$(IntDir)*.h"  "$(ProjectDir)"
-xcopy /Y /D "$(IntDir)*.c"  "$(ProjectDir)"</Command>
+xcopy /Y /D "$(IntDir)*.c"  "$(ProjectDir)"
+:: Copy type libraries to shared platform folder
+xcopy /Y /D "$(OutDir)$(TargetName).tlb"  "$(SolutionDir)$(Platform)"
+xcopy /Y /D "$(OutDir)$(TargetName).dll"  "$(SolutionDir)$(Platform)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -156,13 +165,16 @@ xcopy /Y /D "$(IntDir)*.c"  "$(ProjectDir)"</Command>
     <Midl>
       <OutputDirectory>$(IntDir)</OutputDirectory>
       <HeaderFileName>%(Filename).h</HeaderFileName>
-      <TypeLibraryName>$(ProjectName).tlb</TypeLibraryName>
+      <TypeLibraryName>$(OutDir)$(ProjectName).tlb</TypeLibraryName>
     </Midl>
     <PostBuildEvent>
-      <Command>xcopy /Y /D "$(IntDir)$(TargetName).tlb"  "$(SolutionDir)$(Platform)"
-TlbImp.exe /machine:x64 "$(IntDir)$(TargetName).tlb" /out:$(SolutionDir)$(Platform)\$(TargetName).dll
+      <Command>TlbImp.exe /machine:x64 "$(OutDir)$(TargetName).tlb" /out:$(OutDir)$(TargetName).dll
+:: Copy interface definitions to shared project dir
 xcopy /Y /D "$(IntDir)*.h"  "$(ProjectDir)"
-xcopy /Y /D "$(IntDir)*.c"  "$(ProjectDir)"</Command>
+xcopy /Y /D "$(IntDir)*.c"  "$(ProjectDir)"
+:: Copy type libraries to shared platform folder
+xcopy /Y /D "$(OutDir)$(TargetName).tlb"  "$(SolutionDir)$(Platform)"
+xcopy /Y /D "$(OutDir)$(TargetName).dll"  "$(SolutionDir)$(Platform)"</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>

From d8722958ab5d4714d8c9cac4ec92db2f1735fcd0 Mon Sep 17 00:00:00 2001
From: Fredrik Orderud <fredrik.orderud@ge.com>
Date: Sun, 4 Feb 2018 23:04:16 +0100
Subject: [PATCH 2/4] Explicitly use release-builds of type libraries in nuget
 package.

---
 PackagingGE/Image3dAPI.nuspec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/PackagingGE/Image3dAPI.nuspec b/PackagingGE/Image3dAPI.nuspec
index 3319107..1afd101 100644
--- a/PackagingGE/Image3dAPI.nuspec
+++ b/PackagingGE/Image3dAPI.nuspec
@@ -32,11 +32,11 @@
         <file src="../Image3dAPI/IImage3d_p.c"   target="build/native/include/Image3dAPI/" />
         
         <!-- COM type libraries -->
-        <file src="../x64/Image3dAPI.tlb"        target="build/native/lib/x64/" />
-        <file src="../Win32/Image3dAPI.tlb"      target="build/native/lib/Win32/" />
+        <file src="../x64/Release/Image3dAPI.tlb"   target="build/native/lib/x64/" />
+        <file src="../Win32/Release/Image3dAPI.tlb" target="build/native/lib/Win32/" />
         <!-- .NET type libraries -->
-        <file src="../x64/Image3dAPI.dll"        target="build/native/lib/x64/" />
-        <file src="../Win32/Image3dAPI.dll"      target="build/native/lib/Win32/" />
+        <file src="../x64/Release/Image3dAPI.dll"   target="build/native/lib/x64/" />
+        <file src="../Win32/Release/Image3dAPI.dll" target="build/native/lib/Win32/" />
 
         <!-- documentation files -->
         <file src="../changelog.txt"             target="build/native/docs/" />

From 5d744d3c73118ec90d771e555da0ff8a2c3c13db Mon Sep 17 00:00:00 2001
From: Fredrik Orderud <fredrik.orderud@ge.com>
Date: Sun, 4 Feb 2018 23:08:23 +0100
Subject: [PATCH 3/4] Add separate .targets file for .NET projects.

Done to make it easier to use Image3dAPI from .NET/C# projects.
---
 PackagingGE/Image3dAPI.net.targets | 18 ++++++++++++++++++
 PackagingGE/Image3dAPI.nuspec      |  3 ++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 PackagingGE/Image3dAPI.net.targets

diff --git a/PackagingGE/Image3dAPI.net.targets b/PackagingGE/Image3dAPI.net.targets
new file mode 100644
index 0000000..cf3062f
--- /dev/null
+++ b/PackagingGE/Image3dAPI.net.targets
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- .NET/C# project config -->
+  <Target Name="InjectReference" BeforeTargets="ResolveAssemblyReferences">
+    <ItemGroup Condition="'$(Platform)' == 'Win32' or '$(Platform)' == 'x86'">
+      <Reference Include="Image3dAPI">
+        <HintPath>$(MSBuildThisFileDirectory)..\native\lib\Win32\Image3dAPI.dll</HintPath>
+        <EmbedInteropTypes>true</EmbedInteropTypes>
+      </Reference>
+    </ItemGroup>
+    <ItemGroup Condition="'$(Platform)' == 'x64'">
+      <Reference Include="Image3dAPI">
+        <HintPath>$(MSBuildThisFileDirectory)..\native\lib\x64\Image3dAPI.dll</HintPath>
+        <EmbedInteropTypes>true</EmbedInteropTypes>
+      </Reference>
+    </ItemGroup>
+  </Target>
+</Project>
\ No newline at end of file
diff --git a/PackagingGE/Image3dAPI.nuspec b/PackagingGE/Image3dAPI.nuspec
index 1afd101..adde8a3 100644
--- a/PackagingGE/Image3dAPI.nuspec
+++ b/PackagingGE/Image3dAPI.nuspec
@@ -20,7 +20,8 @@
     </metadata>
 
     <files>
-        <file src="Image3dAPI.targets" target="build/native/" />
+        <file src="Image3dAPI.targets"     target="build/native/" />
+        <file src="Image3dAPI.net.targets" target="build/net/Image3dAPI.targets" />
  
         <!-- support headers -->
         <file src="../Image3dAPI/ComSupport.hpp" target="build/native/include/Image3dAPI/" />

From 213c6eb6e417584449899d7c1c15b951b0553ae2 Mon Sep 17 00:00:00 2001
From: Fredrik Orderud <fredrik.orderud@ge.com>
Date: Tue, 6 Feb 2018 10:50:59 +0100
Subject: [PATCH 4/4] Make the build fail if any of the xcopy calls fail.

---
 Image3dAPI/Image3dAPI.vcxproj | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/Image3dAPI/Image3dAPI.vcxproj b/Image3dAPI/Image3dAPI.vcxproj
index bba0bbf..c42dc1f 100644
--- a/Image3dAPI/Image3dAPI.vcxproj
+++ b/Image3dAPI/Image3dAPI.vcxproj
@@ -90,11 +90,11 @@
     <PostBuildEvent>
       <Command>TlbImp.exe /machine:x86 "$(OutDir)$(TargetName).tlb" /out:$(OutDir)$(TargetName).dll
 :: Copy interface definitions to shared project dir
-xcopy /Y /D "$(IntDir)*.h"  "$(ProjectDir)"
-xcopy /Y /D "$(IntDir)*.c"  "$(ProjectDir)"
+xcopy /Y /D "$(IntDir)*.h"  "$(ProjectDir)" || exit /b 1
+xcopy /Y /D "$(IntDir)*.c"  "$(ProjectDir)" || exit /b 1
 :: Copy type libraries to shared platform folder
-xcopy /Y /D "$(OutDir)$(TargetName).tlb"  "$(SolutionDir)$(Platform)"
-xcopy /Y /D "$(OutDir)$(TargetName).dll"  "$(SolutionDir)$(Platform)"</Command>
+xcopy /Y /D "$(OutDir)$(TargetName).tlb"  "$(SolutionDir)$(Platform)" || exit /b 1
+xcopy /Y /D "$(OutDir)$(TargetName).dll"  "$(SolutionDir)$(Platform)" || exit /b 1</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -114,11 +114,11 @@ xcopy /Y /D "$(OutDir)$(TargetName).dll"  "$(SolutionDir)$(Platform)"</Command>
     <PostBuildEvent>
       <Command>TlbImp.exe /machine:x64 "$(OutDir)$(TargetName).tlb" /out:$(OutDir)$(TargetName).dll
 :: Copy interface definitions to shared project dir
-xcopy /Y /D "$(IntDir)*.h"  "$(ProjectDir)"
-xcopy /Y /D "$(IntDir)*.c"  "$(ProjectDir)"
+xcopy /Y /D "$(IntDir)*.h"  "$(ProjectDir)" || exit /b 1
+xcopy /Y /D "$(IntDir)*.c"  "$(ProjectDir)" || exit /b 1
 :: Copy type libraries to shared platform folder
-xcopy /Y /D "$(OutDir)$(TargetName).tlb"  "$(SolutionDir)$(Platform)"
-xcopy /Y /D "$(OutDir)$(TargetName).dll"  "$(SolutionDir)$(Platform)"</Command>
+xcopy /Y /D "$(OutDir)$(TargetName).tlb"  "$(SolutionDir)$(Platform)" || exit /b 1
+xcopy /Y /D "$(OutDir)$(TargetName).dll"  "$(SolutionDir)$(Platform)" || exit /b 1</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -142,11 +142,11 @@ xcopy /Y /D "$(OutDir)$(TargetName).dll"  "$(SolutionDir)$(Platform)"</Command>
     <PostBuildEvent>
       <Command>TlbImp.exe /machine:x86 "$(OutDir)$(TargetName).tlb" /out:$(OutDir)$(TargetName).dll
 :: Copy interface definitions to shared project dir
-xcopy /Y /D "$(IntDir)*.h"  "$(ProjectDir)"
-xcopy /Y /D "$(IntDir)*.c"  "$(ProjectDir)"
+xcopy /Y /D "$(IntDir)*.h"  "$(ProjectDir)" || exit /b 1
+xcopy /Y /D "$(IntDir)*.c"  "$(ProjectDir)" || exit /b 1
 :: Copy type libraries to shared platform folder
-xcopy /Y /D "$(OutDir)$(TargetName).tlb"  "$(SolutionDir)$(Platform)"
-xcopy /Y /D "$(OutDir)$(TargetName).dll"  "$(SolutionDir)$(Platform)"</Command>
+xcopy /Y /D "$(OutDir)$(TargetName).tlb"  "$(SolutionDir)$(Platform)" || exit /b 1
+xcopy /Y /D "$(OutDir)$(TargetName).dll"  "$(SolutionDir)$(Platform)" || exit /b 1</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -170,11 +170,11 @@ xcopy /Y /D "$(OutDir)$(TargetName).dll"  "$(SolutionDir)$(Platform)"</Command>
     <PostBuildEvent>
       <Command>TlbImp.exe /machine:x64 "$(OutDir)$(TargetName).tlb" /out:$(OutDir)$(TargetName).dll
 :: Copy interface definitions to shared project dir
-xcopy /Y /D "$(IntDir)*.h"  "$(ProjectDir)"
-xcopy /Y /D "$(IntDir)*.c"  "$(ProjectDir)"
+xcopy /Y /D "$(IntDir)*.h"  "$(ProjectDir)" || exit /b 1
+xcopy /Y /D "$(IntDir)*.c"  "$(ProjectDir)" || exit /b 1
 :: Copy type libraries to shared platform folder
-xcopy /Y /D "$(OutDir)$(TargetName).tlb"  "$(SolutionDir)$(Platform)"
-xcopy /Y /D "$(OutDir)$(TargetName).dll"  "$(SolutionDir)$(Platform)"</Command>
+xcopy /Y /D "$(OutDir)$(TargetName).tlb"  "$(SolutionDir)$(Platform)" || exit /b 1
+xcopy /Y /D "$(OutDir)$(TargetName).dll"  "$(SolutionDir)$(Platform)" || exit /b 1</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
   <ItemGroup>