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

Global-Layer-Renaming: adapt the build system to the new layer names

Browse source 
...with one exception: I'll retain the name "gui" for the final product to be built.
This commit is contained in:
Fischlurch 2018-11-16 15:25:28 +01:00
parent 02c5809707
commit 480104b945
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/devel/rfc/LayerNames.txt
View file

@ -63,8 +63,8 @@ Tasks
// List what needs to be done to implement this Proposal: // List what needs to be done to implement this Proposal:
* find convincing new names ([green]#✔ done#) * find convincing new names ([green]#✔ done#)
* update and add documentation ([green]#✔ done#) * update and add documentation ([green]#✔ done#)
* adjust source folders and namespaces [yellow-background]#WIP# * adjust source folders and namespaces ([green]#✔ done#)
* adjust build system and library names [red yellow-background]#TBD# * adjust build system and library names ([green]#✔ done#)
* fix textual usage in code and documentation [red yellow-background]#TBD# * fix textual usage in code and documentation [red yellow-background]#TBD#

18
src/SConscript
View file

@ -11,15 +11,15 @@ Import('env icons config')
# define the source file/dirs comprising each artifact to be built. # define the source file/dirs comprising each artifact to be built.
lLib = env.SharedLibrary('lumierasupport', srcSubtree('lib'), install=True) lLib = env.SharedLibrary('lumierasupport', srcSubtree('lib'), install=True)
lApp = env.SharedLibrary('lumieracommon', srcSubtree('common'), addLibs=lLib, install=True) lApp = env.SharedLibrary('lumieracommon', srcSubtree('common'), addLibs=lLib, install=True)
lBack = env.SharedLibrary('lumierabackend', srcSubtree('backend'),addLibs=lLib+lApp, install=True) lVault = env.SharedLibrary('lumieravault', srcSubtree('vault'), addLibs=lLib+lApp, install=True)
lProc = env.SharedLibrary('lumieraproc', srcSubtree('proc'), addLibs=lLib+lApp+lBack, install=True) lSteam = env.SharedLibrary('lumierasteam', srcSubtree('steam'), addLibs=lLib+lApp+lVault,install=True)
core = lProc+lBack+lApp+lLib # in reverse dependency order core = lSteam+lVault+lApp+lLib # in reverse dependency order
support_lib = lLib support_lib = lLib
app_lib = lApp+support_lib app_lib = lApp+support_lib
backend_lib = lBack+app_lib vault_lib = lVault+app_lib
core_lib = core core_lib = core
lumiera = ( env.Program('lumiera', ['lumiera/main.cpp'] + core, install=True) lumiera = ( env.Program('lumiera', ['lumiera/main.cpp'] + core, install=True)
@ -39,11 +39,11 @@ plugins = [] # currently none
envGtk = env.Clone() envGtk = env.Clone()
envGtk.mergeConf(['gtkmm-3.0','sigc++-2.0','gthread-2.0','cairomm-1.0','gdl','xv','x11','xext','sm']) envGtk.mergeConf(['gtkmm-3.0','sigc++-2.0','gthread-2.0','cairomm-1.0','gdl','xv','x11','xext','sm'])
guimodule = envGtk.LumieraPlugin('gtk_gui', srcSubtree('gui') + core, install=True) guimodule = envGtk.LumieraPlugin('gtk_gui', srcSubtree('stage') + core, install=True)
gui = ( guimodule gui = ( guimodule
+ icons + icons
+ [env.GuiResource(f) for f in env.Glob('gui/*.css')] + [env.GuiResource(f) for f in env.Glob('stage/*.css')]
) )
Export('lumiera core core_lib app_lib backend_lib support_lib plugins envGtk guimodule gui') Export('lumiera core core_lib app_lib vault_lib support_lib plugins envGtk guimodule gui')

12
tests/SConscript
View file

@ -12,7 +12,7 @@ from Buildhelper import scanSubtree
from Buildhelper import globRootdirs from Buildhelper import globRootdirs
from Buildhelper import createPlugins from Buildhelper import createPlugins
Import('env core_lib app_lib backend_lib guimodule tools config') Import('env core_lib app_lib vault_lib guimodule tools config')
env = env.Clone() env = env.Clone()
env.Append(CPPPATH='include') # additional headers for tests env.Append(CPPPATH='include') # additional headers for tests
@ -24,10 +24,10 @@ sharedTestLibs = {}
def linkContext(id): def linkContext(id):
if id.startswith('lib'): if id.startswith('lib'):
return app_lib # tests in 'lib*' subdirs only linked against application framework return app_lib # tests in 'lib*' subdirs only linked against application framework
elif id.startswith('back'): elif id.startswith('vault'):
return backend_lib # tests in 'back*' subdirs only linked against vault layer return vault_lib # tests in 'vault*' subdirs only linked against vault layer
elif id.startswith('gui'): elif id.startswith('stage'):
return guimodule+core_lib # tests in 'gui*' are additionally linked against the GTK GUI module return guimodule+core_lib # tests in 'stage*' are additionally linked against the GTK GUI module
else: else:
return core_lib # all other tests linked against complete application core return core_lib # all other tests linked against complete application core
@ -48,7 +48,7 @@ def testCases(env,dir):
""" """
env = env.Clone() env = env.Clone()
env.Append(CPPPATH=dir) # add subdir to Includepath env.Append(CPPPATH=dir) # add subdir to Includepath
if dir.startswith('gui'): if dir.startswith('stage'):
# additional libs used from gui tests # additional libs used from gui tests
env.mergeConf(['sigc++-2.0']) env.mergeConf(['sigc++-2.0'])