idolpx/fsp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sync site_scons with fspclient

Browse Source
This commit is contained in:
Radim Kolar 2019-08-16 13:52:24 +02:00
parent 365c55c865
commit 48d102ffa7
4 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
site_scons/clangtest.py
View File

@ -1,8 +1,8 @@
# #
# SCons C language related tests # SCons C language related tests
# #
# Version 1.2 # Version 1.3
# 24-Aug-2009 # 16-Aug-2019
# #
def checkForVariable(conf,variable,include): def checkForVariable(conf,variable,include):
@ -34,7 +34,7 @@ main ()
} }
""" % (var,var),'.c') """ % (var,var),'.c')
if rc: if rc:
rc,result = conf.TryRun(''' rc,result = conf.TryRun('''
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
@ -43,7 +43,7 @@ main ()
printf("%%d",sizeof(%s)); printf("%%d",sizeof(%s));
return 0; return 0;
}''' % var,'.c') }''' % var,'.c')
if rc: if rc:
rc=result rc=result
conf.Result(rc) conf.Result(rc)
return rc return rc

10
site_scons/gzipBuilder.py
View File

@ -1,8 +1,8 @@
# #
# GZip SCons builder # GZip SCons builder
# #
# Version 1.0 # Version 1.1
# 16-Jun-2009 # 16-Aug-2019
# #
def GZip(target, source, env=None): def GZip(target, source, env=None):
@ -19,14 +19,14 @@ def GZip(target, source, env=None):
""" """
import gzip import gzip
if not isinstance(target, list): if not isinstance(target, list):
raise TypeError,"target must be list" raise TypeError("target must be list")
elif not isinstance(source, list): elif not isinstance(source, list):
raise TypeError,"source must be list" raise TypeError("source must be list")
for i in range(0,len(target)): for i in range(0,len(target)):
inpf=str(source[i]) inpf=str(source[i])
outf=str(target[i]) outf=str(target[i])
out=gzip.open(outf,"wb") out=gzip.open(outf,"wb")
inp=file(inpf,"rb") inp=open(inpf,"rb")
out.write(inp.read()) out.write(inp.read())
out.close() out.close()
inp.close() inp.close()

18
site_scons/importer.py
View File

@ -1,8 +1,8 @@
# #
# Scons variable importer # Scons variable importer
# #
# Version 1.0 # Version 1.1
# 16-Jun-2009 # 16-Aug-2019
# #
import os import os
@ -73,23 +73,23 @@ def _importcore(env,varlist,targets,prefix,setter):
if isinstance(varlist, str): if isinstance(varlist, str):
varlist=[varlist] varlist=[varlist]
else: else:
raise TypeError,"varlist must be list or string" raise TypeError("varlist must be list or string")
if targets: if targets:
if not isinstance(targets, list): if not isinstance(targets, list):
if isinstance(targets, str): if isinstance(targets, str):
targets=[targets] targets=[targets]
else: else:
raise TypeError,"targets must be list of string" raise TypeError("targets must be list of string")
for i in range(0,len(varlist)): for i in range(0,len(varlist)):
value=os.environ.get(varlist[i]) value=os.environ.get(varlist[i])
if value: if value:
if targets: if targets:
setter(*[env,targets[i],value]) setter(*[env,targets[i],value])
else: else:
setter(*[env,varlist[i],value]) setter(*[env,varlist[i],value])
if prefix: if prefix:
if not isinstance(prefix, str): if not isinstance(prefix, str):
raise TypeError,"prefix must be string" raise TypeError("prefix must be string")
for i in os.environ.keys(): for i in os.environ.keys():
if i.startswith(prefix): if i.startswith(prefix):
setter(*[env,i,os.environ.get(i)]) setter(*[env,i,os.environ.get(i)])

6
site_scons/maintainer.py
View File

@ -1,8 +1,8 @@
# #
# SCons check for maintainer mode # SCons check for maintainer mode
# #
# Version 1.4 # Version 1.5
# 15-Aug-2019 # 16-Aug-2019
# #
from SCons.Script import ARGUMENTS from SCons.Script import ARGUMENTS
@ -17,7 +17,7 @@ def checkForMaintainerMode(conf,force=False):
try: try:
maint2=int(maint) maint2=int(maint)
except ValueError: except ValueError:
maint2=None maint2=0
if force: maint2 = 1 if force: maint2 = 1
if maint2 > 0 or str(maint).lower() == 'yes': if maint2 > 0 or str(maint).lower() == 'yes':
conf.Result(1) conf.Result(1)