diff options
author | Neil <nyamatongwe@gmail.com> | 2020-04-17 20:26:40 +1000 |
---|---|---|
committer | Neil <nyamatongwe@gmail.com> | 2020-04-17 20:26:40 +1000 |
commit | c16dc29844747f1f04b30cfce3d8badecd07bdbe (patch) | |
tree | c91d195658505bc682d9fe3dd8c98f2e62d05048 | |
parent | df5f7a0c831a77b4c981e168a5dbbdcaaa4d90b9 (diff) | |
download | scintilla-mirror-c16dc29844747f1f04b30cfce3d8badecd07bdbe.tar.gz |
Update Python versions for files that may involve PySide on Linux which requires
Python 2 still. On Windows, Python3 is used.
-rwxr-xr-x | cocoa/checkbuildosx.sh | 6 | ||||
-rw-r--r-- | qt/ScintillaEdit/WidgetGen.py | 2 | ||||
-rw-r--r-- | qt/ScintillaEditPy/sepbuild.py | 1 | ||||
-rw-r--r-- | qt/ScintillaEditPy/testsepq.py | 2 | ||||
-rw-r--r-- | test/XiteQt.py | 1 | ||||
-rw-r--r-- | test/XiteWin.py | 3 | ||||
-rw-r--r-- | test/lexTests.py | 1 | ||||
-rw-r--r-- | test/performanceTests.py | 2 | ||||
-rw-r--r-- | test/simpleTests.py | 1 | ||||
-rw-r--r-- | test/win32Tests.py | 1 | ||||
-rw-r--r-- | test/xite.py | 2 |
11 files changed, 16 insertions, 6 deletions
diff --git a/cocoa/checkbuildosx.sh b/cocoa/checkbuildosx.sh index bdc6054f2..6dc063bc2 100755 --- a/cocoa/checkbuildosx.sh +++ b/cocoa/checkbuildosx.sh @@ -20,7 +20,7 @@ cd ../../.. # which can cause double build echo Building Cocoa-native ScintillaFramework and ScintillaTest -for sdk in macosx10.9 macosx10.8 macosx10.7 macosx10.6 macosx10.5 +for sdk in macosx10.15 macosx10.14 do xcodebuild -showsdks | grep $sdk if [ "$(xcodebuild -showsdks | grep $sdk)" != "" ] @@ -54,13 +54,13 @@ xcodebuild cd .. cd ScintillaEdit -python WidgetGen.py +python3 WidgetGen.py qmake -spec macx-xcode xcodebuild clean xcodebuild cd .. cd ScintillaEditPy -python sepbuild.py +python2 sepbuild.py cd .. cd ../.. diff --git a/qt/ScintillaEdit/WidgetGen.py b/qt/ScintillaEdit/WidgetGen.py index 44349a90b..0360ff166 100644 --- a/qt/ScintillaEdit/WidgetGen.py +++ b/qt/ScintillaEdit/WidgetGen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/env python3 # WidgetGen.py - regenerate the ScintillaWidgetCpp.cpp and ScintillaWidgetCpp.h files # Check that API includes all gtkscintilla2 functions diff --git a/qt/ScintillaEditPy/sepbuild.py b/qt/ScintillaEditPy/sepbuild.py index 3207e8242..6b67c1765 100644 --- a/qt/ScintillaEditPy/sepbuild.py +++ b/qt/ScintillaEditPy/sepbuild.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python2 import distutils.sysconfig import getopt import glob diff --git a/qt/ScintillaEditPy/testsepq.py b/qt/ScintillaEditPy/testsepq.py index 840562a11..26b05ef0a 100644 --- a/qt/ScintillaEditPy/testsepq.py +++ b/qt/ScintillaEditPy/testsepq.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/usr/bin/env python2 # -*- coding: utf-8 -*- import sys diff --git a/test/XiteQt.py b/test/XiteQt.py index 1b3a8dfa0..d1ee5ea6b 100644 --- a/test/XiteQt.py +++ b/test/XiteQt.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python2 # -*- coding: utf-8 -*- # Requires Python 2.7 or later diff --git a/test/XiteWin.py b/test/XiteWin.py index 398c9a525..158a2a83e 100644 --- a/test/XiteWin.py +++ b/test/XiteWin.py @@ -1,5 +1,6 @@ +#!/usr/bin/env python3 # -*- coding: utf-8 -*- -# Requires Python 2.7 or later +# Requires Python 3.6 or later from __future__ import with_statement from __future__ import unicode_literals diff --git a/test/lexTests.py b/test/lexTests.py index 46e4eb4fb..eedfbe0ad 100644 --- a/test/lexTests.py +++ b/test/lexTests.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # Requires Python 2.7 or later diff --git a/test/performanceTests.py b/test/performanceTests.py index bfbae5fe9..435e0e508 100644 --- a/test/performanceTests.py +++ b/test/performanceTests.py @@ -1,4 +1,6 @@ +#!/usr/bin/env python3 # -*- coding: utf-8 -*- +# Requires Python 2.7 or later from __future__ import with_statement from __future__ import unicode_literals diff --git a/test/simpleTests.py b/test/simpleTests.py index 7b4bfcaf2..6620968ad 100644 --- a/test/simpleTests.py +++ b/test/simpleTests.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # Requires Python 2.7 or later diff --git a/test/win32Tests.py b/test/win32Tests.py index 21a89dbed..6032e8955 100644 --- a/test/win32Tests.py +++ b/test/win32Tests.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 # -*- coding: utf-8 -*- # Requires Python 2.7 or later diff --git a/test/xite.py b/test/xite.py index 399c79544..9a78dfed1 100644 --- a/test/xite.py +++ b/test/xite.py @@ -1,4 +1,6 @@ +#!/usr/bin/env python3 # -*- coding: utf-8 -*- +# Requires Python 3.6 or later import XiteWin |