X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=SConstruct;h=f905189dd9e518624bc1b4d7f1092bfe6f0728d0;hb=b4bc59e37ec0969d70e87d233e4e82431ec2e092;hp=696718c8eb445341d714094c9f8c09a19fa35fa8;hpb=8c00fe39707e9b4d72805f443b23e4576ae8801c;p=mesa.git

diff --git a/SConstruct b/SConstruct
index 696718c8eb4..f905189dd9e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -20,6 +20,7 @@
 # to get the full list of options. See scons manpage for more info.
 #
 
+from __future__ import print_function
 import os
 import os.path
 import sys
@@ -27,6 +28,13 @@ import SCons.Util
 
 import common
 
+#######################################################################
+# Minimal scons version
+
+EnsureSConsVersion(2, 4)
+EnsurePythonVersion(2, 7)
+
+
 #######################################################################
 # Configuration options
 
@@ -50,15 +58,35 @@ except KeyError:
     pass
 else:
     targets = targets.split(',')
-    print 'scons: warning: targets option is deprecated; pass the targets on their own such as'
-    print
-    print '  scons %s' % ' '.join(targets)
-    print
+    print('scons: warning: targets option is deprecated; pass the targets on their own such as')
+    print()
+    print('  scons %s' % ' '.join(targets))
+    print()
     COMMAND_LINE_TARGETS.append(targets)
 
 
 Help(opts.GenerateHelpText(env))
 
+
+#######################################################################
+# Print a deprecation warning for using scons on non-windows
+
+if common.host_platform != 'windows' and env['platform'] != 'windows':
+    if env['force_scons']:
+        print("WARNING: Scons is deprecated for non-windows platforms (including cygwin) "
+              "please use meson instead.", file=sys.stderr)
+    else:
+        print("ERROR: Scons is deprecated for non-windows platforms (including cygwin) "
+              "please use meson instead. If you really need to use scons you "
+              "can add `force_scons=1` to the scons command line.", file=sys.stderr)
+        sys.exit(1)
+else:
+    print("WARNING: Scons support is in the process of being deprecated on "
+          "on windows platforms (including mingw). If you haven't already "
+          "please try using meson for windows builds. Be sure to report any "
+          "issues you run into", file=sys.stderr)
+
+
 #######################################################################
 # Environment setup
 
@@ -66,7 +94,7 @@ with open("VERSION") as f:
   mesa_version = f.read().strip()
 env.Append(CPPDEFINES = [
     ('PACKAGE_VERSION', '\\"%s\\"' % mesa_version),
-    ('PACKAGE_BUGREPORT', '\\"https://bugs.freedesktop.org/enter_bug.cgi?product=Mesa\\"'),
+    ('PACKAGE_BUGREPORT', '\\"https://gitlab.freedesktop.org/mesa/mesa/issues\\"'),
 ])
 
 # Includes
@@ -152,8 +180,7 @@ try:
 except ImportError:
     pass
 else:
-    aliases = default_ans.keys()
-    aliases.sort()
+    aliases = sorted(default_ans.keys())
     env.Help('\n')
     env.Help('Recognized targets:\n')
     for alias in aliases: