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

SCons: build loadable modules immediately to the target destination

Browse source
This commit is contained in:
Fischlurch 2011-01-29 02:33:13 +01:00
parent 35953b335b
commit 2bcc8d9ae3
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
SConstruct
View file

@ -27,8 +27,8 @@ OPTIONSCACHEFILE = 'optcache'
CUSTOPTIONSFILE = 'custom-options' CUSTOPTIONSFILE = 'custom-options'
SRCDIR = 'src' SRCDIR = 'src'
TARDIR = 'target' TARDIR = 'target'
LIBDIR = 'modules' LIBDIR = 'target/modules'
PLUGDIR = 'modules' MODULES = 'modules'
TESTDIR = 'tests' TESTDIR = 'tests'
ICONDIR = 'icons' ICONDIR = 'icons'
VERSION = '0.1+pre.01' VERSION = '0.1+pre.01'
@ -78,7 +78,7 @@ def setupBasicEnvironment():
, SRCDIR=SRCDIR , SRCDIR=SRCDIR
, TARDIR=TARDIR , TARDIR=TARDIR
, LIBDIR=LIBDIR , LIBDIR=LIBDIR
, PLUGDIR=PLUGDIR , MODULES=MODULES
, ICONDIR=ICONDIR , ICONDIR=ICONDIR
, CPPPATH=["#"+SRCDIR] # used to find includes, "#" means always absolute to build-root , CPPPATH=["#"+SRCDIR] # used to find includes, "#" means always absolute to build-root
, CPPDEFINES=['-DLUMIERA_VERSION='+VERSION ] # note: it's a list to append further defines , CPPDEFINES=['-DLUMIERA_VERSION='+VERSION ] # note: it's a list to append further defines
@ -96,8 +96,8 @@ def setupBasicEnvironment():
appendVal(env,'DEBUG', 'CCFLAGS', val=' -ggdb') appendVal(env,'DEBUG', 'CCFLAGS', val=' -ggdb')
# setup search path for Lumiera plugins # setup search path for Lumiera plugins
appendCppDefine(env,'PKGLIBDIR','LUMIERA_PLUGIN_PATH=\\"$PKGLIBDIR/:./modules\\"' appendCppDefine(env,'PKGLIBDIR','LUMIERA_PLUGIN_PATH=\\"$PKGLIBDIR/:./$MODULES\\"'
,'LUMIERA_PLUGIN_PATH=\\"$DESTDIR/lib/lumiera/:./modules\\"') ,'LUMIERA_PLUGIN_PATH=\\"$DESTDIR/lib/lumiera/:./$MODULES\\"')
appendCppDefine(env,'PKGDATADIR','LUMIERA_CONFIG_PATH=\\"$PKGLIBDIR/:.\\"' appendCppDefine(env,'PKGDATADIR','LUMIERA_CONFIG_PATH=\\"$PKGLIBDIR/:.\\"'
,'LUMIERA_CONFIG_PATH=\\"$DESTDIR/share/lumiera/:.\\"') ,'LUMIERA_CONFIG_PATH=\\"$DESTDIR/share/lumiera/:.\\"')

2
admin/scons/LumieraEnvironment.py
View file

@ -119,7 +119,7 @@ class LumieraEnvironment(Environment):
it is linked with it is linked with
""" """
subEnv = self.Clone() subEnv = self.Clone()
subEnv.Append( LINKFLAGS = "-Wl,-rpath=\\$$ORIGIN/$LIBDIR,--enable-new-dtags" ) subEnv.Append( LINKFLAGS = "-Wl,-rpath=\\$$ORIGIN/$MODULES,--enable-new-dtags" )
programBuilder = self.get_builder('Program') programBuilder = self.get_builder('Program')
return programBuilder (subEnv, *args,**kw); return programBuilder (subEnv, *args,**kw);

1
modules
View file

@ -1 +0,0 @@
target/modules