Merge lp:~daniel.bueltmann/openwns-sdk/sconsenvironinfo into lp:openwns-sdk

[Daniel Bültmann]

Made SConstruct more aware of linux distribution specifics, especially made it work on Ubuntu lucid

[lp:~daniel.bueltmann/openwns-sdk/sconsenvironinfo]

175. By Daniel Bültmann <dbn@drjekyll> on 2010-06-30

Renamed include dir to .include in SConstruct for better compatability with KDevelop4

176. By Daniel Bültmann <dbn@drjekyll> on 2010-06-30

setupKDevelop.py now support KDevelop4

[Karsten Klagges (karsten.klagges)]

review: Approve

[Maciej Muehleisen (mue-comnets)]

Works under Hardy. Might require "scons -c" and deleting .scon* in root dir.

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2009-07-24 13:12:35 +0000
+++ .bzrignore	2010-06-30 08:25:44 +0000
@@ -40,7 +40,7 @@
 .build
 .createManualsWorkingDir
 config/projects.py
-include
+.include
 ./Doxyfile
 ./WNS.kdevelop
 ./WNS.kdevelop.filelist
@@ -50,3 +50,7 @@
 config.log
 .sconf_temp
 tags
+.kdev4
+./Makefile
+./.kdev_include_paths
+*.kdev4

=== modified file 'SConstruct'
--- SConstruct	2010-05-12 14:09:47 +0000
+++ SConstruct	2010-06-30 08:25:44 +0000
@@ -1,6 +1,64 @@
 import os
 import sys
 import wnsbase.playground.Project
+import subprocess
+
+class EnvInfo:
+    def __init__(self):
+        self.lsb = {}
+        self.python = {}
+
+        try:
+            f = open('/etc/lsb-release')
+            c = f.read()
+            f.close()
+            c = c.split("\n")
+            for l in c:
+                if len(l.lstrip()) == 0:
+                    continue
+                k,v = l.split("=")
+                self.lsb[k] = v
+
+        except IOError:
+            print
+            print "WARNING Cannot acces /etc/lsb-release. Unknown distribution. Trying fallback."
+            print
+            self.lsb["DISTRIB_ID"]="Unknown"
+
+        try:
+            output = subprocess.Popen(["python", "-V"], stderr=subprocess.PIPE).communicate()[1]
+            output = output.split()
+            version = output[1].split(".")
+            self.python["version_major"] = "%s.%s" % (version[0], version[1])
+            self.python["version_minor"] = "%s" % (version[2])
+        except OSError:
+            print
+            print "Error!!! Cannot find python command"
+            print
+            exit(1)
+
+        guess_python_config = "python-config"
+
+        if self.lsb["DISTRIB_ID"] == "Ubuntu" and self.lsb["DISTRIB_CODENAME"] == 'lucid':
+            guess_python_config = "python2.6-config"
+
+        try:
+            output = subprocess.Popen([guess_python_config, "--includes"], stderr=subprocess.PIPE).communicate()[1]
+            output = subprocess.Popen([guess_python_config, "--libs"], stderr=subprocess.PIPE).communicate()[1]
+        except OSError: 
+            print
+            print "ERROR!!! Cannot find python-config or python2.6-config which is needed to find correct Python paths"
+            print
+            sys.exit(1)
+
+        self.pythonConfigCmd = guess_python_config
+
+    def dump(self):
+        print self.lsb
+        print self.python
+
+
+envInfo = EnvInfo()
 
 sys.path.append('config')
 import projects
@@ -147,7 +205,7 @@
     CXX = ARGUMENTS.get('CXX')
 
 allHeaders = []
-includeDir = os.path.join(os.getcwd(),'include')
+includeDir = os.path.join(os.getcwd(),'.include')
 libraries = []
 for project in projects.all:
     if isinstance(project, (wnsbase.playground.Project.Root, wnsbase.playground.Project.SystemTest, wnsbase.playground.Project.Generic)):
@@ -179,15 +237,18 @@
 pyConfigDirs = []
 
 for env in environments:
-    env.Append(CPPPATH = ['#include'])
+    env.Append(CPPPATH = ['#.include'])
     env.Append(LIBPATH = os.path.join(env['sandboxDir'], env.flavour, 'lib'))
-    env.ParseConfig("python-config --includes")
+
+    env.ParseConfig(envInfo.pythonConfigCmd + " --includes")
+
     env.Replace(CXX = CXX)
     env.installDir = os.path.join(env['sandboxDir'], env.flavour)
     env.includeDir = includeDir
+    print env
     env['libraries'] = libraries
     env['externalLIBS'] = externalLIBS
-    pylibs = env.ParseFlags(env.backtick('python-config --libs'))
+    pylibs = env.ParseFlags(env.backtick(envInfo.pythonConfigCmd + ' --libs'))
     env['externalLIBS'] += pylibs['LIBS']
     if env['cacheDir']:
         env.CacheDir(env['cacheDir'])

=== modified file 'bin/setupKDevelop.py'
--- bin/setupKDevelop.py	2010-01-09 18:36:57 +0000
+++ bin/setupKDevelop.py	2010-06-30 08:25:44 +0000
@@ -154,7 +154,91 @@
 	projectFile = os.path.join(pathToSDK, "WNS.kdevses")
 	shutil.copy (template, projectFile)
 
-setupFileList()
-setupProjectFile()
-setupDevsesFile()
+def setupKDevelop4():
+    projfile = """
+[Project]
+Manager=KDevCustomMakeManager
+Name=openwns
+"""
+    makefile = """
+dbg:
+\tscons dbg
+
+opt:
+\tscons opt
+
+clean:
+\tscons clean
+"""
+
+    builderconf = """
+[Buildset]
+BuildItems=@Variant(\x00\x00\x00\t\x00\x00\x00\x00\x01\x00\x00\x00\x0b\x00\x00\x00\x00\x01\x00\x00\x00\x16\x00o\x00p\x00e\x00n\x00w\x00n\x00s\x00-\x00s\x00d\x00k)
+
+[MakeBuilder]
+Default Target=dbg
+Number Of Jobs=1
+"""
+
+    p = searchPathToSDK("./")
+
+    includepaths = """
+%s
+""" % (str(os.path.join(p, ".include")))
+
+    projfilename = os.path.join(p, "openwns.kdev4")
+    makefilefilename = os.path.join(p, "Makefile")
+    confdir = os.path.join(p, ".kdev4")
+    conffilename = os.path.join(confdir, "openwns.kdev4")
+    includepathfilename = os.path.join(p, ".kdev_include_paths")
+
+    f = open(projfilename, "w")
+    f.write(projfile)
+    f.close()
+
+    f = open(makefilefilename, "w")
+    f.write(makefile)
+    f.close()
+
+    try:
+        os.mkdir(confdir)
+    except OSError, e:
+        if not(e.errno == 17):
+            # Not path exists
+            raise e
+
+    f = open(conffilename, "w")
+    f.write(builderconf)
+    f.close()
+
+    f = open(includepathfilename, "w")
+    f.write(includepaths)
+    f.close()
+
+def getKDevelopVersion():
+    import subprocess
+    output = subprocess.Popen(["kdevelop", "--version"], stdout=subprocess.PIPE).communicate()[0]
+    found = None
+    for l in output.split("\n"):
+        fields = l.split(":")
+        if fields[0] == "KDevelop":
+            found = fields[1].lstrip().rstrip().split(".")
+
+    return found
+
+if __name__ == "__main__":
+
+    kdevVersion = getKDevelopVersion()
+    if kdevVersion == None:
+        print "ERROR!! I cannot find your kdevelop installation. Stopping."
+        sys.exit(1)
+    elif kdevVersion[0] == "3":
+        print "Found KDevelop3"
+
+        setupFileList()
+        setupProjectFile()
+        setupDevsesFile()
+
+    elif kdevVersion[0] == "4":
+        setupKDevelop4()