[gtksourceview/gnome-3-24] build: Use PythonDir instead of PythonPath in MSVC projects

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

commit d7601782dd3fc2a22f265e5667ceddf8a9b18e99
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Fri Sep 8 15:26:26 2017 +0800

    build: Use PythonDir instead of PythonPath in MSVC projects
    
    This avoids any confusion with the PYTHONPATH envvar that is used to
    specify additional paths to look for Python modules.

 win32/vs10/gtksourceview-gen-srcs.props          |    2 +-
 win32/vs10/gtksourceview-install.propsin         |    2 +-
 win32/vs10/gtksourceview-version-paths.props.in  |    6 +++---
 win32/vs9/gtksourceview-gen-srcs.vsprops         |    2 +-
 win32/vs9/gtksourceview-install.vspropsin        |    2 +-
 win32/vs9/gtksourceview-version-paths.vsprops.in |    2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/win32/vs10/gtksourceview-gen-srcs.props b/win32/vs10/gtksourceview-gen-srcs.props
index 4f023b8..749e219 100644
--- a/win32/vs10/gtksourceview-gen-srcs.props
+++ b/win32/vs10/gtksourceview-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>$(PythonPath)\python.exe ..\gtksource_version_h.py 
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion)</GenGtksourceVersionH>
+    <GenGtksourceVersionH>$(PythonDir)\python.exe ..\gtksource_version_h.py 
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion)</GenGtksourceVersionH>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtksourceviewgensrcsprops</_PropertySheetDisplayName>
diff --git a/win32/vs10/gtksourceview-install.propsin b/win32/vs10/gtksourceview-install.propsin
index 30e6cf1..c374a58 100644
--- a/win32/vs10/gtksourceview-install.propsin
+++ b/win32/vs10/gtksourceview-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; 
($(PythonPath)\python ..\gtksourceviewpc.py --prefix=$(CopyDir) 
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion))</GtkSourceviewGenPC>
+    <GtkSourceviewGenPC>(if not exist $(CopyDir)\lib\pkgconfig mkdir $(CopyDir)\lib\pkgconfig) &amp; 
($(PythonDir)\python ..\gtksourceviewpc.py --prefix=$(CopyDir) 
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion))</GtkSourceviewGenPC>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtksourceviewinstallprops</_PropertySheetDisplayName>
diff --git a/win32/vs10/gtksourceview-version-paths.props.in b/win32/vs10/gtksourceview-version-paths.props.in
index 7de4990..65a0c2e 100644
--- a/win32/vs10/gtksourceview-version-paths.props.in
+++ b/win32/vs10/gtksourceview-version-paths.props.in
@@ -15,7 +15,7 @@
     <GtkSourceviewSeparateVSDllSuffix>-3-vs$(VSVer)</GtkSourceviewSeparateVSDllSuffix>
     <GtkSourceviewDllPrefix>$(GtkSourceviewSeparateVSDllPrefix)</GtkSourceviewDllPrefix>
     <GtkSourceviewDllSuffix>$(GtkSourceviewSeparateVSDllSuffix)</GtkSourceviewDllSuffix>
-    <PythonPath>c:\python27</PythonPath>
+    <PythonDir>c:\python27</PythonDir>
   </PropertyGroup>
   <PropertyGroup>
     <_PropertySheetDisplayName>gtksourceviewversionpathsprops</_PropertySheetDisplayName>
@@ -66,8 +66,8 @@
     <BuildMacro Include="GtkSourceviewDllSuffix">
       <Value>$(GtkSourceviewDllSuffix)</Value>
     </BuildMacro>
-    <BuildMacro Include="PythonPath">
-      <Value>$(PythonPath)</Value>
+    <BuildMacro Include="PythonDir">
+      <Value>$(PythonDir)</Value>
     </BuildMacro>
   </ItemGroup>
 </Project>
diff --git a/win32/vs9/gtksourceview-gen-srcs.vsprops b/win32/vs9/gtksourceview-gen-srcs.vsprops
index 5a498b3..f4cbbdd 100644
--- a/win32/vs9/gtksourceview-gen-srcs.vsprops
+++ b/win32/vs9/gtksourceview-gen-srcs.vsprops
@@ -25,6 +25,6 @@ $(GlibEtcInstallRoot)\bin\glib-compile-resources --target=..\..\gtksourceview\gt
        />
        <UserMacro
                Name="GenGtksourceVersionH"
-               Value="$(PythonPath)\python.exe ..\gtksource_version_h.py 
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion)"
+               Value="$(PythonDir)\python.exe ..\gtksource_version_h.py 
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion)"
        />
 </VisualStudioPropertySheet>
diff --git a/win32/vs9/gtksourceview-install.vspropsin b/win32/vs9/gtksourceview-install.vspropsin
index aad863f..84749d6 100644
--- a/win32/vs9/gtksourceview-install.vspropsin
+++ b/win32/vs9/gtksourceview-install.vspropsin
@@ -33,6 +33,6 @@ copy ..\..\data\styles\styles.rng $(CopyDir)\share\gtksourceview-$(ApiVersion)\s
        />
        <UserMacro
                Name="GtkSourceviewGenPC"
-               Value="(if not exist $(CopyDir)\lib\pkgconfig mkdir $(CopyDir)\lib\pkgconfig) &amp; 
($(PythonPath)\python ..\gtksourceviewpc.py --prefix=$(CopyDir) 
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion))"
+               Value="(if not exist $(CopyDir)\lib\pkgconfig mkdir $(CopyDir)\lib\pkgconfig) &amp; 
($(PythonDir)\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 e6ed686..ce2fde1 100644
--- a/win32/vs9/gtksourceview-version-paths.vsprops.in
+++ b/win32/vs9/gtksourceview-version-paths.vsprops.in
@@ -67,7 +67,7 @@
                Value="$(GtkSourceviewSeparateVSDllSuffix)"
        />
        <UserMacro
-               Name="PythonPath"
+               Name="PythonDir"
                Value="c:\python27"
        />
 </VisualStudioPropertySheet>