From 365c55c865d727914252ecfd1ae61820f0a1cc1c Mon Sep 17 00:00:00 2001 From: Radim Kolar Date: Fri, 16 Aug 2019 08:37:25 +0200 Subject: [PATCH] merge site_scons scripts from fsplib to be Python3 compatible --- site_scons/lockprefix.py | 10 +++++----- site_scons/maintainer.py | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/site_scons/lockprefix.py b/site_scons/lockprefix.py index 8119e65..427dfa3 100644 --- a/site_scons/lockprefix.py +++ b/site_scons/lockprefix.py @@ -1,8 +1,8 @@ # # SCons user-supplied FSP lock prefix tester # -# Version 1.1 -# 24-Aug-2009 +# Version 1.2 +# 15-Aug-2019 # from SCons.Script import ARGUMENTS @@ -13,7 +13,7 @@ def checkForLockPrefix(conf): lp = ARGUMENTS.get('lockprefix', 0) or ARGUMENTS.get("with-lockprefix",0) if lp: - conf.Result(1) - conf.env.Append(CPPFLAGS = '-DFSP_KEY_PREFIX=\\"'+lp+'\\"') + conf.Result(1) + conf.env.Append(CPPFLAGS = '-DFSP_KEY_PREFIX=\\"'+lp+'\\"') else: - conf.Result(0) + conf.Result(0) diff --git a/site_scons/maintainer.py b/site_scons/maintainer.py index a10b3f0..75a8974 100644 --- a/site_scons/maintainer.py +++ b/site_scons/maintainer.py @@ -1,8 +1,8 @@ # # SCons check for maintainer mode # -# Version 1.3 -# 13-Sep-2009 +# Version 1.4 +# 15-Aug-2019 # from SCons.Script import ARGUMENTS @@ -20,10 +20,10 @@ def checkForMaintainerMode(conf,force=False): maint2=None if force: maint2 = 1 if maint2 > 0 or str(maint).lower() == 'yes': - conf.Result(1) - conf.env.Append(CCFLAGS = '-O0') - conf.env.Append(CPPFLAGS = '-DMAINTAINER_MODE') + conf.Result(1) + conf.env.Append(CCFLAGS = '-O0') + conf.env.Append(CPPFLAGS = '-DMAINTAINER_MODE') return True else: - conf.Result(0) + conf.Result(0) return False