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

SCons: set LUMIERA_PLUGIN_PATH, add option PKGLIBDIR

Browse source
This commit is contained in:
Fischlurch 2008-11-07 01:54:39 +01:00
parent 8ffbc29b29
commit 18b750d86b
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
SConstruct
View file

@ -84,6 +84,10 @@ def setupBasicEnvironment():
appendVal(env,'OPTIMIZE', 'CCFLAGS', val=' -O3') appendVal(env,'OPTIMIZE', 'CCFLAGS', val=' -O3')
appendVal(env,'DEBUG', 'CCFLAGS', val=' -ggdb') appendVal(env,'DEBUG', 'CCFLAGS', val=' -ggdb')
# setup search path for Lumiera plugins
appendCppDefine(env,'PKGLIBDIR','LUMIERA_PLUGIN_PATH=\\"$PKGLIBDIR\\"'
,'LUMIERA_PLUGIN_PATH=\\"$DESTDIR/lib/lumiera\\"')
prepareOptionsHelp(opts,env) prepareOptionsHelp(opts,env)
opts.Save(OPTIONSCACHEFILE, env) opts.Save(OPTIONSCACHEFILE, env)
return env return env
@ -144,6 +148,7 @@ def defineCmdlineOptions():
# ,EnumOption('DIST_TARGET', 'Build target architecture', 'auto', # ,EnumOption('DIST_TARGET', 'Build target architecture', 'auto',
# allowed_values=('auto', 'i386', 'i686', 'x86_64' ), ignorecase=2) # allowed_values=('auto', 'i386', 'i686', 'x86_64' ), ignorecase=2)
,PathOption('DESTDIR', 'Installation dir prefix', '/usr/local') ,PathOption('DESTDIR', 'Installation dir prefix', '/usr/local')
,PathOption('PKGLIBDIR', 'Installation dir for plugins, defaults to DESTDIR/lib/lumiera', '',PathOption.PathAccept)
,PathOption('SRCTAR', 'Create source tarball prior to compiling', '..', PathOption.PathAccept) ,PathOption('SRCTAR', 'Create source tarball prior to compiling', '..', PathOption.PathAccept)
,PathOption('DOCTAR', 'Create tarball with dev documentaionl', '..', PathOption.PathAccept) ,PathOption('DOCTAR', 'Create tarball with dev documentaionl', '..', PathOption.PathAccept)
) )

7
tests/SConscript
View file

@ -48,14 +48,13 @@ def treatPluginTestcase(env):
""" """
tree = 'backend' tree = 'backend'
env = env.Clone() env = env.Clone()
env.Append(CPPPATH=tree) env.Append(CPPPATH=tree, CPPDEFINES='LUMIERA_PLUGIN')
prfx = path.join(tree,'example_plugin') prfx = path.join(tree,'example_plugin')
oC = env.SharedObject(prfx, prfx+'.c') oC = env.SharedObject(prfx, prfx+'.c')
oCPP = env.SharedObject(prfx+'_cpp', prfx+'.cpp') oCPP = env.SharedObject(prfx+'_cpp', prfx+'.cpp')
testplugin = ( env.LoadableModule('#$BINDIR/.libs/examplepluginc', oC, SHLIBPREFIX='') testplugin = ( env.LoadableModule('#$BINDIR/.libs/examplepluginc', oC, SHLIBPREFIX='')
# + env.SharedLibrary('#$BINDIR/.libs/exampleplugincpp', oCPP, SHLIBPREFIX='')
# doesn't compile yet... # doesn't compile yet...
# + env.SharedLibrary('#$BINDIR/.libs/exampleplugincpp', oCPP, SHLIBPREFIX='')
) )
return testplugin return testplugin