Fix installation triggered already by build target

This commit is contained in:
Fischlurch 2011-01-30 19:43:51 +01:00
parent daef6c7676
commit 9cb03c7015
3 changed files with 10 additions and 10 deletions

View file

@ -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'
@ -405,6 +400,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')
#####################################################################

View file

@ -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)
self.installTarget(customisedEnv, buildTarget, **kw)
return buildTarget
def invokeOriginalBuilder(self, env, target, source, **kw):

View file

@ -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