[librsvg/librsvg-2.40] Visual Studio projects: Rename PythonPath to PythonDir

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

commit c633afa060f4afcd140991d6d3fccff9147632b8
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Sat Dec 9 11:24:18 2017 +0800

    Visual Studio projects: Rename PythonPath to PythonDir
    
    This is to avoid confusion with PythonPath, which is commonly used as a
    envvar to specify where Python modules are found.
    
    Also split out PythonDir for 32-bit and 64-bit builds, as we are going
    to use these for introspection builds directly from the projects, and
    set the default Python installations for each Visual Studio version
    according to what is now set in GObject-Introspection's Visual Studio
    projects.

 build/win32/vs10/rsvg-install.propsin         |    6 +++++-
 build/win32/vs10/rsvg-install.vcxproj         |   10 ++++------
 build/win32/vs10/rsvg-version-paths.props.in  |   14 +++++++++++---
 build/win32/vs9/rsvg-install.vcproj           |    4 ++--
 build/win32/vs9/rsvg-install.vspropsin        |    6 +++++-
 build/win32/vs9/rsvg-version-paths.vsprops.in |    6 +++++-
 6 files changed, 32 insertions(+), 14 deletions(-)
---
diff --git a/build/win32/vs10/rsvg-install.propsin b/build/win32/vs10/rsvg-install.propsin
index 22fab04..998b4e5 100644
--- a/build/win32/vs10/rsvg-install.propsin
+++ b/build/win32/vs10/rsvg-install.propsin
@@ -27,7 +27,8 @@ if exist ..\librsvg-2.0.pc copy ..\librsvg-2.0.pc $(CopyDir)\lib\pkgconfig
     </RsvgDoInstall>
     <RsvgPostInstall>$(GlibEtcInstallRoot)\bin\gdk-pixbuf-query-loaders.exe &gt; 
$(CopyDir)\lib\gdk-pixbuf-2.0\2.10.0\loaders.cache</RsvgPostInstall>
     <RsvgPCFiles>..\librsvg-2.0.pc</RsvgPCFiles>
-    <RsvgGenPC>(if not exist $(CopyDir) mkdir $(CopyDir)) &amp; (if exist $(PythonPath)\python.exe 
$(PythonPath)\python.exe ..\rsvgpc.py --prefix=$(CopyDir) 
--version=$(RsvgMajorVersion).$(RsvgMinorVersion).$(RsvgMicroVersion))</RsvgGenPC>
+    <RsvgGenPC>(if not exist $(CopyDir) mkdir $(CopyDir)) &amp; (if exist $(PythonDir)\python.exe 
$(PythonDir)\python.exe ..\rsvgpc.py --prefix=$(CopyDir) 
--version=$(RsvgMajorVersion).$(RsvgMinorVersion).$(RsvgMicroVersion))</RsvgGenPC>
+    <RsvgGenPCX64>(if not exist $(CopyDir) mkdir $(CopyDir)) &amp; (if exist $(PythonDirX64)\python.exe 
$(PythonDirX64)\python.exe ..\rsvgpc.py --prefix=$(CopyDir) 
--version=$(RsvgMajorVersion).$(RsvgMinorVersion).$(RsvgMicroVersion))</RsvgGenPCX64>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>rsvginstallprops</_PropertySheetDisplayName>
@@ -46,5 +47,8 @@ if exist ..\librsvg-2.0.pc copy ..\librsvg-2.0.pc $(CopyDir)\lib\pkgconfig
     <BuildMacro Include="RsvgGenPC">
       <Value>$(RsvgGenPC)</Value>
     </BuildMacro>
+    <BuildMacro Include="RsvgGenPCX64">
+      <Value>$(RsvgGenPCX64)</Value>
+    </BuildMacro>
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs10/rsvg-install.vcxproj b/build/win32/vs10/rsvg-install.vcxproj
index 991cdec..6719dbe 100644
--- a/build/win32/vs10/rsvg-install.vcxproj
+++ b/build/win32/vs10/rsvg-install.vcxproj
@@ -85,12 +85,10 @@
       <Outputs Condition="'$(Configuration)'=='Release'">install_placeholder;%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="..\..\..\librsvg.pc.in">
-      <Message Condition="'$(Configuration)'=='Debug'">Generating .pc file...</Message>
-      <Command Condition="'$(Configuration)'=='Debug'">$(RsvgGenPC)</Command>
-      <Outputs Condition="'$(Configuration)'=='Debug'">$(RsvgPCFiles);%(Outputs)</Outputs>
-      <Message Condition="'$(Configuration)'=='Release'">Generating .pc file...</Message>
-      <Command Condition="'$(Configuration)'=='Release'">$(RsvgGenPC)</Command>
-      <Outputs Condition="'$(Configuration)'=='Release'">$(RsvgPCFiles);%(Outputs)</Outputs>
+      <Message>Generating .pc file...</Message>
+      <Command Condition="'$(Platform)'=='Win32'">$(RsvgGenPC)</Command>
+      <Command Condition="'$(Platform)'=='x64'">$(RsvgGenPCX64)</Command>
+      <Outputs>$(RsvgPCFiles);%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
diff --git a/build/win32/vs10/rsvg-version-paths.props.in b/build/win32/vs10/rsvg-version-paths.props.in
index 239b151..f1e5c3d 100644
--- a/build/win32/vs10/rsvg-version-paths.props.in
+++ b/build/win32/vs10/rsvg-version-paths.props.in
@@ -17,7 +17,12 @@
     <RsvgSeparateVSDllSuffix>-$(ApiVersion)-vs$(VSVer)</RsvgSeparateVSDllSuffix>
     <RsvgDllPrefix>$(RsvgSeparateVSDllPrefix)</RsvgDllPrefix>
     <RsvgDllSuffix>$(RsvgSeparateVSDllSuffix)</RsvgDllSuffix>
-    <PythonPath>c:\python34</PythonPath>
+    <PythonDir Condition="'$(VisualStudioVersion)' == '10.0'">c:\python34</PythonDir>
+    <PythonDir Condition="'$(VisualStudioVersion)' == '11.0'">c:\python34</PythonDir>
+    <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>rsvgversionpathsprops</_PropertySheetDisplayName>
@@ -66,8 +71,11 @@
     <BuildMacro Include="RsvgDllSuffix">
       <Value>$(RsvgDllSuffix)</Value>
     </BuildMacro>
-    <BuildMacro Include="PythonPath">
-      <Value>$(PythonPath)</Value>
+    <BuildMacro Include="PythonDir">
+      <Value>$(PythonDir)</Value>
+    </BuildMacro>
+    <BuildMacro Include="PythonDirX64">
+      <Value>$(PythonDirX64)</Value>
     </BuildMacro>
   </ItemGroup>
 </Project>
diff --git a/build/win32/vs9/rsvg-install.vcproj b/build/win32/vs9/rsvg-install.vcproj
index 4456a08..733a213 100644
--- a/build/win32/vs9/rsvg-install.vcproj
+++ b/build/win32/vs9/rsvg-install.vcproj
@@ -94,7 +94,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating .pc files..."
-                                               CommandLine="$(RsvgGenPC)"
+                                               CommandLine="$(RsvgGenPCX64)"
                                                Outputs="..\librsvg-2.0.pc"
                                        />
                                </FileConfiguration>
@@ -102,7 +102,7 @@
                                        <Tool
                                                Name="VCCustomBuildTool"
                                                Description="Generating .pc files..."
-                                               CommandLine="$(RsvgGenPC)"
+                                               CommandLine="$(RsvgGenPCX64)"
                                                Outputs="..\librsvg-2.0.pc"
                                        />
                                </FileConfiguration>
diff --git a/build/win32/vs9/rsvg-install.vspropsin b/build/win32/vs9/rsvg-install.vspropsin
index 05aba2e..b5d9826 100644
--- a/build/win32/vs9/rsvg-install.vspropsin
+++ b/build/win32/vs9/rsvg-install.vspropsin
@@ -35,6 +35,10 @@ if exist ..\librsvg-$(ApiVersion).pc copy ..\librsvg-$(ApiVersion).pc $(CopyDir)
        />
        <UserMacro
                Name="RsvgGenPC"
-               Value="(if not exist $(CopyDir) mkdir $(CopyDir)) &amp; (if exist $(PythonPath)\python.exe 
$(PythonPath)\python.exe ..\rsvgpc.py --prefix=$(CopyDir) 
--version=$(RsvgMajorVersion).$(RsvgMinorVersion).$(RsvgMicroVersion))"
+               Value="(if not exist $(CopyDir) mkdir $(CopyDir)) &amp; (if exist $(PythonDir)\python.exe 
$(PythonDir)\python.exe ..\rsvgpc.py --prefix=$(CopyDir) 
--version=$(RsvgMajorVersion).$(RsvgMinorVersion).$(RsvgMicroVersion))"
+       />
+       <UserMacro
+               Name="RsvgGenPCX64"
+               Value="(if not exist $(CopyDir) mkdir $(CopyDir)) &amp; (if exist $(PythonDirX64)\python.exe 
$(PythonDirX64)\python.exe ..\rsvgpc.py --prefix=$(CopyDir) 
--version=$(RsvgMajorVersion).$(RsvgMinorVersion).$(RsvgMicroVersion))"
        />
 </VisualStudioPropertySheet>
diff --git a/build/win32/vs9/rsvg-version-paths.vsprops.in b/build/win32/vs9/rsvg-version-paths.vsprops.in
index 7175324..0c9b33a 100644
--- a/build/win32/vs9/rsvg-version-paths.vsprops.in
+++ b/build/win32/vs9/rsvg-version-paths.vsprops.in
@@ -63,7 +63,11 @@
                Value="$(RsvgSeparateVSDllSuffix)"
        />
        <UserMacro
-               Name="PythonPath"
+               Name="PythonDir"
                Value="c:\python27"
        />
+       <UserMacro
+               Name="PythonDirX64"
+               Value="$(PythonDir).x64"
+       />
 </VisualStudioPropertySheet>