Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d2aa7df24fea7a5580b69e6210a884b04584f4bc)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d2aa7df24fea7a5580b69e6210a884b04584f4bc)
  • Date: Fri, 29 Sep 2017 17:33:01 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

python-pypi/scons/2e0de3c5.patch | 107
+++++++++++++++++++++++++++++++++++++++
python-pypi/scons/DETAILS | 1
python-pypi/scons/HISTORY | 5 +
python-pypi/scons/PRE_BUILD | 4 +
4 files changed, 117 insertions(+)

New commits:
commit d2aa7df24fea7a5580b69e6210a884b04584f4bc
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

scons: apply upstream patch to fix builds that use old-stype print

diff --git a/python-pypi/scons/2e0de3c5.patch
b/python-pypi/scons/2e0de3c5.patch
new file mode 100644
index 0000000..3d1bdab
--- /dev/null
+++ b/python-pypi/scons/2e0de3c5.patch
@@ -0,0 +1,107 @@
+From 2e0de3c55f22b3eaa7767b69740b898f3d2f46bf Mon Sep 17 00:00:00 2001
+From: Thomas Berg <merlin66b AT gmail.com>
+Date: Wed, 20 Sep 2017 13:24:22 +0200
+Subject: [PATCH] Support python 2 print statements in SConscripts
+
+This fixes a regression introduced in scons-3.0.0, where
+SConscripts containing python 2 print statements would cause
+syntax errors even when executing scons with python 2.7.
+
+This ensures backward compatibility, allowing users to build
+legacy code with scons-3.0.0 without having to patch it.
+---
+ src/CHANGES.txt | 3 ++
+ src/engine/SCons/Script/SConscript.py | 2 --
+ test/print_statement.py | 56
+++++++++++++++++++++++++++++++++++
+ 3 files changed, 59 insertions(+), 2 deletions(-)
+ create mode 100644 test/print_statement.py
+
+diff --git a/src/CHANGES.txt b/src/CHANGES.txt
+index 4b492e6a..0e742ec5 100644
+--- a/src/CHANGES.txt
++++ b/src/CHANGES.txt
+@@ -11,6 +11,9 @@ RELEASE VERSION/DATE TO BE FILLED IN LATER
+
+ - Whatever John Doe did.
+
++ From Thomas Berg:
++ - Fixed a regression in scons-3.0.0 where "from __future__ import
print_function" was imposed
++ on the scope where SConstruct is executed, breaking existing builds
using PY 2.7.
+
+ RELEASE 3.0.0 - Mon, 18 Sep 2017 08:32:04 -0700
+
+diff --git a/src/engine/SCons/Script/SConscript.py
b/src/engine/SCons/Script/SConscript.py
+index 558e28f9..8fea9c4d 100644
+--- a/src/engine/SCons/Script/SConscript.py
++++ b/src/engine/SCons/Script/SConscript.py
+@@ -5,8 +5,6 @@
+
+ """
+
+-from __future__ import print_function
+-
+ #
+ # __COPYRIGHT__
+ #
+diff --git a/test/print_statement.py b/test/print_statement.py
+new file mode 100644
+index 00000000..22050593
+--- /dev/null
++++ b/test/print_statement.py
+@@ -0,0 +1,56 @@
++#!/usr/bin/env python
++#
++# __COPYRIGHT__
++#
++# Permission is hereby granted, free of charge, to any person obtaining
++# a copy of this software and associated documentation files (the
++# "Software"), to deal in the Software without restriction, including
++# without limitation the rights to use, copy, modify, merge, publish,
++# distribute, sublicense, and/or sell copies of the Software, and to
++# permit persons to whom the Software is furnished to do so, subject to
++# the following conditions:
++#
++# The above copyright notice and this permission notice shall be included
++# in all copies or substantial portions of the Software.
++#
++# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
++# KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
++# WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
++# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
++# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
++# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
++# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
++#
++
++__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
++
++import sys
++import TestSCons
++
++test = TestSCons.TestSCons()
++
++
++test.write('SConstruct', """\
++print('python 3 style statement')
++Exit(0)
++""")
++
++test.run()
++
++test.write('SConstruct', """\
++print 'python 2 style statement'
++Exit(0)
++""")
++
++if sys.version_info >= (3,0):
++ test.skip_test('Python 2 print statement test, skipping on Python 3.\n')
++else:
++ test.run()
++
++test.pass_test()
++
++# Local Variables:
++# tab-width:4
++# indent-tabs-mode:nil
++# End:
++# vim: set expandtab tabstop=4 shiftwidth=4:
diff --git a/python-pypi/scons/DETAILS b/python-pypi/scons/DETAILS
index 47d396b..b200dfd 100755
--- a/python-pypi/scons/DETAILS
+++ b/python-pypi/scons/DETAILS
@@ -1,5 +1,6 @@
SPELL=scons
VERSION=3.0.0
+ PATCHLEVEL=1

SOURCE_HASH=sha512:e52c31a21f8aab4bbb684a8770cbcb9eeef042d5c8c86ea2f4beb64ec0c50bc1ca4aa738a2bf92330bd26f8fa9589cb10314dc53defccc2825a5a13b01641b2d
SOURCE=$SPELL-$VERSION.tar.gz
SOURCE_DIRECTORY="$BUILD_DIRECTORY/$SPELL-$VERSION"
diff --git a/python-pypi/scons/HISTORY b/python-pypi/scons/HISTORY
index 468f16b..e6658b1 100644
--- a/python-pypi/scons/HISTORY
+++ b/python-pypi/scons/HISTORY
@@ -1,3 +1,8 @@
+2017-09-29 Thomas Orgis <sobukus AT sourcemage.org>
+ * PRE_BUILD, 2e0de3c5.patch: Fix python2-stype print
+ statements in scons input files. This un-breaks a number of spells.
+ * DETAILS: ++PATCHLEVEL
+
2017-09-19 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 3.0.0

diff --git a/python-pypi/scons/PRE_BUILD b/python-pypi/scons/PRE_BUILD
index b513613..f27a97f 100755
--- a/python-pypi/scons/PRE_BUILD
+++ b/python-pypi/scons/PRE_BUILD
@@ -1,6 +1,10 @@
default_pre_build &&
cd "$SOURCE_DIRECTORY" &&
# fix the scons script to explicitly use python2
+# Watch out: scons-3 is supposed to be able to work with python3.
+# We might want to switch, too!
sed -i '1s/python$/&2/' script/scons &&
+# This patch fixes scons input that uses python2 print syntax:
+patch -Np2 < "$SCRIPT_DIRECTORY/2e0de3c5.patch" &&
# fix man page install location
sed -i "s/\('man', 'man1'\)/'share', \1/" setup.py



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (d2aa7df24fea7a5580b69e6210a884b04584f4bc), Thomas Orgis, 09/29/2017

Archive powered by MHonArc 2.6.24.

Top of Page