From 74ffc85b80f4f624b50d073cc60d2f103429b407 Mon Sep 17 00:00:00 2001 From: Chun-wei Fan Date: Mon, 28 Aug 2017 14:58:42 +0800 Subject: [PATCH] build: Use PythonDir in Visual Studio projects This is to avoid any confusion with the PYTHONPATH envvar that is used by Python for additional locations for looking for modules. --- build/win32/vs10/README.txt | 4 ++-- build/win32/vs10/gtk3-gen-srcs.props | 6 +++--- build/win32/vs10/gtk3-install.propsin | 4 ++-- build/win32/vs10/gtk3-version-paths.props.in | 12 ++++++------ build/win32/vs9/README.txt | 4 ++-- build/win32/vs9/gtk3-gen-srcs.vsprops | 6 +++--- build/win32/vs9/gtk3-install.vspropsin | 4 ++-- build/win32/vs9/gtk3-version-paths.vsprops.in | 6 +++--- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/build/win32/vs10/README.txt b/build/win32/vs10/README.txt index 3ccb187219..13ae0e3c5b 100644 --- a/build/win32/vs10/README.txt +++ b/build/win32/vs10/README.txt @@ -24,8 +24,8 @@ You will also need a Python 2.6+/3.x interpretor installed on your system, which can be obtained from the official installers available from http://www.python.org. Please note that the Python interpretor (python.exe) either needs to be in your PATH before attempting the build of GTK+, or it -can be found in the path specified by PythonPath in gtk-version-paths.props. -If you happen to change the PythonPath setting in gtk-version-paths.props after +can be found in the path specified by PythonDir in gtk-version-paths.props. +If you happen to change the PythonDir setting in gtk-version-paths.props after opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution, delete all the *.sdf, *.suo and *.user files before re-attempting the build. diff --git a/build/win32/vs10/gtk3-gen-srcs.props b/build/win32/vs10/gtk3-gen-srcs.props index e5e9c021b9..74f7edcfc7 100644 --- a/build/win32/vs10/gtk3-gen-srcs.props +++ b/build/win32/vs10/gtk3-gen-srcs.props @@ -39,10 +39,10 @@ echo $(Configuration) > ..\..\..\MSVC_$(Configuration)_Broadway :DONE_GDKCONFIG_H $(GlibEtcInstallRoot)\bin\gdbus-codegen --interface-prefix org.Gtk. --c-namespace _Gtk --generate-c-code gtkdbusgenerated ./gtkdbusinterfaces.xml - cd ..\..\..\gtk & $(PythonPath)\python $(GDbusCodeGenCmd) & cd $(SolutionDir) - cd ..\..\..\gtk & $(PythonPathX64)\python $(GDbusCodeGenCmd) & cd $(SolutionDir) + cd ..\..\..\gtk & $(PythonDir)\python $(GDbusCodeGenCmd) & cd $(SolutionDir) + cd ..\..\..\gtk & $(PythonDirX64)\python $(GDbusCodeGenCmd) & cd $(SolutionDir) copy ..\..\..\gtk\gtk-win32.rc.body ..\..\..\gtk\gtk-win32.rc - $(PythonPath)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=* + $(PythonDir)\python ..\replace.py --action=replace-var --input=..\..\..\gtk\libgtk3.manifest.in --output=..\..\..\gtk\libgtk3.manifest --var=EXE_MANIFEST_ARCHITECTURE --outstring=* copy ..\..\..\demos\gtk-demo\demos.h.win32 ..\..\..\demos\gtk-demo\demos.h diff --git a/build/win32/vs10/gtk3-install.propsin b/build/win32/vs10/gtk3-install.propsin index 57625fb44d..1d527fc04e 100644 --- a/build/win32/vs10/gtk3-install.propsin +++ b/build/win32/vs10/gtk3-install.propsin @@ -133,8 +133,8 @@ $(GlibEtcInstallRoot)\bin\glib-compile-schemas.exe $(CopyDir)\share\glib-2.0\sch echo "Generating icon cache......" $(CopyDir)\bin\gtk-update-icon-cache.exe --ignore-theme-index --force "$(CopyDir)\share\icons\hicolor" - $(PythonPath)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer) - $(PythonPathX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer) + $(PythonDir)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=i686-pc-vs$(VSVer) + $(PythonDirX64)\python ..\gtkpc.py --prefix=$(CopyDir) --version=$(GtkVersion) --host=x86_64-pc-vs$(VSVer) ..\gdk-3.0.pc;..\gtk+-3.0.pc;..\gail-3.0.pc diff --git a/build/win32/vs10/gtk3-version-paths.props.in b/build/win32/vs10/gtk3-version-paths.props.in index 8c3e3d6585..cf35781a7b 100644 --- a/build/win32/vs10/gtk3-version-paths.props.in +++ b/build/win32/vs10/gtk3-version-paths.props.in @@ -12,8 +12,8 @@ -vs$(VSVer) $(GtkSeparateVSDllPrefix) $(GtkSeparateVSDllSuffix) - c:\python34 - $(PythonPath).x64 + c:\python34 + $(PythonDir).x64 <_PropertySheetDisplayName>gtk3versionpathsprops @@ -52,11 +52,11 @@ $(GtkDllSuffix) - - $(PythonPath) + + $(PythonDir) - - $(PythonPathX64) + + $(PythonDirX64) diff --git a/build/win32/vs9/README.txt b/build/win32/vs9/README.txt index 974f1381eb..7f83daaeea 100644 --- a/build/win32/vs9/README.txt +++ b/build/win32/vs9/README.txt @@ -23,8 +23,8 @@ You will also need a Python 2.6+/3.x interpretor installed on your system, which can be obtained from the official installers available from http://www.python.org. Please note that the Python interpretor (python.exe) either needs to be in your PATH before attempting the build of GTK+, or it -can be found in the path specified by PythonPath in gtk-version-paths.vsprops. -If you happen to change the PythonPath setting in gtk-version-paths.vsprops after +can be found in the path specified by PythonDir in gtk-version-paths.vsprops. +If you happen to change the PythonDir setting in gtk-version-paths.vsprops after opening gtk+.sln with Visual Studio, you will need to close the gtk+.sln solution, delete all the *.ncb, *.suo and *.user files before re-attempting the build. diff --git a/build/win32/vs9/gtk3-gen-srcs.vsprops b/build/win32/vs9/gtk3-gen-srcs.vsprops index c221fc4e04..a637c02509 100644 --- a/build/win32/vs9/gtk3-gen-srcs.vsprops +++ b/build/win32/vs9/gtk3-gen-srcs.vsprops @@ -60,11 +60,11 @@ echo $(ConfigurationName) > ..\..\..\MSVC_$(ConfigurationName)_Broadway /> diff --git a/build/win32/vs9/gtk3-version-paths.vsprops.in b/build/win32/vs9/gtk3-version-paths.vsprops.in index 7d031c95d9..90b03bef3a 100644 --- a/build/win32/vs9/gtk3-version-paths.vsprops.in +++ b/build/win32/vs9/gtk3-version-paths.vsprops.in @@ -51,11 +51,11 @@ Value="$(GtkSeparateVSDllSuffix)" />