GNOME.org
 

[gtksourceview/gnome-3-24] MSVC builds: Separate x86 and x64 Python usage

commit aa5b31f9e55cd88266c8110fd1e111fd4c114568
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Sep 8 16:05:23 2017 +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/gtksourceview-gen-srcs.props          |    4 +++
 win32/vs10/gtksourceview-install.propsin         |    4 +++
 win32/vs10/gtksourceview-install.vcxproj         |   22 ++++++-----------
 win32/vs10/gtksourceview-version-paths.props.in  |    4 +++
 win32/vs10/gtksourceview.vcxprojin               |   28 ++++++++--------------
 win32/vs9/gtksourceview-gen-srcs.vsprops         |    4 +++
 win32/vs9/gtksourceview-install.vcproj           |    4 +-
 win32/vs9/gtksourceview-install.vspropsin        |    4 +++
 win32/vs9/gtksourceview-version-paths.vsprops.in |    4 +++
 win32/vs9/gtksourceview.vcprojin                 |    4 +-
 10 files changed, 46 insertions(+), 36 deletions(-)
---
diff --git a/win32/vs10/gtksourceview-gen-srcs.props b/win32/vs10/gtksourceview-gen-srcs.props
index 749e219..dd1356d 100644
--- a/win32/vs10/gtksourceview-gen-srcs.props
+++ b/win32/vs10/gtksourceview-gen-srcs.props
@@ -11,6 +11,7 @@ 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>
+    <GenGtksourceVersionHX64>$(PythonDirX64)\python.exe ..\gtksource_version_h.py 
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion)</GenGtksourceVersionHX64>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtksourceviewgensrcsprops</_PropertySheetDisplayName>
@@ -28,5 +29,8 @@ cd $(SolutionDir)
     <BuildMacro Include="GenGtksourceVersionH">
       <Value>$(GenGtksourceVersionH)</Value>
     </BuildMacro>
+    <BuildMacro Include="GenGtksourceVersionHX64">
+      <Value>$(GenGtksourceVersionHX64)</Value>
+    </BuildMacro>
   </ItemGroup>
 </Project>
diff --git a/win32/vs10/gtksourceview-install.propsin b/win32/vs10/gtksourceview-install.propsin
index c374a58..271e866 100644
--- a/win32/vs10/gtksourceview-install.propsin
+++ b/win32/vs10/gtksourceview-install.propsin
@@ -31,6 +31,7 @@ copy ..\..\data\styles\check-style.sh $(CopyDir)\share\gtksourceview-$(ApiVersio
     </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>
+    <GtkSourceviewGenPCX64>(if not exist $(CopyDir)\lib\pkgconfig mkdir $(CopyDir)\lib\pkgconfig) &amp; 
($(PythonDirX64)\python ..\gtksourceviewpc.py --prefix=$(CopyDir) 
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion))</GtkSourceviewGenPCX64>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtksourceviewinstallprops</_PropertySheetDisplayName>
@@ -47,5 +48,8 @@ copy ..\..\data\styles\check-style.sh $(CopyDir)\share\gtksourceview-$(ApiVersio
     <BuildMacro Include="GtkSourceviewGenPC">
       <Value>$(GtkSourceviewGenPC)</Value>
     </BuildMacro>
+    <BuildMacro Include="GtkSourceviewGenPCX64">
+      <Value>$(GtkSourceviewGenPCX64)</Value>
+    </BuildMacro>
   </ItemGroup>
 </Project>
diff --git a/win32/vs10/gtksourceview-install.vcxproj b/win32/vs10/gtksourceview-install.vcxproj
index 94111f3..333a306 100644
--- a/win32/vs10/gtksourceview-install.vcxproj
+++ b/win32/vs10/gtksourceview-install.vcxproj
@@ -84,22 +84,16 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\config.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug'">Copying build results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Debug'">$(GtkSourceviewPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GtkSourceviewDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\blah;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Copying build results...</Message>
-      <AdditionalInputs Condition="'$(Configuration)'=='Release'">$(GtkSourceviewPCFiles)</AdditionalInputs>
-      <Command Condition="'$(Configuration)'=='Release'">$(GtkSourceviewDoInstall)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\blah;%(Outputs)</Outputs>
+      <Message>Copying build results...</Message>
+      <AdditionalInputs>$(GtkSourceviewPCFiles)</AdditionalInputs>
+      <Command>$(GtkSourceviewDoInstall)</Command>
+      <Outputs>..\..\blah;%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="..\..\gtksourceview.pc.in">
-      <Message Condition="'$(Configuration)'=='Debug'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GtkSourceviewGenPC)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">$(GtkSourceviewPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Generating .pc files...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(GtkSourceviewGenPC)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">$(GtkSourceviewPCFiles);%(Outputs)</Outputs>
+      <Message>Generating .pc files...</Message>
+      <Command Condition="'$(Platform)'=='Win32'">$(GtkSourceviewGenPC)</Command>
+      <Command Condition="'$(Platform)'=='x64'">$(GtkSourceviewGenPCX64)</Command>
+      <Outputs>$(GtkSourceviewPCFiles);%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/win32/vs10/gtksourceview-version-paths.props.in b/win32/vs10/gtksourceview-version-paths.props.in
index 9d94f16..b080f4a 100644
--- a/win32/vs10/gtksourceview-version-paths.props.in
+++ b/win32/vs10/gtksourceview-version-paths.props.in
@@ -20,6 +20,7 @@
     <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>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtksourceviewversionpathsprops</_PropertySheetDisplayName>
@@ -73,5 +74,8 @@
     <BuildMacro Include="PythonDir">
       <Value>$(PythonDir)</Value>
     </BuildMacro>
+    <BuildMacro Include="PythonDirX64">
+      <Value>$(PythonDirX64)</Value>
+    </BuildMacro>
   </ItemGroup>
 </Project>
diff --git a/win32/vs10/gtksourceview.vcxprojin b/win32/vs10/gtksourceview.vcxprojin
index 9824775..ad331f4 100644
--- a/win32/vs10/gtksourceview.vcxprojin
+++ b/win32/vs10/gtksourceview.vcxprojin
@@ -169,20 +169,15 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="..\..\config.h.win32">
-      <Message Condition="'$(Configuration)'=='Debug'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">..\..\config.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Copying config.h from config.h.win32...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(CopyConfigH)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">..\..\config.h;%(Outputs)</Outputs>
+      <Message>Copying config.h from config.h.win32...</Message>
+      <Command>$(CopyConfigH)</Command>
+      <Outputs>..\..\config.h;%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="..\..\gtksourceview\gtksourceversion.h.in">
-      <Message Condition="'$(Configuration)'=='Debug'">Generating gtksourceversion.h...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GenGtksourceVersionH)</Command>
-      <Outputs 
Condition="'$(Configuration)'=='Debug'">..\..\gtksourceview\gtksourceversion.h;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Generating gtksourceversion.h...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(GenGtksourceVersionH)</Command>
-      <Outputs 
Condition="'$(Configuration)'=='Release'">..\..\gtksourceview\gtksourceversion.h;%(Outputs)</Outputs>
+      <Message>Generating gtksourceversion.h...</Message>
+      <Command Condition="'$(Platform)'=='Win32'">$(GenGtksourceVersionH)</Command>
+      <Command Condition="'$(Platform)'=='x64'">$(GenGtksourceVersionHX64)</Command>
+      <Outputs>..\..\gtksourceview\gtksourceversion.h;%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="..\gen-enums.bat">
       <Message Condition="'$(Configuration)'=='Debug'">Generating Enumeration sources...</Message>
@@ -193,12 +188,9 @@
       <Outputs 
Condition="'$(Configuration)'=='Release'">..\..\gtksourceview\gtksourceview-enumtypes.c;..\..\gtksourceview\gtksourceview-enumtypes.h;%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="..\..\gtksourceview\gtksourceview.gresource.xml">
-      <Message Condition="'$(Configuration)'=='Debug'">Generating GResource sources...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(GenerateRsrcSrc)</Command>
-      <Outputs 
Condition="'$(Configuration)'=='Debug'">..\..\gtksourceview\gtksourceview-resources.c;%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Generating GResource sources...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(GenerateRsrcSrc)</Command>
-      <Outputs 
Condition="'$(Configuration)'=='Release'">..\..\gtksourceview\gtksourceview-resources.c;%(Outputs)</Outputs>
+      <Message>Generating GResource sources...</Message>
+      <Command>$(GenerateRsrcSrc)</Command>
+      <Outputs>..\..\gtksourceview\gtksourceview-resources.c;%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
diff --git a/win32/vs9/gtksourceview-gen-srcs.vsprops b/win32/vs9/gtksourceview-gen-srcs.vsprops
index f4cbbdd..2a92d21 100644
--- a/win32/vs9/gtksourceview-gen-srcs.vsprops
+++ b/win32/vs9/gtksourceview-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/gtksourceview-install.vcproj b/win32/vs9/gtksourceview-install.vcproj
index db1572f..e1e8d01 100644
--- a/win32/vs9/gtksourceview-install.vcproj
+++ b/win32/vs9/gtksourceview-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/gtksourceview-install.vspropsin b/win32/vs9/gtksourceview-install.vspropsin
index 84749d6..e0e557d 100644
--- a/win32/vs9/gtksourceview-install.vspropsin
+++ b/win32/vs9/gtksourceview-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/gtksourceview-version-paths.vsprops.in 
b/win32/vs9/gtksourceview-version-paths.vsprops.in
index ce2fde1..edf4435 100644
--- a/win32/vs9/gtksourceview-version-paths.vsprops.in
+++ b/win32/vs9/gtksourceview-version-paths.vsprops.in
@@ -70,4 +70,8 @@
                Name="PythonDir"
                Value="c:\python27"
        />
+       <UserMacro
+               Name="PythonDirX64"
+               Value="$(PythonDir).x64"
+       />
 </VisualStudioPropertySheet>
diff --git a/win32/vs9/gtksourceview.vcprojin b/win32/vs9/gtksourceview.vcprojin
index 2f7f322..97a9e58 100644
--- a/win32/vs9/gtksourceview.vcprojin
+++ b/win32/vs9/gtksourceview.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>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]