Add support for epoch in auto-debuild version numbers as well as binary shims

[mass-build.git] / build_system.py

diff --git a/build_system.py b/build_system.py
index 478503ef9a900fbcc4954018dce5b61fe2d9c397..290eb6dbed77c8a89c2d0de0a84afc3795f0bb90 100644 (file)
--- a/build_system.py
+++ b/build_system.py
@@ -1,3 +1,20 @@
+# mass-build - Easily Build Software Involving a Large Amount of Source Repositories
+# Copyright (C) 2012 Ralf Jung <post@ralfj.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+
 import os, shutil, subprocess
 
 '''A build system must have a "build" method with parameters "reconfigure" and "waitAfterConfig".'''
@@ -68,8 +85,11 @@ try:
                        self.vcs = vcs
 
                def build(self, reconfigure, waitAfterConfig): # reconfigure is ignored (we always do a reconfiguration)
-                       # create auto-debuild configuration
+                       # get version name
                        versionName = self.config['versionName'] if 'versionName' in self.config else self.vcs.version()
+                       if versionName is None:
+                               raise Exception("VCS did not provide us with a proper version number, please fix this")
+                       # create auto-debuild configuration
                        autoDebuildConfig = {
                                'sourceName': self.config['name'],
                                'buildSystem': self.config['buildSystem'],
@@ -81,11 +101,9 @@ try:
                                'version': versionName,
                                'waitAfterConfig': waitAfterConfig,
                        }
-                       if autoDebuildConfig['version'] is None:
-                               raise Exception("VCS did not provide us with a proper version number, please fix this")
                        # copy some more optional configuration
-                       for option in ('dbgPackage', 'section', 'withPython2', 'binarySkipFiles', 'binaryInstallFiles',
-                                       'buildDepends', 'binaryDepends', 'binaryRecommends', 'binaryProvides', 'binaryConflicts', 'binaryBreaks',
+                       for option in ('epoch', 'dbgPackage', 'section', 'withPython2', 'binarySkipFiles', 'binaryInstallFiles',
+                                       'buildDepends', 'binaryDepends', 'binaryShims', 'binaryRecommends', 'binaryProvides', 'binaryConflicts', 'binaryBreaks',
                                        'binaryReplaces', 'binaryBreaksReplaces',
                                        'alternatives', 'cmakeParameters', 'automakeParameters'):
                                if option in self.config: