Make overriding the version name independant of VCS; submodule support for git

[mass-build.git] / build_system.py

diff --git a/build_system.py b/build_system.py
index 8325aeda98c62e2ddaba9c1d6cc5e71ee0b1eb13..aa59299772284aa1a000b6fa8267c57c93b79b4e 100644 (file)
--- a/build_system.py
+++ b/build_system.py
@@ -42,6 +42,7 @@ try:
 
                def build(self, reconfigure=False): # reconfigure is ignored (we always do a reconfiguration)
                        # create auto-debuild configuration
+                       versionName = self.config['versionName'] if 'versionName' in self.config else self.vcs.version()
                        autoDebuildConfig = {
                                'sourceName': self.config['name'],
                                'buildSystem': self.config['buildSystem'],
@@ -50,7 +51,7 @@ try:
                                'name': self.config['debName'],
                                'email': self.config['debEMail'],
                                'parallelJobs': self.config['jobs'],
-                               'version': self.vcs.version(),
+                               'version': versionName,
                        }
                        if autoDebuildConfig['version'] is None:
                                raise Exception("VCS did not provide us with a proper version number, please fix this")