ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCons: now require either a custom 'gdl-lum' or GDL >= 2.27.1

Browse source
This commit is contained in:
Fischlurch 2009-04-20 01:58:34 +02:00
parent 647ea9797e
commit 34d0c6905e
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
SConstruct
View file

@ -263,8 +263,12 @@ def configurePlatform(env):
if not conf.CheckPkgConfig('cairomm-1.0', 0.6):
problems.append('Unable to configure Cairo--, exiting.')
if not conf.CheckPkgConfig('gdl-1.0', '0.6.1'):
problems.append('Unable to configure the GNOME DevTool Library.')
verGDL = '2.27.1'
if not conf.CheckPkgConfig('gdl-lum', verGDL, alias='gdl'):
print 'Custom package "gdl-lum" not found. Trying official GDL release >=%s...' % verGDL
if not conf.CheckPkgConfig('gdl-1.0', verGDL, alias='gdl'):
problems.append('GNOME Docking Library not found. We either need a very recent GDL '
'version (>=%s), or the custom package "gdl-lum".' % verGDL)
if not conf.CheckPkgConfig('librsvg-2.0', '2.18.1'):
problems.append('Need rsvg Library for rendering icons.')
@ -351,7 +355,7 @@ def defineBuildTargets(env, artifacts):
# the Lumiera GTK GUI
envGtk = env.Clone()
envGtk.mergeConf(['gtkmm-2.4','cairomm-1.0','gdl-1.0','xv','xext','sm'])
envGtk.mergeConf(['gtkmm-2.4','cairomm-1.0','gdl','xv','xext','sm'])
envGtk.Append(CPPDEFINES='LUMIERA_PLUGIN', LIBS=core)
objgui = srcSubtree(envGtk,'$SRCDIR/gui')

10
admin/scons/LumieraEnvironment.py
View file

@ -63,7 +63,7 @@ class LumieraEnvironment(Environment):
return self
def addLibInfo (self, libID, minVersion=0):
def addLibInfo (self, libID, minVersion=0, alias=None):
""" use pkg-config to create an Environment describing the lib.
Don't add this defs to the current Environment, rather store
them in the libInfo Dictionary.
@ -73,8 +73,10 @@ class LumieraEnvironment(Environment):
print "Problems configuring the Library %s (>= %s)" % (libID,minVersion)
return False
self.libInfo[libID] = libInfo = LumieraEnvironment()
self.libInfo[libID] = libInfo = LumieraEnvironment()
libInfo.ParseConfig ('pkg-config --cflags --libs '+ libID )
if alias:
self.libInfo[alias] = libInfo
return libInfo
def Glob (self, pattern):
@ -107,9 +109,9 @@ class LumieraConfigContext(ConfigBase):
def __init__(self, *args,**kw):
ConfigBase.__init__(self,*args,**kw)
def CheckPkgConfig (self, libID, minVersion=0):
def CheckPkgConfig (self, libID, minVersion=0, alias=None):
print "Checking for library configuration: %s " % libID
# self.Message(self,"Checking for library configuration: %s " % libID)
return self.env.addLibInfo (libID, minVersion)
return self.env.addLibInfo (libID, minVersion, alias)