[gtk/more-vs-proj-updates: 1/5] Visual Studio projects: Make it clear Python 3.x is now required




commit 24f4873dee9634cd53123f1518b146eff0c7bee8
Author: Chun-wei Fan <fanchunwei src gnome org>
Date:   Thu May 26 12:35:23 2022 +0800

    Visual Studio projects: Make it clear Python 3.x is now required
    
    The scripts that are used during the build to generate the sources now
    do require Python 3.x to work, so make this clear to people.
    
    In the Visual Studio projects, update the default Python installation to
    correspond with Python 3.7.x or later, which is the lowest supported
    version series of Python at this point.

 README.win32                                 |  6 +++---
 win32/README_FEATURES_MSVC.txt               |  2 +-
 win32/vs1x-props/gtk3-version-paths.props.in | 17 ++---------------
 win32/vs9/gtk3-version-paths.vsprops.in      |  2 +-
 4 files changed, 7 insertions(+), 20 deletions(-)
---
diff --git a/README.win32 b/README.win32
index b6601c48ba..91b8fb2275 100644
--- a/README.win32
+++ b/README.win32
@@ -181,7 +181,7 @@ If desiring to build binaries for ARM64 (aarch64), one needs to use the
 Visual Studio 2017 or 2019 solution files, or use Meson with a
 cross-compilation file, with a Windows 10 SDK that supports ARM64
 builds.  At this point, building the introspection files is not supported
-for ARM64 builds, and you will need a Python interpreter and
+for ARM64 builds, and you will need a Python 3.x interpreter and
 glib-compile-resources binaries that run on the build machine.  For Visual Studio
 2017 ARM64 builds, do also check the Directory.Build.props file in $(srcroot)/win32/vs15
 indicates a Windows 10 SDK version that supports ARM64 builds exists on the build machine.
@@ -192,7 +192,7 @@ GLIB_GENMARSHAL, GDBUS_CODEGEN and/or GLIB_COMPILE_RESOURCES in the nmake comman
 indicated by <GenerateRequiredSourcesBase>  so that they point to the glib-mkenums,
 glib-genmarshal, gdbus-codegen and glib-compile-resources that will run on the build
 machine.  You may also need to update gtk3-version-paths.props to update PythonDir to
-the installation of the Python interpreter that will run on the build machine.  To carry
+the installation of the Python 3.x interpreter that will run on the build machine.  To carry
 out the actual build using the solution files, use the "Configuration Manager" to add the
 ARM64 build configs by copying the settings from the x64 configs, and then build the solution.
 The build instructions for such builds otherwise follow the standard Win32 (x86) and
@@ -222,7 +222,7 @@ as the source tree, and launch the Visual Studio command prompt that
 matches the build configuration (Visual Studio version and architecture),
 and run the following:
 
-- Ensure that both the installation directory of Python and its script
+- Ensure that both the installation directory of Python 3.5+ and its script
   directory is in your PATH, as well as the Ninja, CMake and pkg-config
   executables (if used).  If a pkg-config compatible drop-in replacement
   tool is being used, ensure that PKG_CONFIG is set to point to the
diff --git a/win32/README_FEATURES_MSVC.txt b/win32/README_FEATURES_MSVC.txt
index 9a97730262..2a37aea19f 100644
--- a/win32/README_FEATURES_MSVC.txt
+++ b/win32/README_FEATURES_MSVC.txt
@@ -62,7 +62,7 @@ Please note that the font features demo is not built into gtk3-demo
 by default.  To do that, run in a Visual Studio command prompt, go to
 $(srcroot)\win32, and run
 "nmake /f generate-msvc.mak regenerate-demos-h-win32 FONT_FEATURES_DEMO=1".
-To undo that, run that command without "FONT_FEATURES_DEMO=1".  Python must
+To undo that, run that command without "FONT_FEATURES_DEMO=1".  Python 3.x must
 be present in your PATH or passed in via PYTHON=<path_to_python_interpreter>.
 If you are building the font features demo with the older PangoFT2-style
 (i.e. pre-Pango-1.44.x and pre-HarfBuzz-2.2.0) support, pass in 
diff --git a/win32/vs1x-props/gtk3-version-paths.props.in b/win32/vs1x-props/gtk3-version-paths.props.in
index 5c34e804d5..4ae0cc85e4 100644
--- a/win32/vs1x-props/gtk3-version-paths.props.in
+++ b/win32/vs1x-props/gtk3-version-paths.props.in
@@ -19,21 +19,8 @@
     <GtkSeparateVSDllSuffix>-vs$(VSVer)</GtkSeparateVSDllSuffix>
     <GtkDllPrefix>$(GtkSeparateVSDllPrefix)</GtkDllPrefix>
     <GtkDllSuffix>$(GtkSeparateVSDllSuffix)</GtkDllSuffix>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '10.0|Win32'">c:\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '11.0|Win32'">c:\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '12.0|Win32'">c:\python34</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '14.0|Win32'">c:\python36</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '15.0|Win32'">c:\python36</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '16.0|Win32'">c:\python36</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '17.0|Win32'">c:\python36</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '10.0|x64'">c:\python34.x64</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '11.0|x64'">c:\python34.x64</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '12.0|x64'">c:\python34.x64</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '14.0|x64'">c:\python36.x64</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '15.0|x64'">c:\python36.x64</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '16.0|x64'">c:\python36.x64</PythonDir>
-    <PythonDir Condition="'$(VisualStudioVersion)|$(Platform)' == '17.0|x64'">c:\python36.x64</PythonDir>
-
+    <PythonDir Condition="'$(Platform)' == 'Win32'">c:\python37</PythonDir>
+    <PythonDir Condition="'$(Platform)' == 'x64'">c:\python37.x64</PythonDir>
     <IntrospectPythonParam>PYTHON=$(PythonDir)\python.exe</IntrospectPythonParam>
   </PropertyGroup>
   <PropertyGroup>
diff --git a/win32/vs9/gtk3-version-paths.vsprops.in b/win32/vs9/gtk3-version-paths.vsprops.in
index d6ac03f262..35a4e2eaa6 100644
--- a/win32/vs9/gtk3-version-paths.vsprops.in
+++ b/win32/vs9/gtk3-version-paths.vsprops.in
@@ -52,7 +52,7 @@
        />
        <UserMacro
                Name="PythonDir"
-               Value="c:\python27"
+               Value="c:\python37"
        />
        <UserMacro
                Name="PythonDirX64"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]