[glib] Visual Studio builds: Use PythonDir instead of PythonPath

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

commit 9aa98db40450bc539a5cf59640c9f9cf28da93e8
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu Jul 13 17:45:44 2017 +0800

    Visual Studio builds: Use PythonDir instead of PythonPath
    
    This is to avoid confusion with the PYTHONPATH envvar that is commonly
    used to determine where additional Python modules can be loaded,
    especially in the case of a MSBuild build.  Note that envvar names are
    not case sensitive on Windows in general.

 win32/vs10/README.txt                   |    2 +-
 win32/vs10/glib-install.propsin         |    8 ++++----
 win32/vs10/glib-version-paths.props.in  |   14 +++++++-------
 win32/vs9/README.txt                    |    2 +-
 win32/vs9/glib-install.vspropsin        |    8 ++++----
 win32/vs9/glib-version-paths.vsprops.in |    2 +-
 6 files changed, 18 insertions(+), 18 deletions(-)
---
diff --git a/win32/vs10/README.txt b/win32/vs10/README.txt
index 69dfb5d..e73fcc9 100644
--- a/win32/vs10/README.txt
+++ b/win32/vs10/README.txt
@@ -26,7 +26,7 @@ builds.
 
 A Python 2.7.x or 3.x interpreter is also required, in order to generate
 the utility scripts, as well as the pkg-config files for the build.  Please
-see the entry "PythonPath" in glib-version-paths.props to verify that
+see the entry "PythonDir" in glib-version-paths.props to verify that
 it is correct.
 
 One may wish to build his/her own ZLib-It is recommended that ZLib is
diff --git a/win32/vs10/glib-install.propsin b/win32/vs10/glib-install.propsin
index 2092a4d..93762df 100644
--- a/win32/vs10/glib-install.propsin
+++ b/win32/vs10/glib-install.propsin
@@ -84,10 +84,10 @@ copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codege
 </GlibDoInstall>
     
<GlibUtilScripts>..\..\gobject\glib-mkenums;..\..\gobject\glib-genmarshal;..\..\gio\gdbus-2.0\codegen\gdbus-codegen</GlibUtilScripts>
     
<GlibPCFiles>..\gio-windows-2.0.pc;..\gio-2.0.pc;..\gobject-2.0.pc;..\gmodule-no-export-2.0.pc;..\gmodule-export-2.0.pc;..\gmodule-2.0.pc;..\gthread-2.0.pc;..\glib-2.0.pc</GlibPCFiles>
-    <GenGLibMKEnums>$(PythonPath)\python.exe ..\gen_util_scripts.py --type=glib-mkenums 
--version=$(GlibVersion)</GenGLibMKEnums>
-    <GenGLibGenmarshal>$(PythonPath)\python.exe ..\gen_util_scripts.py --type=glib-genmarshal 
--version=$(GlibVersion)</GenGLibGenmarshal>
-    <GenGDBusCodegen>$(PythonPath)\python.exe ..\gen_util_scripts.py --type=gdbus-codegen 
--version=$(GlibVersion)</GenGDBusCodegen>
-    <GlibGenPC>(if not exist $(CopyDir) mkdir $(CopyDir)) &amp; ($(PythonPath)\python.exe ..\glibpc.py 
--prefix=$(CopyDir) --version=$(GlibVersion))</GlibGenPC>
+    <GenGLibMKEnums>$(PythonDir)\python.exe ..\gen_util_scripts.py --type=glib-mkenums 
--version=$(GlibVersion)</GenGLibMKEnums>
+    <GenGLibGenmarshal>$(PythonDir)\python.exe ..\gen_util_scripts.py --type=glib-genmarshal 
--version=$(GlibVersion)</GenGLibGenmarshal>
+    <GenGDBusCodegen>$(PythonDir)\python.exe ..\gen_util_scripts.py --type=gdbus-codegen 
--version=$(GlibVersion)</GenGDBusCodegen>
+    <GlibGenPC>(if not exist $(CopyDir) mkdir $(CopyDir)) &amp; ($(PythonDir)\python.exe ..\glibpc.py 
--prefix=$(CopyDir) --version=$(GlibVersion))</GlibGenPC>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>glibinstallprops</_PropertySheetDisplayName>
diff --git a/win32/vs10/glib-version-paths.props.in b/win32/vs10/glib-version-paths.props.in
index df19f39..e711df9 100644
--- a/win32/vs10/glib-version-paths.props.in
+++ b/win32/vs10/glib-version-paths.props.in
@@ -12,11 +12,11 @@
     <GlibSeparateVSDllSuffix>-2-vs$(VSVer)</GlibSeparateVSDllSuffix>
     <GlibDllPrefix>$(GlibSeparateVSDllPrefix)</GlibDllPrefix>
     <GlibDllSuffix>$(GlibSeparateVSDllSuffix)</GlibDllSuffix>
-    <PythonPath Condition="'$(VisualStudioVersion)' == '10.0'">c:\python34</PythonPath>
-    <PythonPath Condition="'$(VisualStudioVersion)' == '11.0'">c:\python34</PythonPath>
-    <PythonPath Condition="'$(VisualStudioVersion)' == '12.0'">c:\python34</PythonPath>
-    <PythonPath Condition="'$(VisualStudioVersion)' == '14.0'">c:\python36</PythonPath>
-    <PythonPath Condition="'$(VisualStudioVersion)' == '15.0'">c:\python36</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>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>glibversionpathsprops</_PropertySheetDisplayName>
@@ -55,8 +55,8 @@
     <BuildMacro Include="GlibDllSuffix">
       <Value>$(GlibDllSuffix)</Value>
     </BuildMacro>
-    <BuildMacro Include="PythonPath">
-      <Value>$(PythonPath)</Value>
+    <BuildMacro Include="PythonDir">
+      <Value>$(PythonDir)</Value>
     </BuildMacro>
   </ItemGroup>
 </Project>
diff --git a/win32/vs9/README.txt b/win32/vs9/README.txt
index 1c6f729..2dbd41b 100644
--- a/win32/vs9/README.txt
+++ b/win32/vs9/README.txt
@@ -26,7 +26,7 @@ builds.
 
 A Python 2.7.x or 3.x interpreter is also required, in order to generate
 the utility scripts, as well as the pkg-config files for the build.  Please
-see the entry "PythonPath" in glib-version-paths.vsprops to verify that
+see the entry "PythonDir" in glib-version-paths.vsprops to verify that
 it is correct.
 
 One may wish to build his/her own ZLib-It is recommended that ZLib is
diff --git a/win32/vs9/glib-install.vspropsin b/win32/vs9/glib-install.vspropsin
index cc49fdb..c1e36d2 100644
--- a/win32/vs9/glib-install.vspropsin
+++ b/win32/vs9/glib-install.vspropsin
@@ -86,18 +86,18 @@ copy ..\..\gio\gdbus-2.0\codegen\*.py $(CopyDir)\share\glib-$(ApiVersion)\codege
        />
        <UserMacro
                Name="GenGLibMKEnums"
-               Value="$(PythonPath)\python.exe ..\gen_util_scripts.py --type=glib-mkenums 
--version=$(GlibVersion)"
+               Value="$(PythonDir)\python.exe ..\gen_util_scripts.py --type=glib-mkenums 
--version=$(GlibVersion)"
        />
        <UserMacro
                Name="GenGLibGenmarshal"
-               Value="$(PythonPath)\python.exe ..\gen_util_scripts.py --type=glib-genmarshal 
--version=$(GlibVersion)"
+               Value="$(PythonDir)\python.exe ..\gen_util_scripts.py --type=glib-genmarshal 
--version=$(GlibVersion)"
        />
        <UserMacro
                Name="GenGDBusCodegen"
-               Value="$(PythonPath)\python.exe ..\gen_util_scripts.py --type=gdbus-codegen 
--version=$(GlibVersion)"
+               Value="$(PythonDir)\python.exe ..\gen_util_scripts.py --type=gdbus-codegen 
--version=$(GlibVersion)"
        />
        <UserMacro
                Name="GlibGenPC"
-               Value="(if not exist $(CopyDir) mkdir $(CopyDir)) &amp; ($(PythonPath)\python.exe 
..\glibpc.py --prefix=$(CopyDir) --version=$(GlibVersion))"
+               Value="(if not exist $(CopyDir) mkdir $(CopyDir)) &amp; ($(PythonDir)\python.exe ..\glibpc.py 
--prefix=$(CopyDir) --version=$(GlibVersion))"
        />
 </VisualStudioPropertySheet>
diff --git a/win32/vs9/glib-version-paths.vsprops.in b/win32/vs9/glib-version-paths.vsprops.in
index 1b55c5c..af7739f 100644
--- a/win32/vs9/glib-version-paths.vsprops.in
+++ b/win32/vs9/glib-version-paths.vsprops.in
@@ -51,7 +51,7 @@
                Value="$(GlibSeparateVSDllSuffix)"
        />
        <UserMacro
-               Name="PythonPath"
+               Name="PythonDir"
                Value="c:\python27"
        />
 </VisualStudioPropertySheet>