From 480104b94535995703df4d84c9f2bb72f96835b3 Mon Sep 17 00:00:00 2001 From: Ichthyostega Date: Fri, 16 Nov 2018 15:25:28 +0100 Subject: [PATCH] Global-Layer-Renaming: adapt the build system to the new layer names ...with one exception: I'll retain the name "gui" for the final product to be built. --- doc/devel/rfc/LayerNames.txt | 4 ++-- src/SConscript | 18 +++++++++--------- tests/SConscript | 12 ++++++------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/doc/devel/rfc/LayerNames.txt b/doc/devel/rfc/LayerNames.txt index 5d36f9fa0..f9eb683d0 100644 --- a/doc/devel/rfc/LayerNames.txt +++ b/doc/devel/rfc/LayerNames.txt @@ -63,8 +63,8 @@ Tasks // List what needs to be done to implement this Proposal: * find convincing new names ([green]#✔ done#) * update and add documentation ([green]#✔ done#) - * adjust source folders and namespaces [yellow-background]#WIP# - * adjust build system and library names [red yellow-background]#TBD# + * adjust source folders and namespaces ([green]#✔ done#) + * adjust build system and library names ([green]#✔ done#) * fix textual usage in code and documentation [red yellow-background]#TBD# diff --git a/src/SConscript b/src/SConscript index 34cccabb0..c79759161 100644 --- a/src/SConscript +++ b/src/SConscript @@ -11,15 +11,15 @@ Import('env icons config') # define the source file/dirs comprising each artifact to be built. -lLib = env.SharedLibrary('lumierasupport', srcSubtree('lib'), install=True) -lApp = env.SharedLibrary('lumieracommon', srcSubtree('common'), addLibs=lLib, install=True) -lBack = env.SharedLibrary('lumierabackend', srcSubtree('backend'),addLibs=lLib+lApp, install=True) -lProc = env.SharedLibrary('lumieraproc', srcSubtree('proc'), addLibs=lLib+lApp+lBack, install=True) +lLib = env.SharedLibrary('lumierasupport', srcSubtree('lib'), install=True) +lApp = env.SharedLibrary('lumieracommon', srcSubtree('common'), addLibs=lLib, install=True) +lVault = env.SharedLibrary('lumieravault', srcSubtree('vault'), addLibs=lLib+lApp, 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 app_lib = lApp+support_lib -backend_lib = lBack+app_lib +vault_lib = lVault+app_lib core_lib = core lumiera = ( env.Program('lumiera', ['lumiera/main.cpp'] + core, install=True) @@ -39,11 +39,11 @@ plugins = [] # currently none envGtk = env.Clone() 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 + 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') diff --git a/tests/SConscript b/tests/SConscript index 26247a145..43596dab4 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -12,7 +12,7 @@ from Buildhelper import scanSubtree from Buildhelper import globRootdirs 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.Append(CPPPATH='include') # additional headers for tests @@ -24,10 +24,10 @@ sharedTestLibs = {} def linkContext(id): if id.startswith('lib'): return app_lib # tests in 'lib*' subdirs only linked against application framework - elif id.startswith('back'): - return backend_lib # tests in 'back*' subdirs only linked against vault layer - elif id.startswith('gui'): - return guimodule+core_lib # tests in 'gui*' are additionally linked against the GTK GUI module + elif id.startswith('vault'): + return vault_lib # tests in 'vault*' subdirs only linked against vault layer + elif id.startswith('stage'): + return guimodule+core_lib # tests in 'stage*' are additionally linked against the GTK GUI module else: return core_lib # all other tests linked against complete application core @@ -48,7 +48,7 @@ def testCases(env,dir): """ env = env.Clone() env.Append(CPPPATH=dir) # add subdir to Includepath - if dir.startswith('gui'): + if dir.startswith('stage'): # additional libs used from gui tests env.mergeConf(['sigc++-2.0'])