X-Git-Url: https://git.ralfj.de/mass-build.git/blobdiff_plain/84ccff1d0a5bae4e31b939b0c1495a9719e6565a..e477d3a808951963a80c6e5918eb075a8c5e086c:/build_system.py

diff --git a/build_system.py b/build_system.py
index 8325aed..478503e 100644
--- a/build_system.py
+++ b/build_system.py
@@ -1,6 +1,6 @@
 import os, shutil, subprocess
 
-'''A build system must have a "build" method with an optional "reconfigure" parameter.'''
+'''A build system must have a "build" method with parameters "reconfigure" and "waitAfterConfig".'''
 
 # Compile, build, and install cmake projects:
 class CMake:
@@ -9,25 +9,52 @@ class CMake:
 		self.buildFolder = os.path.abspath(buildFolder)
 		self.config = config
 	
-	def build(self, reconfigure=False):
+	def setEnv(self, name, val):
+		'''Set the given environment variable, return old value'''
+		oldVal = os.getenv(name)
+		os.putenv(name, val)
+		return oldVal
+	
+	def prependDirToEnv(self, name, dir, default):
+		'''Prepends the given directory to the environment variable. If the variable is empty, dir isprepended to the default.
+		   Returns the old value.'''
+		oldVal = os.getenv(name)
+		oldPaths = default if oldVal is None else oldVal
+		os.putenv(name, dir+':'+oldPaths)
+		return oldVal
+	
+	def restoreEnv(self, name, oldVal):
+		'''Restore environment variable to previous value'''
+		if oldVal is None:
+			os.unsetenv(name)
+		else:
+			os.putenv(name, oldVal)
+	
+	def build(self, reconfigure, waitAfterConfig):
 		# Make sure we have a build directory
 		if not os.path.exists(self.buildFolder): os.makedirs(self.buildFolder)
 		os.chdir(self.buildFolder)
 		# In case of reconfiguration, delete cache file if it exists
 		cacheFile = 'CMakeCache.txt'
 		if os.path.exists(cacheFile) and reconfigure: os.remove(cacheFile)
-		# Run cmake
-		os.putenv('PKG_CONFIG_PATH', os.path.join(self.config['installDir'], 'lib', 'pkgconfig')) # I found no way to do this within cmake
+		# Run cmake, in the proper environment, then restore old environment
+		oldPKGConfigPath = self.setEnv('PKG_CONFIG_PATH', os.path.join(self.config['installDir'], 'lib', 'pkgconfig'))
+		oldCMakePrefixPath = self.setEnv('CMAKE_PREFIX_PATH', self.config['installDir'])
+		oldXDGDataDirs = self.prependDirToEnv('XDG_DATA_DIRS', os.path.join(self.config['installDir'], 'share'), '/usr/share')
+		oldXDGConfigDirs = self.prependDirToEnv('XDG_CONFIG_DIRS', os.path.join(self.config['installDir'], 'etc', 'xdg'), '/etc/xdg')
 		subprocess.check_call(['cmake', self.sourceFolder, '-DCMAKE_BUILD_TYPE='+self.config['buildType'],
 			'-DCMAKE_INSTALL_PREFIX='+self.config['installDir']]+self.config.get('cmakeParameters', []))
-		os.unsetenv('PKG_CONFIG_PATH')
+		self.restoreEnv('PKG_CONFIG_PATH', oldPKGConfigPath)
+		self.restoreEnv('CMAKE_PREFIX_PATH', oldCMakePrefixPath)
+		self.restoreEnv('XDG_DATA_DIRS', oldXDGDataDirs)
+		self.restoreEnv('XDG_CONFIG_DIRS', oldXDGConfigDirs)
 		# if asked to do so, wait
-		if self.config['waitAfterConfig']:
+		if waitAfterConfig:
 			raw_input('Configuration done. Hit "Enter" to build the project. ')
 		# run compilation
-		subprocess.check_call(self.config['buildCmdPrefix'] + ['make', '-j'+str(self.config['jobs'])])
+		subprocess.check_call(self.config.get('buildCmdPrefix', []) + ['make', '-j'+str(self.config['jobs'])])
 		# run installation
-		subprocess.check_call(self.config['installCmdPrefix'] + ['make', 'install'])
+		subprocess.check_call(self.config.get('installCmdPrefix', []) + ['make', 'install'])
 
 # if auto-debuild is available, provide a wrapper for it
 try:
@@ -40,8 +67,9 @@ try:
 			self.config = config
 			self.vcs = vcs
 
-		def build(self, reconfigure=False): # reconfigure is ignored (we always do a reconfiguration)
+		def build(self, reconfigure, waitAfterConfig): # reconfigure is ignored (we always do a reconfiguration)
 			# create auto-debuild configuration
+			versionName = self.config['versionName'] if 'versionName' in self.config else self.vcs.version()
 			autoDebuildConfig = {
 				'sourceName': self.config['name'],
 				'buildSystem': self.config['buildSystem'],
@@ -50,13 +78,15 @@ try:
 				'name': self.config['debName'],
 				'email': self.config['debEMail'],
 				'parallelJobs': self.config['jobs'],
-				'version': self.vcs.version(),
+				'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 ('waitAfterConfig',  'dbgPackage', 'section', 'withPython2', 'binarySkipFiles', 'binaryInstallFiles',
-					'buildDepends', 'binaryDepends', 'binaryRecommends', 'binaryProvides', 'binaryConflicts',
+			for option in ('dbgPackage', 'section', 'withPython2', 'binarySkipFiles', 'binaryInstallFiles',
+					'buildDepends', 'binaryDepends', 'binaryRecommends', 'binaryProvides', 'binaryConflicts', 'binaryBreaks',
+					'binaryReplaces', 'binaryBreaksReplaces',
 					'alternatives', 'cmakeParameters', 'automakeParameters'):
 				if option in self.config:
 					autoDebuildConfig[option] = self.config[option]