Re-instate Project.version.
authorCarl Hetherington <cth@carlh.net>
Sun, 21 Dec 2014 23:41:31 +0000 (23:41 +0000)
committerCarl Hetherington <cth@carlh.net>
Sun, 21 Dec 2014 23:41:31 +0000 (23:41 +0000)
cdist

diff --git a/cdist b/cdist
index 74d04da55ba6dc2fdbb9cdd54317bab787d15e2d..61e19c6f6e72df1a66a29768812e1d96f6e6a3c0 100755 (executable)
--- a/cdist
+++ b/cdist
@@ -504,6 +504,7 @@ class Project(object):
 
     def __init__(self, name, specifier=None):
         self.name = name
+        self.version = version
         self.specifier = specifier
         self.git_commit = None
         if self.specifier is None:
@@ -524,11 +525,14 @@ class Project(object):
 
         proj = '%s/src/%s' % (target.directory, self.name)
 
-        self.read_cscript('%s/cscript' % proj)
-
-    def read_cscript(self, s):
         self.cscript = {}
-        execfile(s, self.cscript)
+        execfile('%s/cscript' % proj, self.cscript)
+
+        if os.path.exists('%s/wscript' % proj):
+            v = read_wscript_variable(proj, "VERSION");
+            if v is not None:
+                self.version = Version(v)
+
 
 def set_version_in_wscript(version):
     f = open('wscript', 'rw')