From: Ralf Jung Date: Fri, 27 Jul 2012 13:01:09 +0000 (+0200) Subject: pass cmake parameters, name, email, build dir to auto-debuild; ignore debian/ folder... X-Git-Url: https://git.ralfj.de/mass-build.git/commitdiff_plain/02b5afbf47783fbb9033b6776596a50bf9fd3cb0?ds=inline;hp=b28ea6ce8fa02244729a4c3a8822a07d901d99a8 pass cmake parameters, name, email, build dir to auto-debuild; ignore debian/ folder when using auto-debuild --- diff --git a/build_system.py b/build_system.py index 5634f9d..79a89c3 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,27 @@ 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'], } + if buildSystem == 'cmakeParameters': + self.autoDebuildConfig['cmakeParameters'] = module.get('cmakeParameters', []) self.vcs = vcs self.configured = False # make sure configure is called before build/install 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 diff --git a/kdebuildpy.py b/kdebuildpy.py index 4363bd4..b56eb86 100755 --- a/kdebuildpy.py +++ b/kdebuildpy.py @@ -42,11 +42,11 @@ class Project: raise Exception("Unknown VCS type "+vcsName) # build system if config.get('buildDeb', False): - self.buildSystem = build_system.AutoDebuild(self.sourceFolder(), module, self.vcs, config) + self.buildSystem = build_system.AutoDebuild(self.sourceFolder(), self.buildFolder(), module, self.vcs, config) else: buildSystemName = module.get('build-system', 'cmake') if buildSystemName == 'cmake': - self.buildSystem = build_system.CMake(self.sourceFolder(), self.buildFolder(), config) + self.buildSystem = build_system.CMake(self.sourceFolder(), self.buildFolder(), module, config) else: raise Exception("Unknown build system type "+buildSystemName) diff --git a/vcs.py b/vcs.py index 893a75f..c63b2b9 100644 --- a/vcs.py +++ b/vcs.py @@ -52,6 +52,13 @@ class Git: if v.startswith('v'): v = v[1:] return v + def ignore(self, name): + with open(os.path.join(self.folder, '.git', 'info', 'exclude'), 'r+') as f: + for line in f: + line = line.replace('\n', '').replace('\r', '') + if line == name: return # is already ignored + print >>f, name # add ignore line + class KDEGit(Git): def __init__(self, folder, name, commit): Git.__init__(self, folder, 'kde:'+name, commit)