forward installFiles option; debian folder is no longer persistent

[mass-build.git] / build_system.py

diff --git a/build_system.py b/build_system.py
index d74689ffd734fb82f3e220adbfda1c9d8b208c3e..6e72e71e9b8eed6713bc5a3a789133f5a9deee6a 100644 (file)
--- a/build_system.py
+++ b/build_system.py
@@ -50,20 +50,27 @@ try:
                                'name': config['debName'],
                                'email': config['debEMail'],
                        }
-                       self.copyFromModule(module, 'buildDepends')
-                       self.copyFromModule(module, 'binaryDepends')
-                       if buildSystem == 'cmakeParameters':
-                               self.copyFromModule(module, 'cmakeParameters')
+                       self.copyOption(config, 'jobs', 'parallelJobs')
+                       self.copyOption(module, 'dbgPackage')
+                       self.copyOption(module, 'skipFiles', 'binarySkipFiles')
+                       self.copyOption(module, 'installFiles', 'binaryInstall')
+                       self.copyOption(module, 'buildDepends')
+                       self.copyOption(module, 'binaryDepends')
+                       self.copyOption(module, 'binaryRecommends')
+                       if buildSystem == 'cmake':
+                               self.copyOption(module, 'cmakeParameters')
                        self.vcs = vcs
                        self.configured = False # make sure configure is called before build/install
 
-               def copyFromModule(self, module, name):
-                       if name in module:
-                               self.autoDebuildConfig[name] = module[name]
+               def copyOption(self, src, name, dstName = None):
+                       if dstName is None: dstName = name # per default, stick with original name
+                       if name in src:
+                               self.autoDebuildConfig[dstName] = src[name]
 
                def configure(self, force=False): # force is ignored
                        self.autoDebuildConfig['version'] = self.vcs.version() # by now, data has been fetched, so this is possible
-                       self.vcs.ignore('/debian/') # make sure the debian folder is ignored
+                       if self.autoDebuildConfig['version'] is None:
+                               raise Exception("VCS did not provide us with a proper version, please fix this")
                        os.chdir(self.sourceFolder)
                        #print self.autoDebuildConfig
                        self.files = auto_debuild.createDebianFiles(self.autoDebuildConfig)