benn/lumiera_
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

preliminary fix for the SCons build for Debian/testing

Browse source 
WARNING: breakes build on Debian/stable
Explanation: I tried to provide a backported implementtation of
features introduced with SCons 1.0 (until we can require SCons 1.0 officially)
Unfortionately, some internal APIs changed quite large in 0.97
Have to build in some conditional code, so it works with SCons 0.96 again)
This commit is contained in:
Fischlurch 2008-08-20 15:50:17 +01:00
parent 01fdb5e791
commit 944b7c4dd4
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
SConstruct
View file

@ -291,11 +291,11 @@ def defineBuildTargets(env, artifacts):
)
# use PCH to speed up building
precomp = ( env.PrecompiledHeader('$SRCDIR/pre')
+ env.PrecompiledHeader('$SRCDIR/pre_a')
)
env.Depends(objproc, precomp)
env.Depends(objlib, precomp)
# precomp = ( env.PrecompiledHeader('$SRCDIR/pre')
# + env.PrecompiledHeader('$SRCDIR/pre_a')
# )
# env.Depends(objproc, precomp)
# env.Depends(objlib, precomp)
artifacts['lumiera'] = env.Program('$BINDIR/lumiera', ['$SRCDIR/main.cpp']+ core )
artifacts['plugins'] = env.SharedLibrary('$BINDIR/lumiera-plugin', objplug)

20
admin/scons/LumieraEnvironment.py
View file

@ -22,7 +22,7 @@
#####################################################################
from SCons.SConf import SConf
from SCons.SConf import SConfBase
from SCons.Environment import Environment
from Buildhelper import *
@ -76,22 +76,22 @@ class LumieraEnvironment(Environment):
libInfo.ParseConfig ('pkg-config --cflags --libs '+ libID )
return libInfo
def Glob (self, pattern):
""" temporary workaround; newer versions of SCons provide this as a global function """
pattern = self.subst(pattern)
return glob.glob(pattern)
# def Glob (self, pattern):
# """ temporary workaround; newer versions of SCons provide this as a global function """
# pattern = self.subst(pattern)
# return glob.glob(pattern)
def AddMethod (self, function):
""" temporary workaround; newer versions of SCons provide this as a global function """
self.__dict__[function.__name__] = function.__get__(self)
# def AddMethod (self, function):
# """ temporary workaround; newer versions of SCons provide this as a global function """
# self.__dict__[function.__name__] = function.__get__(self)
class LumieraConfigContext(SConf):
class LumieraConfigContext(SConfBase):
""" Extends the SCons Configure context with some convenience methods
"""
def __init__(self, *args,**kw):
SConf.__init__(self,*args,**kw)
SConfBase.__init__(self,*args,**kw)
def CheckPkgConfig (self, libID, minVersion=0):
print "Checking for library configuration: %s " % libID