Fix non-subversion build from debian source package

[senf.git] / SConstruct

diff --git a/SConstruct b/SConstruct
index b3a6a52..da35a8d 100644 (file)
--- a/SConstruct
+++ b/SConstruct
@@ -11,6 +11,23 @@ SENFSCons.UseBoost()
 SENFSCons.UseSTLPort()
 env = SENFSCons.MakeEnvironment()
 
+env.Help("""
+Additional top-level build targets:
+
+all_tests    Build and run unit tests for all modules
+all_docs     Build documentation for all modules
+all          Build everything
+install_all  Install SENF into $PREFIX
+deb          Build debian source and binary package
+debsrc       Build debian source package
+debbin       Build debian binary package
+""")
+
+if os.environ.get('debian_build'):
+    rev = os.popen("dpkg-parsechangelog | awk '/^Version:/{print $2}'").read().strip()
+else:
+    rev = 'r' + os.popen("svnversion").read().strip().lower()
+
 # Configure build
 env.Append(
    CPPPATH = [ '#' ],
@@ -18,8 +35,8 @@ env.Append(
    DOXY_XREF_TYPES = [ 'bug', 'fixme', 'todo', 'idea' ],
    DOXY_HTML_XSL = '#/doclib/html-munge.xsl',
    ENV = { 'TODAY' : str(datetime.date.today()),
-           'REVISION' : os.popen("svnversion").read().strip(),
-           'LOGNAME' : os.environ['LOGNAME']
+           'REVISION' : rev,
+           'LOGNAME' : os.environ['LOGNAME'] # needed by the debian build scripts
            },
 )
 
@@ -37,18 +54,20 @@ SENFSCons.DoxyXRef(env,
                    HTML_FOOTER = '#/doclib/doxy-footer.html')
 
 def updateRevision(target, source, env):
-    rev = env['ENV']['REVISION']
+    rev = env['ENV']['REVISION'][1:]
     if ':' in rev:
         print
         print "Working copy not clean. Run 'svn update'"
         print
         return 1
-    if 'M' in rev:
+    if 'm' in rev and not ARGUMENTS.get('force_deb'):
         print
         print "Working copy contains local changes. Commit first"
         print
         return 1
-    if 'S' in rev or 'M' in rev:
+    if 's' in rev:
+        rev = rev[:-1]
+    if 'm' in rev:
         rev = rev[:-1]
     changelog = file('debian/changelog.template').read() % {
         'rev': rev,
@@ -56,9 +75,18 @@ def updateRevision(target, source, env):
         'date': time.strftime("%a, %d %b %Y %H:%M:%S +0000", time.gmtime()) }
     file('debian/changelog','w').write(changelog)
 
-env.AlwaysBuild(
-    env.Alias('deb', [], [ updateRevision,
-                           "dpkg-buildpackage -us -uc -rfakeroot" ]))
+if not os.environ.get('debian_build'):
+    env.AlwaysBuild(
+        env.Alias('deb', [], [ updateRevision,
+                               "dpkg-buildpackage -us -uc -rfakeroot -I.svn" ]))
+
+    env.AlwaysBuild(
+        env.Alias('debsrc', [], [ updateRevision,
+                                  "dpkg-buildpackage -us -uc -rfakeroot -S -I.svn" ]))
+
+    env.AlwaysBuild(
+        env.Alias('debbin', [], [ updateRevision,
+                                  "dpkg-buildpackage -us -uc -rfakeroot -nc" ]))
 
 # Create Doxyfile.local if not cleaning and the file does not exist
 # otherwise doxygen will barf on this non-existent file