X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=SConstruct;h=fba2987867ddbb67f675aec51cafdc163bcf3a9f;hb=05fab45b5f96c457d3c6b359f66ce1506c6ad510;hp=bf5b3eb28fe440bf781060fb6a25c7cabd1d49d2;hpb=e84dd6c52a07fc9e283cbd72c7616f3523920387;p=senf.git

diff --git a/SConstruct b/SConstruct
index bf5b3eb..fba2987 100644
--- a/SConstruct
+++ b/SConstruct
@@ -6,6 +6,12 @@ import SENFSCons
 
 ###########################################################################
 
+# This hack is needed for SCons V 0.96.1 compatibility. In current SCons versions
+# we can just use 'env.AlwaysBuild(env.Alias(target), [], action)'
+def PhonyTarget(env, target, action):
+    env.AlwaysBuild(env.Command(target + '.phony', 'SConstruct', env.Action(action)))
+    env.Alias(target, target + '.phony')
+
 def updateRevision(target, source, env):
     rev = env['ENV']['REVISION'][1:]
     if ':' in rev:
@@ -55,6 +61,7 @@ env = SENFSCons.MakeEnvironment()
 env.Help("""
 Additional top-level build targets:
 
+prepare      Create all source files not part of the repository
 all_tests    Build and run unit tests for all modules
 all_docs     Build documentation for all modules
 all          Build everything
@@ -85,7 +92,8 @@ env.Append(
    ENV = { 'TODAY' : str(datetime.date.today()),
            'REVISION' : rev,
            'LOGNAME' : logname, # needed by the debian build scripts
-           'CONCURRENCY_LEVEL' : env.GetOption('num_jobs') or "1"
+           'CONCURRENCY_LEVEL' : env.GetOption('num_jobs') or "1",
+           'SCONS' : 1
            },
    CONFIG_FILES = [ 'Doxyfile.local', 'SConfig', 'local_config.hh' ],
    CONFIG_FILES_OPTS = configFilesOpts,
@@ -97,8 +105,7 @@ env.Append(
 
 Export('env')
 
-# Create Doxyfile.local if not cleaning and the file does not exist
-# otherwise doxygen will barf on this non-existent file
+# Create Doxyfile.local otherwise doxygen will barf on this non-existent file
 if not env.GetOption('clean') and not os.path.exists("Doxyfile.local"):
     Execute(Touch("Doxyfile.local"))
 
@@ -109,6 +116,16 @@ if not env.GetOption('clean') and not os.path.exists("local_config.hh"):
 ###########################################################################
 # Define build targets
 
+# Before defining any targets, check wether this is the first build in
+# pristine directory tree. If so, call 'scons prepare' so the dependencies
+# created later are correct
+
+if not env.GetOption('clean') and not os.path.exists(".prepare-stamp") \
+   and not os.environ.get("SCONS"):
+    env.Execute([ "scons prepare" ])
+
+env.Clean('all', '.prepare-stamp')
+
 SConscript(glob.glob("*/SConscript"))
 
 SENFSCons.StandardTargets(env)
@@ -125,6 +142,9 @@ libsenf = env.Library(
     SENFSCons.LibPath('senf'),
     Flatten([ env.File(SENFSCons.LibPath(lib)).sources for lib in env['ALLLIBS'] ]))
 env.Default(libsenf)
+env.Clean('all', 'libsenf.a')
+env.Alias('default', 'libsenf.a')
+
 env.Alias('install_all', env.Install('$LIBINSTALLDIR', libsenf))
 
 env.Clean('all', [ os.path.join(path,f)
@@ -132,33 +152,41 @@ env.Clean('all', [ os.path.join(path,f)
                    for pattern in env['CLEAN_PATTERNS']
                    for f in fnmatch.filter(files,pattern) ])
 
-env.AlwaysBuild(env.Alias('deb', [], [
+PhonyTarget(env, 'deb', [
     checkLocalConf,
     updateRevision,
-    "$BUILDPACKAGE_COMMAND" ]))
+    "$BUILDPACKAGE_COMMAND",
+])
 
-env.AlwaysBuild(env.Alias('debsrc', [], [
+PhonyTarget(env, 'debsrc', [
     updateRevision,
-    "$BUILDPACKAGE_COMMAND -S" ]))
+    "$BUILDPACKAGE_COMMAND -S",
+])
 
-env.AlwaysBuild(env.Alias('debbin', [], [
+PhonyTarget(env, 'debbin', [
     checkLocalConf,
     updateRevision,
-    "$BUILDPACKAGE_COMMAND -nc" ]))
+    "$BUILDPACKAGE_COMMAND -nc",
+])
 
-env.AlwaysBuild(env.Alias('linklint', [], [
+PhonyTarget(env, 'linklint', [
     'rm -rf linklint',
     'linklint -doc linklint -net -limit 99999999 `find -type d -name html -printf "/%P/@ "`',
     '[ ! -r linklint/errorX.html ] || python linklint_addnames.py <linklint/errorX.html >linklint/errorX.html.new',
     '[ ! -r linklint/errorX.html.new ] || mv linklint/errorX.html.new linklint/errorX.html',
     '[ ! -r linklint/errorAX.html ] || python linklint_addnames.py <linklint/errorAX.html >linklint/errorAX.html.new',
     '[ ! -r linklint/errorAX.html.new ] || mv linklint/errorAX.html.new linklint/errorAX.html',
-    '@echo -e "\\nLokal link check results: linklint/index.html"',
-    '@echo -e "Remote link check results: linklint/urlindex.html\\n"'
-]))
+    'echo -e "\\nLokal link check results: linklint/index.html\\nRemote link check results: linklint/urlindex.html\\n"',
+])
+
+PhonyTarget(env, 'fixlinks', [
+    'python doclib/fix-links.py -v -s .svn -s linklint -s debian linklint/errorX.txt linklint/errorAX.txt',
+])
 
-env.AlwaysBuild(env.Alias('fixlinks', [ 'linklint' ], [
-    '[ ! -r linklint/errorX.txt -o ! -r linklint/errorAX.txt ] || python doclib/fix-links.py -s .svn -s linklint -s debian linklint/errorX.txt linklint/errorAX.txt',
-]))    
+PhonyTarget(env, 'prepare', [])
 
 env.Clean('all', env.Dir('linklint'))
+
+env.Clean('all','.prepare-stamp')
+if not env.GetOption('clean') and not os.path.exists(".prepare-stamp"):
+    Execute(Touch(".prepare-stamp"))