[gdk-pixbuf] build: Use PythonDir instead of PythonPath in MSVC projects
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gdk-pixbuf] build: Use PythonDir instead of PythonPath in MSVC projects
- Date: Fri, 25 Aug 2017 08:34:12 +0000 (UTC)
commit 26df255558d44d9faad7749d00cfdf78a33f5766
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Aug 25 16:22:47 2017 +0800
build: Use PythonDir instead of PythonPath in MSVC projects
To avoid confusion with the PYTHONPATH envvar, use PythonDir instead of
PythonPath
win32/vs10/gdk-pixbuf-install.propsin | 4 ++--
win32/vs10/gdk-pixbuf-version-paths.props.in | 12 ++++++------
win32/vs9/gdk-pixbuf-install.vspropsin | 4 ++--
win32/vs9/gdk-pixbuf-version-paths.vsprops.in | 6 +++---
4 files changed, 13 insertions(+), 13 deletions(-)
---
diff --git a/win32/vs10/gdk-pixbuf-install.propsin b/win32/vs10/gdk-pixbuf-install.propsin
index 1abc6f8..b8dc7e6 100644
--- a/win32/vs10/gdk-pixbuf-install.propsin
+++ b/win32/vs10/gdk-pixbuf-install.propsin
@@ -22,8 +22,8 @@ mkdir $(CopyDir)\include\gdk-pixbuf-$(ApiVersion)\gdk-pixbuf
if exist ..\gdk-pixbuf-2.0.pc (mkdir $(CopyDir)\lib\pkgconfig & copy ..\gdk-pixbuf-2.0.pc
$(CopyDir)\lib\pkgconfig)
</GdkPixbufDoInstall>
- <GenGdkPixbufPC>if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gdkpixbuf-pc.py
--version=$(GdkPixbufMajorVersion).$(GdkPixbufMinorVersion).$(GdkPixbufMicroVersion)
--prefix=$(CopyDir)</GenGdkPixbufPC>
- <GenGdkPixbufPCX64>if exist $(PythonPathX64)\python.exe $(PythonPathX64)\python.exe ..\gdkpixbuf-pc.py
--version=$(GdkPixbufMajorVersion).$(GdkPixbufMinorVersion).$(GdkPixbufMicroVersion)
--prefix=$(CopyDir)</GenGdkPixbufPCX64>
+ <GenGdkPixbufPC>if exist $(PythonDir)\python.exe $(PythonDir)\python.exe ..\gdkpixbuf-pc.py
--version=$(GdkPixbufMajorVersion).$(GdkPixbufMinorVersion).$(GdkPixbufMicroVersion)
--prefix=$(CopyDir)</GenGdkPixbufPC>
+ <GenGdkPixbufPCX64>if exist $(PythonDirX64)\python.exe $(PythonDirX64)\python.exe ..\gdkpixbuf-pc.py
--version=$(GdkPixbufMajorVersion).$(GdkPixbufMinorVersion).$(GdkPixbufMicroVersion)
--prefix=$(CopyDir)</GenGdkPixbufPCX64>
<GdkPixbufPCFiles>..\gdk-pixbuf-2.0.pc</GdkPixbufPCFiles>
</PropertyGroup>
<PropertyGroup>
diff --git a/win32/vs10/gdk-pixbuf-version-paths.props.in b/win32/vs10/gdk-pixbuf-version-paths.props.in
index 8ed4baf..6bda226 100644
--- a/win32/vs10/gdk-pixbuf-version-paths.props.in
+++ b/win32/vs10/gdk-pixbuf-version-paths.props.in
@@ -15,8 +15,8 @@
<GdkPixbufSeparateVSDllSuffix>-2-vs$(VSVer)</GdkPixbufSeparateVSDllSuffix>
<GdkPixbufDllPrefix>$(GdkPixbufSeparateVSDllPrefix)</GdkPixbufDllPrefix>
<GdkPixbufDllSuffix>$(GdkPixbufSeparateVSDllSuffix)</GdkPixbufDllSuffix>
- <PythonPath>c:\python34</PythonPath>
- <PythonPathX64>$(PythonPath).x64</PythonPathX64>
+ <PythonDir>c:\python34</PythonDir>
+ <PythonDirX64>$(PythonDir).x64</PythonDirX64>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>gdk-versionpathsprops</_PropertySheetDisplayName>
@@ -64,11 +64,11 @@
<BuildMacro Include="GdkPixbufDllSuffix">
<Value>$(GdkPixbufDllSuffix)</Value>
</BuildMacro>
- <BuildMacro Include="PythonPath">
- <Value>$(PythonPath)</Value>
+ <BuildMacro Include="PythonDir">
+ <Value>$(PythonDir)</Value>
</BuildMacro>
- <BuildMacro Include="PythonPathX64">
- <Value>$(PythonPathX64)</Value>
+ <BuildMacro Include="PythonDirX64">
+ <Value>$(PythonDirX64)</Value>
</BuildMacro>
</ItemGroup>
</Project>
diff --git a/win32/vs9/gdk-pixbuf-install.vspropsin b/win32/vs9/gdk-pixbuf-install.vspropsin
index 119600e..fca04c4 100644
--- a/win32/vs9/gdk-pixbuf-install.vspropsin
+++ b/win32/vs9/gdk-pixbuf-install.vspropsin
@@ -25,10 +25,10 @@ if exist ..\gdk-pixbuf-$(ApiVersion).pc (mkdir $(CopyDir)\lib\pkgconfig & co
/>
<UserMacro
Name="GenGdkPixbufPC"
- Value="if exist $(PythonPath)\python.exe $(PythonPath)\python.exe ..\gdkpixbuf-pc.py
--version=$(GdkPixbufMajorVersion).$(GdkPixbufMinorVersion).$(GdkPixbufMicroVersion) --prefix=$(CopyDir)"
+ Value="if exist $(PythonDir)\python.exe $(PythonDir)\python.exe ..\gdkpixbuf-pc.py
--version=$(GdkPixbufMajorVersion).$(GdkPixbufMinorVersion).$(GdkPixbufMicroVersion) --prefix=$(CopyDir)"
/>
<UserMacro
Name="GenGdkPixbufPCX64"
- Value="if exist $(PythonPathX64)\python.exe $(PythonPathX64)\python.exe ..\gdkpixbuf-pc.py
--version=$(GdkPixbufMajorVersion).$(GdkPixbufMinorVersion).$(GdkPixbufMicroVersion) --prefix=$(CopyDir)"
+ Value="if exist $(PythonDirX64)\python.exe $(PythonDirX64)\python.exe ..\gdkpixbuf-pc.py
--version=$(GdkPixbufMajorVersion).$(GdkPixbufMinorVersion).$(GdkPixbufMicroVersion) --prefix=$(CopyDir)"
/>
</VisualStudioPropertySheet>
diff --git a/win32/vs9/gdk-pixbuf-version-paths.vsprops.in b/win32/vs9/gdk-pixbuf-version-paths.vsprops.in
index 7aa59cf..dee2dbf 100644
--- a/win32/vs9/gdk-pixbuf-version-paths.vsprops.in
+++ b/win32/vs9/gdk-pixbuf-version-paths.vsprops.in
@@ -63,11 +63,11 @@
Value="$(GdkPixbufSeparateVSDllSuffix)"
/>
<UserMacro
- Name="PythonPath"
+ Name="PythonDir"
Value="c:\python27"
/>
<UserMacro
- Name="PythonPathX64"
- Value="$(PythonPath).x64"
+ Name="PythonDirX64"
+ Value="$(PythonDir).x64"
/>
</VisualStudioPropertySheet>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]