reorder building/installing of Icons
no need to define them together with the source. SCons is able to work out the real dependencies just fine. Thus, Icons remain in Main SConstruct
This commit is contained in:
parent
c62eccd25f
commit
25b21fe575
2 changed files with 14 additions and 10 deletions
15
SConstruct
15
SConstruct
|
|
@ -38,7 +38,7 @@ CUSTOPTFILE = 'custom-options'
|
|||
|
||||
# these are accessible via env.path.xxxx
|
||||
srcIcon = 'icons'
|
||||
srcConf = '#data/config'
|
||||
srcConf = 'data/config'
|
||||
buildExe = '#$TARGDIR'
|
||||
buildLib = '#$TARGDIR/modules'
|
||||
buildPlug = '#$TARGDIR/modules'
|
||||
|
|
@ -333,6 +333,19 @@ def defineBuildTargets(env, artifacts):
|
|||
We use a custom function to declare a whole tree of srcfiles.
|
||||
"""
|
||||
|
||||
# define Icons to render and install
|
||||
vector_icon_dir = env.subst(env.path.srcIcon+'svg')
|
||||
prerendered_icon_dir = env.subst(env.path.srcIcon+'prerendered')
|
||||
print "ICON: vector_icon_dir=%s prerendered=%s" % (vector_icon_dir,prerendered_icon_dir)
|
||||
artifacts['icons'] = ( [env.IconRender(f) for f in scanSubtree(vector_icon_dir, ['*.svg'])]
|
||||
+ [env.IconResource(f) for f in scanSubtree(prerendered_icon_dir, ['*.png'])]
|
||||
)
|
||||
|
||||
#define Configuration files to install
|
||||
artifacts['config'] = ( env.ConfigData(env.path.srcConf+'setup.ini', targetDir='$ORIGIN')
|
||||
+ env.ConfigData(env.path.srcConf+'dummy_lumiera.ini')
|
||||
)
|
||||
|
||||
# call subdir SConscript(s) for independent components
|
||||
SConscript(dirs=['src','src/tool','research','tests'], exports='env artifacts')
|
||||
|
||||
|
|
|
|||
|
|
@ -19,9 +19,6 @@ core = lLib+lApp+lBack+lProc
|
|||
|
||||
artifacts['corelib'] = core
|
||||
artifacts['support'] = lLib
|
||||
artifacts['config'] = ( env.ConfigData(env.path.srcConf+'setup.ini', targetDir='$ORIGIN')
|
||||
+ env.ConfigData(env.path.srcConf+'dummy_lumiera.ini')
|
||||
)
|
||||
artifacts['lumiera'] = ( env.Program('lumiera', ['lumiera/main.cpp'] + core, install=True)
|
||||
+ artifacts['config']
|
||||
)
|
||||
|
|
@ -29,12 +26,6 @@ artifacts['lumiera'] = ( env.Program('lumiera', ['lumiera/main.cpp'] + core, ins
|
|||
# building Lumiera Plugins
|
||||
artifacts['plugins'] = [] # currently none
|
||||
|
||||
# render and install Icons
|
||||
vector_icon_dir = env.path.srcIcon+'svg'
|
||||
prerendered_icon_dir = env.path.srcIcon+'prerendered'
|
||||
artifacts['icons'] = ( [env.IconRender(f) for f in scanSubtree(vector_icon_dir, ['*.svg'])]
|
||||
+ [env.IconResource(f) for f in scanSubtree(prerendered_icon_dir, ['*.png'])]
|
||||
)
|
||||
|
||||
# the Lumiera GTK GUI
|
||||
envGtk = env.Clone()
|
||||
|
|
|
|||
Loading…
Reference in a new issue