[gtksourceview] MSVC builds: Separate x86 and x64 Python usage

[Chun-wei Fan <fanchunwei src gnome org>]

commit dc6a5866ecc3f692834374017c01be72b72b2fd6
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Oct 5 17:13:52 2018 +0800

    MSVC builds: Separate x86 and x64 Python usage
    
    This will make integrating the introspection builds in the projects
    easier, as x86 g-ir-scanner must use the corresponding x86 Python
    interpretor, and likewise for x64 builds.

 win32/vs10/gtksourceview4-gen-srcs.props          | 2 +-
 win32/vs10/gtksourceview4-install.propsin         | 2 +-
 win32/vs10/gtksourceview4-version-paths.props.in  | 9 +++++++++
 win32/vs9/gtksourceview-4.vcprojin                | 4 ++--
 win32/vs9/gtksourceview4-gen-srcs.vsprops         | 4 ++++
 win32/vs9/gtksourceview4-install.vcproj           | 4 ++--
 win32/vs9/gtksourceview4-install.vspropsin        | 4 ++++
 win32/vs9/gtksourceview4-version-paths.vsprops.in | 4 ++++
 8 files changed, 27 insertions(+), 6 deletions(-)
---
diff --git a/win32/vs10/gtksourceview4-gen-srcs.props b/win32/vs10/gtksourceview4-gen-srcs.props
index 6ab8a0d8..15f0bd37 100644
--- a/win32/vs10/gtksourceview4-gen-srcs.props
+++ b/win32/vs10/gtksourceview4-gen-srcs.props
@@ -10,7 +10,7 @@ CALL gen-enums.bat $(GlibEtcInstallRoot)
 cd $(SolutionDir)
     </GenerateEnums>
     <GenerateRsrcSrc>$(GlibEtcInstallRoot)\bin\glib-compile-resources 
--target=..\..\gtksourceview\gtksourceview-resources.c --generate-source --sourcedir=..\..\gtksourceview 
..\..\gtksourceview\gtksourceview.gresource.xml</GenerateRsrcSrc>
-    <GenGtksourceVersionH>$(PythonDir)\python.exe ..\gtksource_version_h.py 
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion)</GenGtksourceVersionH>
+    <GenGtksourceVersionH>$(PythonCmd) ..\gtksource_version_h.py 
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion)</GenGtksourceVersionH>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtksourceview4gensrcsprops</_PropertySheetDisplayName>
diff --git a/win32/vs10/gtksourceview4-install.propsin b/win32/vs10/gtksourceview4-install.propsin
index e59704e8..63d18245 100644
--- a/win32/vs10/gtksourceview4-install.propsin
+++ b/win32/vs10/gtksourceview4-install.propsin
@@ -30,7 +30,7 @@ copy ..\..\data\styles\styles.rng $(CopyDir)\share\gtksourceview-$(ApiVersion)\s
 copy ..\..\data\styles\check-style.sh $(CopyDir)\share\gtksourceview-$(ApiVersion)\styles
     </GtkSourceviewDoInstall>
     <GtkSourceviewPCFiles>..\gtksourceview-$(ApiVersion).pc</GtkSourceviewPCFiles>
-    <GtkSourceviewGenPC>(if not exist $(CopyDir)\lib\pkgconfig mkdir $(CopyDir)\lib\pkgconfig) &amp; 
($(PythonDir)\python ..\gtksourceviewpc.py --prefix=$(CopyDir) 
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion))</GtkSourceviewGenPC>
+    <GtkSourceviewGenPC>(if not exist $(CopyDir)\lib\pkgconfig mkdir $(CopyDir)\lib\pkgconfig) &amp; 
($(PythonCmd) ..\gtksourceviewpc.py --prefix=$(CopyDir) 
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion))</GtkSourceviewGenPC>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtksourceview4installprops</_PropertySheetDisplayName>
diff --git a/win32/vs10/gtksourceview4-version-paths.props.in 
b/win32/vs10/gtksourceview4-version-paths.props.in
index 285ec270..3e928421 100644
--- a/win32/vs10/gtksourceview4-version-paths.props.in
+++ b/win32/vs10/gtksourceview4-version-paths.props.in
@@ -20,6 +20,9 @@
     <PythonDir Condition="'$(VisualStudioVersion)' == '12.0'">c:\python34</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)' == '14.0'">c:\python36</PythonDir>
     <PythonDir Condition="'$(VisualStudioVersion)' == '15.0'">c:\python36</PythonDir>
+    <PythonDirX64>$(PythonDir).x64</PythonDirX64>
+    <PythonCmd Condition="'$(Platform)' == 'Win32'">$(PythonDir)\python.exe</PythonCmd>
+    <PythonCmd Condition="'$(Platform)' == 'x64'">$(PythonDirX64)\python.exe</PythonCmd>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtksourceview4versionpathsprops</_PropertySheetDisplayName>
@@ -70,5 +73,11 @@
     <BuildMacro Include="PythonDir">
       <Value>$(PythonDir)</Value>
     </BuildMacro>
+    <BuildMacro Include="PythonDirX64">
+      <Value>$(PythonDirX64)</Value>
+    </BuildMacro>
+    <BuildMacro Include="PythonCmd">
+      <Value>$(PythonCmd)</Value>
+    </BuildMacro>
   </ItemGroup>
 </Project>
diff --git a/win32/vs9/gtksourceview-4.vcprojin b/win32/vs9/gtksourceview-4.vcprojin
index 4568ed60..c3937880 100644
--- a/win32/vs9/gtksourceview-4.vcprojin
+++ b/win32/vs9/gtksourceview-4.vcprojin
@@ -219,7 +219,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating gtksourceversion.h..."
-                                               CommandLine="$(GenGtksourceVersionH)"
+                                               CommandLine="$(GenGtksourceVersionHX64)"
                                                Outputs="..\..\gtksourceview\gtksourceversion.h"
                                        />
                                </FileConfiguration>
@@ -235,7 +235,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating gtksourceversion.h..."
-                                               CommandLine="$(GenGtksourceVersionH)"
+                                               CommandLine="$(GenGtksourceVersionHX64)"
                                                Outputs="..\..\gtksourceview\gtksourceversion.h"
                                        />
                                </FileConfiguration>
diff --git a/win32/vs9/gtksourceview4-gen-srcs.vsprops b/win32/vs9/gtksourceview4-gen-srcs.vsprops
index d82168c6..6a87e016 100644
--- a/win32/vs9/gtksourceview4-gen-srcs.vsprops
+++ b/win32/vs9/gtksourceview4-gen-srcs.vsprops
@@ -27,4 +27,8 @@ $(GlibEtcInstallRoot)\bin\glib-compile-resources --target=..\..\gtksourceview\gt
                Name="GenGtksourceVersionH"
                Value="$(PythonDir)\python.exe ..\gtksource_version_h.py 
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion)"
        />
+       <UserMacro
+               Name="GenGtksourceVersionHX64"
+               Value="$(PythonDirX64)\python.exe ..\gtksource_version_h.py 
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion)"
+       />
 </VisualStudioPropertySheet>
diff --git a/win32/vs9/gtksourceview4-install.vcproj b/win32/vs9/gtksourceview4-install.vcproj
index 4d2658b2..313b1e01 100644
--- a/win32/vs9/gtksourceview4-install.vcproj
+++ b/win32/vs9/gtksourceview4-install.vcproj
@@ -101,7 +101,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating .pc files..."
-                                               CommandLine="$(GtkSourceviewGenPC)"
+                                               CommandLine="$(GtkSourceviewGenPCX64)"
                                                Outputs="..\gtksourceview-$(ApiVersion).pc"
                                        />
                                </FileConfiguration>
@@ -109,7 +109,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating .pc files..."
-                                               CommandLine="$(GtkSourceviewGenPC)"
+                                               CommandLine="$(GtkSourceviewGenPCX64)"
                                                Outputs="..\gtksourceview-$(ApiVersion).pc"
                                        />
                                </FileConfiguration>
diff --git a/win32/vs9/gtksourceview4-install.vspropsin b/win32/vs9/gtksourceview4-install.vspropsin
index 820dab32..45c7df52 100644
--- a/win32/vs9/gtksourceview4-install.vspropsin
+++ b/win32/vs9/gtksourceview4-install.vspropsin
@@ -35,4 +35,8 @@ copy ..\..\data\styles\styles.rng $(CopyDir)\share\gtksourceview-$(ApiVersion)\s
                Name="GtkSourceviewGenPC"
                Value="(if not exist $(CopyDir)\lib\pkgconfig mkdir $(CopyDir)\lib\pkgconfig) &amp; 
($(PythonDir)\python ..\gtksourceviewpc.py --prefix=$(CopyDir) 
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion))"
        />
+       <UserMacro
+               Name="GtkSourceviewGenPCX64"
+               Value="(if not exist $(CopyDir)\lib\pkgconfig mkdir $(CopyDir)\lib\pkgconfig) &amp; 
($(PythonDirX64)\python ..\gtksourceviewpc.py --prefix=$(CopyDir) 
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion))"
+       />
 </VisualStudioPropertySheet>
diff --git a/win32/vs9/gtksourceview4-version-paths.vsprops.in 
b/win32/vs9/gtksourceview4-version-paths.vsprops.in
index 6ff29308..d717b5ae 100644
--- a/win32/vs9/gtksourceview4-version-paths.vsprops.in
+++ b/win32/vs9/gtksourceview4-version-paths.vsprops.in
@@ -70,4 +70,8 @@
                Name="PythonDir"
                Value="c:\python27"
        />
+       <UserMacro
+               Name="PythonDirX64"
+               Value="$(PythonDir).x64"
+       />
 </VisualStudioPropertySheet>