[gtksourceview] build: Use PythonDir instead of PythonPath in MSVC projects
- From: Chun-wei Fan <fanchunwei src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtksourceview] build: Use PythonDir instead of PythonPath in MSVC projects
- Date: Fri, 5 Oct 2018 09:46:54 +0000 (UTC)
commit 9170d0d886c8cad44b44ad3eb2706b6e4e70a927
Author: Chun-wei Fan <fanchunwei src gnome org>
Date: Fri Oct 5 16:46:38 2018 +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/gtksourceview4-gen-srcs.props | 2 +-
win32/vs10/gtksourceview4-install.propsin | 2 +-
win32/vs10/gtksourceview4-version-paths.props.in | 6 +++---
win32/vs9/gtksourceview4-gen-srcs.vsprops | 2 +-
win32/vs9/gtksourceview4-install.vspropsin | 2 +-
win32/vs9/gtksourceview4-version-paths.vsprops.in | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/win32/vs10/gtksourceview4-gen-srcs.props b/win32/vs10/gtksourceview4-gen-srcs.props
index 1cb557e3..6ab8a0d8 100644
--- a/win32/vs10/gtksourceview4-gen-srcs.props
+++ b/win32/vs10/gtksourceview4-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>gtksourceview4gensrcsprops</_PropertySheetDisplayName>
diff --git a/win32/vs10/gtksourceview4-install.propsin b/win32/vs10/gtksourceview4-install.propsin
index 57a4a76c..e59704e8 100644
--- a/win32/vs10/gtksourceview4-install.propsin
+++ b/win32/vs10/gtksourceview4-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) &
($(PythonPath)\python ..\gtksourceviewpc.py --prefix=$(CopyDir)
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion))</GtkSourceviewGenPC>
+ <GtkSourceviewGenPC>(if not exist $(CopyDir)\lib\pkgconfig mkdir $(CopyDir)\lib\pkgconfig) &
($(PythonDir)\python ..\gtksourceviewpc.py --prefix=$(CopyDir)
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion))</GtkSourceviewGenPC>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>gtksourceview4installprops</_PropertySheetDisplayName>
diff --git a/win32/vs10/gtksourceview4-version-paths.props.in
b/win32/vs10/gtksourceview4-version-paths.props.in
index af7c6063..95fe1673 100644
--- a/win32/vs10/gtksourceview4-version-paths.props.in
+++ b/win32/vs10/gtksourceview4-version-paths.props.in
@@ -15,7 +15,7 @@
<GtkSourceviewSeparateVSDllSuffix>-vs$(VSVer)</GtkSourceviewSeparateVSDllSuffix>
<GtkSourceviewDllPrefix>$(GtkSourceviewSeparateVSDllPrefix)</GtkSourceviewDllPrefix>
<GtkSourceviewDllSuffix>$(GtkSourceviewSeparateVSDllSuffix)</GtkSourceviewDllSuffix>
- <PythonPath>c:\python34</PythonPath>
+ <PythonDir>c:\python34</PythonDir>
</PropertyGroup>
<PropertyGroup>
<_PropertySheetDisplayName>gtksourceview4versionpathsprops</_PropertySheetDisplayName>
@@ -63,8 +63,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/gtksourceview4-gen-srcs.vsprops b/win32/vs9/gtksourceview4-gen-srcs.vsprops
index 32aac285..d82168c6 100644
--- a/win32/vs9/gtksourceview4-gen-srcs.vsprops
+++ b/win32/vs9/gtksourceview4-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/gtksourceview4-install.vspropsin b/win32/vs9/gtksourceview4-install.vspropsin
index fcd62a53..820dab32 100644
--- a/win32/vs9/gtksourceview4-install.vspropsin
+++ b/win32/vs9/gtksourceview4-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) &
($(PythonPath)\python ..\gtksourceviewpc.py --prefix=$(CopyDir)
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion))"
+ Value="(if not exist $(CopyDir)\lib\pkgconfig mkdir $(CopyDir)\lib\pkgconfig) &
($(PythonDir)\python ..\gtksourceviewpc.py --prefix=$(CopyDir)
--version=$(GtkSourceviewMajorVersion).$(GtkSourceviewMinorVersion).$(GtkSourceviewMicroVersion))"
/>
</VisualStudioPropertySheet>
diff --git a/win32/vs9/gtksourceview4-version-paths.vsprops.in
b/win32/vs9/gtksourceview4-version-paths.vsprops.in
index 24da3179..6ff29308 100644
--- a/win32/vs9/gtksourceview4-version-paths.vsprops.in
+++ b/win32/vs9/gtksourceview4-version-paths.vsprops.in
@@ -67,7 +67,7 @@
Value="$(GtkSourceviewSeparateVSDllSuffix)"
/>
<UserMacro
- Name="PythonPath"
+ Name="PythonDir"
Value="c:\python27"
/>
</VisualStudioPropertySheet>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]