X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/b28ea6ce8fa02244729a4c3a8822a07d901d99a8..70e123415c0b1c3e33cee9e186b9b67347c6ef19:/build_system.py?ds=sidebyside

diff --git a/build_system.py b/build_system.py
index 5634f9d..d74689f 100644
--- a/build_system.py
+++ b/build_system.py
@@ -4,7 +4,7 @@ import os, subprocess
 
 # Compile, build, and install cmake projects:
 class CMake:
-	def __init__(self, sourceFolder, buildFolder, config):
+	def __init__(self, sourceFolder, buildFolder, module, config):
 		self.sourceFolder = os.path.abspath(sourceFolder)
 		self.buildFolder = os.path.abspath(buildFolder)
 		self.installDir = config['installDir']
@@ -12,6 +12,7 @@ class CMake:
 		self.jobs = config['jobs']
 		self.buildCmdPrefix = config['buildCmdPrefix']
 		self.installCmdPrefix = config['installCmdPrefix']
+		self.cmakeParameters = module.get('cmakeParameters', [])
 	
 	def configure(self, force=False):
 		if not os.path.exists(self.buildFolder): os.makedirs(self.buildFolder)
@@ -22,7 +23,8 @@ class CMake:
 		# yes we do! make sure we start clean, and then go ahead
 		if os.path.exists(cacheFile): os.remove(cacheFile)
 		os.putenv('PKG_CONFIG_PATH', os.path.join(self.installDir, 'lib', 'pkgconfig')) # I found no way to do this within cmake
-		subprocess.check_call(['cmake', self.sourceFolder, '-DCMAKE_BUILD_TYPE='+self.buildType, '-DCMAKE_INSTALL_PREFIX='+self.installDir])
+		subprocess.check_call(['cmake', self.sourceFolder, '-DCMAKE_BUILD_TYPE='+self.buildType,
+			'-DCMAKE_INSTALL_PREFIX='+self.installDir]+self.cmakeParameters)
 		os.unsetenv('PKG_CONFIG_PATH')
 	
 	def build(self):
@@ -37,20 +39,33 @@ class CMake:
 try:
 	import auto_debuild
 	class AutoDebuild:
-		def __init__(self, sourceFolder, module, vcs, config):
+		def __init__(self, sourceFolder, buildFolder, module, vcs, config):
 			self.sourceFolder = os.path.abspath(sourceFolder)
+			buildSystem = module.get('build-system', 'cmake')
 			self.autoDebuildConfig = {
 				'sourceName': module['name'],
 				'debDir': os.path.abspath(config['debDir']),
-				'buildSystem': module.get('build-system', 'cmake'),
+				'buildSystem': buildSystem,
+				'buildDir': os.path.abspath(buildFolder),
+				'name': config['debName'],
+				'email': config['debEMail'],
 			}
+			self.copyFromModule(module, 'buildDepends')
+			self.copyFromModule(module, 'binaryDepends')
+			if buildSystem == 'cmakeParameters':
+				self.copyFromModule(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 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
 			os.chdir(self.sourceFolder)
-			print self.sourceFolder,self.autoDebuildConfig
+			#print self.autoDebuildConfig
 			self.files = auto_debuild.createDebianFiles(self.autoDebuildConfig)
 			self.configured = True