X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/85991dba45f220dc4f5e94e6238bb0e36dd39862..7cc4b869c9189b01675fae5b8ff9e478c04ec68b:/build_system.py

diff --git a/build_system.py b/build_system.py
index 8ebf6f3..9802fc4 100644
--- a/build_system.py
+++ b/build_system.py
@@ -12,27 +12,23 @@ class CMake:
 		self.jobs = config['jobs']
 		self.buildCmdPrefix = config['buildCmdPrefix']
 		self.installCmdPrefix = config['installCmdPrefix']
-		self.cmakeParameters = module.get('cmakeParameters', [])
+		self.module = module
 	
-	def configure(self, force=False):
+	def build(self, reconfigure=False):
+		# Make sure we have a build directory
 		if not os.path.exists(self.buildFolder): os.makedirs(self.buildFolder)
 		os.chdir(self.buildFolder)
-		# check if we actually need to work
+		# In case of reconfiguration, delete cache file if it exists
 		cacheFile = 'CMakeCache.txt'
-		if os.path.exists(cacheFile) and os.path.exists('Makefile') and not force: return
-		# yes we do! make sure we start clean, and then go ahead
-		if os.path.exists(cacheFile): os.remove(cacheFile)
+		if os.path.exists(cacheFile) and reconfigure: os.remove(cacheFile)
+		# Run cmake
 		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]+self.cmakeParameters)
+			'-DCMAKE_INSTALL_PREFIX='+self.installDir]+self.module.get('cmakeParameters', []))
 		os.unsetenv('PKG_CONFIG_PATH')
-	
-	def build(self):
-		os.chdir(self.buildFolder)
+		# run compilation
 		subprocess.check_call(self.buildCmdPrefix + ['make', '-j'+str(self.jobs)])
-	
-	def install(self):
-		os.chdir(self.buildFolder)
+		# run installation
 		subprocess.check_call(self.installCmdPrefix + ['make', 'install'])
 
 # if auto-debuild is available, provide a wrapper for it
@@ -41,48 +37,42 @@ try:
 	class AutoDebuild:
 		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': buildSystem,
-				'buildDir': os.path.abspath(buildFolder),
-				'name': config['debName'],
-				'email': config['debEMail'],
-			}
-			self.copyOption(config, 'jobs', 'parallelJobs')
-			self.copyOption(module, 'dbgPackage')
-			self.copyOption(module, 'buildDepends')
-			self.copyOption(module, 'binaryDepends')
-			if buildSystem == 'cmake':
-				self.copyOption(module, 'cmakeParameters')
+			self.buildFolder = os.path.abspath(buildFolder)
+			self.jobs = config['jobs']
+			self.debDir = os.path.abspath(config['debDir'])
+			self.debName = config['debName']
+			self.debEMail = config['debEMail']
+			self.module = module
 			self.vcs = vcs
-			self.configured = False # make sure configure is called before build/install
 
-		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
-			if self.autoDebuildConfig['version'] is None:
-				raise Exception("VCS did not provide us with a proper version, please fix this")
-			self.vcs.ignore('/debian/') # make sure the debian folder is ignored
-			os.chdir(self.sourceFolder)
-			#print self.autoDebuildConfig
-			self.files = auto_debuild.createDebianFiles(self.autoDebuildConfig)
-			self.configured = True
-
-		def build(self):
-			if not self.configured: self.configure()
+		def build(self, reconfigure=False): # reconfigure is ignored (we always do a reconfiguration)
+			# create auto-debuild configuration
+			autoDebuildConfig = {
+				'sourceName': self.module['name'],
+				'buildSystem': self.module['buildSystem'],
+				'debDir': self.debDir,
+				'buildDir': self.buildFolder,
+				'name': self.debName,
+				'email': self.debEMail,
+				'parallelJobs': self.jobs,
+				'version': self.vcs.version()
+			}
+			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', 'binarySkipFiles', 'binaryInstallFiles',
+					'buildDepends', 'binaryDepends', 'binaryRecommends', 'binaryProvides',
+					'cmakeParameters', 'automakeParameters'):
+				if option in self.module:
+					autoDebuildConfig[option] = self.module[option]
+			# create Debian files
 			os.chdir(self.sourceFolder)
-			auto_debuild.buildDebianPackage(self.autoDebuildConfig)
+			files = auto_debuild.createDebianFiles(autoDebuildConfig)
+			# build package(s)
+			auto_debuild.buildDebianPackage(autoDebuildConfig)
+			# install package(s)
+			subprocess.check_call(['sudo', 'dpkg', '--install'] + files)
 
-		def install(self):
-			if not self.configured: self.configure()
-			os.chdir(self.sourceFolder)
-			subprocess.check_call(['sudo', 'dpkg', '--install'] + self.files)
 except ImportError:
 	print "auto_debuild not found, disabling auto-debuild system"
 	pass