diff --git a/SConstruct b/SConstruct index ae291d2d3..95797748d 100644 --- a/SConstruct +++ b/SConstruct @@ -377,11 +377,6 @@ def definePostBuildTargets(env, artifacts): """ define further actions after the core build (e.g. Documentaion). define alias targets to trigger the installing. """ - ib = env.Alias('install-bin', '$DESTDIR/bin') - il = env.Alias('install-lib', '$DESTDIR/lib') - id = env.Alias('install-dat', '$DESTDIR/share') - env.Alias('install', [ib, il, id]) - build = env.Alias('build', artifacts['lumiera']+artifacts['gui']+artifacts['plugins']+artifacts['tools']) env.Default('build') # additional files to be cleaned when cleaning 'build' @@ -404,6 +399,8 @@ def defineInstallTargets(env, artifacts): env.Install(dir = env.path.installConf, source=env.path.srcConf+'dummy_lumiera.ini') ### TODO should become a resource builder # env.Install(dir = '$DESTDIR/share/doc/lumiera$VERSION/devel', source=artifacts['doxydoc']) + + env.Alias('install', '$DESTDIR') ##################################################################### diff --git a/admin/scons/LumieraEnvironment.py b/admin/scons/LumieraEnvironment.py index c4bf30172..12f5dbcc7 100644 --- a/admin/scons/LumieraEnvironment.py +++ b/admin/scons/LumieraEnvironment.py @@ -187,12 +187,15 @@ class WrappedStandardExeBuilder(SCons.Util.Proxy): def __call__(self, env, target=None, source=None, **kw): """ when the builder gets invoked from the SConscript... create a clone environment for specific configuration - and then pass on the call to the wrapped original builder + and then pass on the call to the wrapped original builder. + Automatically define installation targets for build results. + @note only returning the build targets, not the install targets """ customisedEnv = self.getCustomEnvironment(env, target=target, **kw) # defined in subclasses buildTarget = self.buildLocation(customisedEnv, target) - buildTarget = self.invokeOriginalBuilder (customisedEnv, buildTarget, source, **kw) - return buildTarget + self.installTarget(customisedEnv, buildTarget, **kw) + buildTarget = self.invokeOriginalBuilder (customisedEnv, buildTarget, source, **kw) + self.installTarget(customisedEnv, buildTarget, **kw) + return buildTarget def invokeOriginalBuilder(self, env, target, source, **kw): diff --git a/tests/SConscript b/tests/SConscript index ac00d1f13..cc6078878 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -23,8 +23,8 @@ envPlu.Append(CPPPATH='#/.') def testExecutable(env,tree, exeName=None, obj=None): """ declare all targets needed to create a standalone - Test executable of the given Sub-tree. Note that - each subdir is built in its own Environment. + Test executable of the given Sub-tree. + @note this tree uses separate Environment/Includepath """ env = env.Clone() env.Append(CPPPATH=tree) # add Subdir to Includepath