MSVC Builds: Update to Fix Build of Scripts

Update the custom build steps that is used to generate the scripts in
tools/, so that the Visual Studio builds can be done successfully.

Also assume that one will be using the same Python release series for x86
and x64 builds, while we still leave room for one to customize these if
necesssary.

6 files changed, 40 insertions, 150 deletions

diff --git a/build/win32/vs10/gi-extra-paths.props b/build/win32/vs10/gi-extra-paths.props
index 93b847d4..13819019 100644
--- a/build/win32/vs10/gi-extra-paths.props
+++ b/build/win32/vs10/gi-extra-paths.props
@@ -7,7 +7,7 @@
     <!-- PythonDir currently needs to point to a 32-bit/x86 Python 2.6/2.7 installation -->
     <PythonDir>c:\\python27</PythonDir>
     <!-- PythonDirX64 currently needs to point to an x86-64/x64 Python 2.6/2.7 installation -->
-    <PythonDirX64>c:\\python27.x64</PythonDirX64>
+    <PythonDirX64>$(PythonDir).x64</PythonDirX64>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>giextrapathsprops</_PropertySheetDisplayName>
diff --git a/build/win32/vs10/gi-gen-srcs.props b/build/win32/vs10/gi-gen-srcs.props
index 5d1ae79d..433f89f6 100644
--- a/build/win32/vs10/gi-gen-srcs.props
+++ b/build/win32/vs10/gi-gen-srcs.props
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ImportGroup Label="PropertySheets">
-    <Import Project="gi-build-defines.props" />
+    <Import Project="gi-extra-paths.props" />
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
     <CopyConfigH>copy ..\..\..\config.h.win32 ..\..\..\config.h</CopyConfigH>
-    <CopyGIRScanner>copy ..\..\..\tools\g-ir-scanner.in ..\..\..\tools\g-ir-scanner</CopyGIRScanner>
-    <CopyGIRDocTool>copy ..\..\..\tools\g-ir-doc-tool.in ..\..\..\tools\g-ir-doc-tool</CopyGIRDocTool>
-    <CopyGIRAnnotationTool>copy ..\..\..\tools\g-ir-annotation-tool.in ..\..\..\tools\g-ir-annotation-tool</CopyGIRAnnotationTool>
+    <GenToolsScripts>$(PythonDir)\python ..\..\..\build\gen-win32-gi-r-tools.py</GenToolsScripts>
+    <GenToolsScriptsX64>$(PythonDirX64)\python ..\..\..\build\gen-win32-gi-r-tools.py</GenToolsScriptsX64>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gigensrcsprops</_PropertySheetDisplayName>
@@ -16,14 +15,11 @@
     <BuildMacro Include="CopyConfigH">
       <Value>$(CopyConfigH)</Value>
     </BuildMacro>
-    <BuildMacro Include="CopyGIRScanner">
-      <Value>$(CopyGIRScanner)</Value>
+    <BuildMacro Include="GenToolsScripts">
+      <Value>$(GenToolsScripts)</Value>
     </BuildMacro>
-    <BuildMacro Include="CopyGIRDocTool">
-      <Value>$(CopyGIRDocTool)</Value>
-    </BuildMacro>
-    <BuildMacro Include="CopyGIRAnnotationTool">
-      <Value>$(CopyGIRAnnotationTool)</Value>
+    <BuildMacro Include="GenToolsScriptsX64">
+      <Value>$(GenToolsScriptsX64)</Value>
     </BuildMacro>
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/gi-prebuild.vcxproj b/build/win32/vs10/gi-prebuild.vcxproj
index feab0292..755e60fb 100644
--- a/build/win32/vs10/gi-prebuild.vcxproj
+++ b/build/win32/vs10/gi-prebuild.vcxproj
@@ -95,47 +95,19 @@
       <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyConfigH)</Command>
       <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\config.h;%(Outputs)</Outputs>
     </CustomBuild>
-    <CustomBuild Include="..\..\..\tools\g-ir-scanner.in">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying g-ir-scanner from g-ir-scanner.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyGIRScanner)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\tools\g-ir-scanner;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying g-ir-scanner from g-ir-scanner.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyGIRScanner)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\tools\g-ir-scanner;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying g-ir-scanner from g-ir-scanner.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyGIRScanner)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\tools\g-ir-scanner;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying g-ir-scanner from g-ir-scanner.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyGIRScanner)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\tools\g-ir-scanner;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\tools\g-ir-doc-tool.in">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying g-ir-doc-tool from g-ir-doc-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyGIRDocTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\tools\g-ir-doc-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying g-ir-doc-tool from g-ir-doc-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyGIRDocTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\tools\g-ir-doc-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying g-ir-doc-tool from g-ir-doc-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyGIRDocTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\tools\g-ir-doc-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying g-ir-doc-tool from g-ir-doc-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyGIRDocTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\tools\g-ir-doc-tool;%(Outputs)</Outputs>
-    </CustomBuild>
-    <CustomBuild Include="..\..\..\tools\g-ir-annotation-tool.in">
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Copying g-ir-annotation-tool from g-ir-annotation-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(CopyGIRAnnotationTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Copying g-ir-annotation-tool from g-ir-annotation-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(CopyGIRAnnotationTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Copying g-ir-annotation-tool from g-ir-annotation-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(CopyGIRAnnotationTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Copying g-ir-annotation-tool from g-ir-annotation-tool.in...</Message>
-      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(CopyGIRAnnotationTool)</Command>
-      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
+    <CustomBuild Include="..\..\..\tools\g-ir-tool-template.in">
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Generating Tools Scripts...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(GenToolsScripts)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Generating Tools Scripts...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(GenToolsScripts)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Generating Tools Scripts...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(GenToolsScriptsX64)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
+      <Message Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Generating Tools Scripts...</Message>
+      <Command Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(GenToolsScriptsX64)</Command>
+      <Outputs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
diff --git a/build/win32/vs9/gi-extra-paths.vsprops b/build/win32/vs9/gi-extra-paths.vsprops
index 4658fc21..989b4994 100644
--- a/build/win32/vs9/gi-extra-paths.vsprops
+++ b/build/win32/vs9/gi-extra-paths.vsprops
@@ -13,6 +13,6 @@
 	<!-- PythonDirX64 currently needs to point to an x86-64/x64 Python 2.6/2.7 installation -->
 	<UserMacro
 		Name="PythonDirX64"
-		Value="c:\\python27.x64"
+		Value="$(PythonDir).x64"
 	/>
 </VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gi-gen-srcs.vsprops b/build/win32/vs9/gi-gen-srcs.vsprops
index d2d5ddbb..345c86a5 100644
--- a/build/win32/vs9/gi-gen-srcs.vsprops
+++ b/build/win32/vs9/gi-gen-srcs.vsprops
@@ -3,7 +3,7 @@
 	ProjectType="Visual C++"
 	Version="8.00"
 	Name="gigensrcsprops"
-	InheritedPropertySheets=".\gi-build-defines.vsprops"
+	InheritedPropertySheets=".\gi-extra-paths.vsprops"
 	>
 	<UserMacro
 		Name="CopyConfigH"
@@ -12,21 +12,11 @@ copy ..\..\..\config.h.win32 ..\..\..\config.h
 			  "
 	/>
 	<UserMacro
-		Name="CopyGIRScanner"
-		Value="
-copy ..\..\..\tools\g-ir-scanner.in ..\..\..\tools\g-ir-scanner
-			  "
+		Name="GenToolsScripts"
+		Value="$(PythonDir)\python ..\..\..\build\gen-win32-gi-r-tools.py"
 	/>
 	<UserMacro
-		Name="CopyGIRDocTool"
-		Value="
-copy ..\..\..\tools\g-ir-doc-tool.in ..\..\..\tools\g-ir-doc-tool
-			  "
-	/>
-	<UserMacro
-		Name="CopyGIRAnnotationTool"
-		Value="
-copy ..\..\..\tools\g-ir-annotation-tool.in ..\..\..\tools\g-ir-annotation-tool
-		      "
+		Name="GenToolsScriptsX64"
+		Value="$(PythonDirX64)\python ..\..\..\build\gen-win32-gi-r-tools.py"
 	/>
 </VisualStudioPropertySheet>
diff --git a/build/win32/vs9/gi-prebuild.vcproj b/build/win32/vs9/gi-prebuild.vcproj
index 8f911ef9..e50e8928 100644
--- a/build/win32/vs9/gi-prebuild.vcproj
+++ b/build/win32/vs9/gi-prebuild.vcproj
@@ -94,105 +94,37 @@
 					/>
 				</FileConfiguration>
 			</File>
-			<File RelativePath="..\..\..\tools\g-ir-scanner.in">
+			<File RelativePath="..\..\..\tools\g-ir-tool-template.in">
 				<FileConfiguration Name="Debug|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Copying g-ir-scanner from g-ir-scanner.in..."
-						CommandLine="$(CopyGIRScanner)"
-						Outputs="..\..\..\tools\g-ir-scanner"
+						Description="Generating Tools Scripts..."
+						CommandLine="$(GenToolsScripts)"
+						Outputs="..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool"
 					/>
 				</FileConfiguration>
 				<FileConfiguration Name="Release|Win32">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Copying g-ir-scanner from g-ir-scanner.in..."
-						CommandLine="$(CopyGIRScanner)"
-						Outputs="..\..\..\tools\g-ir-scanner"
+						Description="Generating Tools Scripts..."
+						CommandLine="$(GenToolsScripts)"
+						Outputs="..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool"
 					/>
 				</FileConfiguration>
 				<FileConfiguration Name="Debug|x64">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Copying g-ir-scanner from g-ir-scanner.in..."
-						CommandLine="$(CopyGIRScanner)"
-						Outputs="..\..\..\tools\g-ir-scanner"
+						Description="Generating Tools Scripts..."
+						CommandLine="$(GenToolsScriptsX64)"
+						Outputs="..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool"
 					/>
 				</FileConfiguration>
 				<FileConfiguration Name="Release|x64">
 					<Tool
 						Name="VCCustomBuildTool"
-						Description="Copying g-ir-scanner from g-ir-scanner.in..."
-						CommandLine="$(CopyGIRScanner)"
-						Outputs="..\..\..\tools\g-ir-scanner"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\tools\g-ir-doc-tool.in">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying g-ir-doc-tool from g-ir-doc-tool.in..."
-						CommandLine="$(CopyGIRDocTool)"
-						Outputs="..\..\..\tools\g-ir-doc-tool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying g-ir-doc-tool from g-ir-doc-tool.in..."
-						CommandLine="$(CopyGIRDocTool)"
-						Outputs="..\..\..\tools\g-ir-doc-tool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying g-ir-doc-tool from g-ir-doc-tool.in..."
-						CommandLine="$(CopyGIRDocTool)"
-						Outputs="..\..\..\tools\g-ir-doc-tool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying g-ir-doc-tool from g-ir-doc-tool.in..."
-						CommandLine="$(CopyGIRDocTool)"
-						Outputs="..\..\..\tools\g-ir-doc-tool"
-					/>
-				</FileConfiguration>
-			</File>
-			<File RelativePath="..\..\..\tools\g-ir-annotation-tool.in">
-				<FileConfiguration Name="Debug|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying g-ir-annotation-tool from g-ir-annotation-tool.in..."
-						CommandLine="$(CopyGIRAnnotationTool)"
-						Outputs="..\..\..\tools\g-ir-annotation-tool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|Win32">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying g-ir-annotation-tool from g-ir-annotation-tool.in..."
-						CommandLine="$(CopyGIRAnnotationTool)"
-						Outputs="..\..\..\tools\g-ir-annotation-tool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Debug|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying g-ir-annotation-tool from g-ir-annotation-tool.in..."
-						CommandLine="$(CopyGIRAnnotationTool)"
-						Outputs="..\..\..\tools\g-ir-annotation-tool"
-					/>
-				</FileConfiguration>
-				<FileConfiguration Name="Release|x64">
-					<Tool
-						Name="VCCustomBuildTool"
-						Description="Copying g-ir-annotation-tool from g-ir-annotation-tool.in..."
-						CommandLine="$(CopyGIRAnnotationTool)"
-						Outputs="..\..\..\tools\g-ir-annotation-tool"
+						Description="Generating Tools Scripts..."
+						CommandLine="$(GenToolsScriptsX64)"
+						Outputs="..\..\..\tools\g-ir-scanner;..\..\..\tools\g-ir-doc-tool;..\..\..\tools\g-ir-annotation-tool"
 					/>
 				</FileConfiguration>
 			</File>