X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/bebf97964dd6f84c3cb10878bd24973a164da9ef..b1d915653a9f8a415a0d4a8d66027508881361d3:/build_system.py

diff --git a/build_system.py b/build_system.py
index 39bbae7..78039f1 100644
--- a/build_system.py
+++ b/build_system.py
@@ -14,25 +14,21 @@ class CMake:
 		self.installCmdPrefix = config['installCmdPrefix']
 		self.cmakeParameters = module.get('cmakeParameters', [])
 	
-	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)
 		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
@@ -53,38 +49,32 @@ try:
 			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 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
+		def build(self, reconfigure=False): # reconfigure is ignored (we always do a reconfiguration)
+			# Get us a version number
 			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()
+			# create Debian files
 			os.chdir(self.sourceFolder)
+			files = auto_debuild.createDebianFiles(self.autoDebuildConfig)
+			# build package(s)
 			auto_debuild.buildDebianPackage(self.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