X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=SConstruct;h=50a148e4d5da3b2e182f262523562792504b9636;hb=81ffa1c459b96dd44472bcef37e1e373934ee138;hp=87c1bebe7661de6994fbb8d2c7efe03bdc25c3d1;hpb=15c5e1939d77dfea97da38df7526bcb84a53460b;p=senf.git

diff --git a/SConstruct b/SConstruct
index 87c1beb..50a148e 100644
--- a/SConstruct
+++ b/SConstruct
@@ -6,36 +6,36 @@ import SENFSCons
 
 ###########################################################################
 
-svninfo = dict(
-    [ map(lambda y:y.strip(),x.split(":",1))
-      for x in os.popen("svn info").read().split("\n")
-      if ':' in x ] )
-svninfo['commited'] = not(os.popen("svn status -q").read())
-
+# Load utilities and setup libraries
 SENFSCons.UseBoost()
 SENFSCons.UseSTLPort()
 env = SENFSCons.MakeEnvironment()
 
+# Configure build
 env.Append(
    CPPPATH = [ '#' ],
-   LIBS = [ 'iberty' ],
+   LIBS = [ 'iberty', '$BOOSTREGEXLIB' ],
    DOXY_XREF_TYPES = [ 'bug', 'fixme', 'todo', 'idea' ],
    DOXY_HTML_XSL = '#/doclib/html-munge.xsl',
    ENV = { 'TODAY' : str(datetime.date.today()),
-           'REVISION' : svninfo['Revision'] + (not(svninfo['commited']) and " + local changes" or ""),
+           'REVISION' : os.popen("svnversion").read().strip()
            },
 )
 
 Export('env')
 
+# Build modules (that is, instruct to build ... the build happens later)
 SConscript(glob.glob("*/SConscript"))
 
 SENFSCons.StandardTargets(env)
 SENFSCons.GlobalTargets(env)
 SENFSCons.Doxygen(env)
-SENFSCons.DoxyXRef(env, 
+
+SENFSCons.DoxyXRef(env,
                    HTML_HEADER = '#/doclib/doxy-header-overview.html',
                    HTML_FOOTER = '#/doclib/doxy-footer.html')
 
+# Create Doxyfile.local if not cleaning and the file does not exist
+# 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"))