Mercurial > treepkg > treepkg
diff treepkg/packager.py @ 297:4dd6ec3a1151
Make it possible to use parallel builds for packages that support it:
Add a new per-track configuration option deb_build_options whose value
is passed as the DEB_BUILD_OPTIONS environment variable to the pbuilder
process.
| author | Bernhard Herzog <bh@intevation.de> |
|---|---|
| date | Fri, 20 Nov 2009 20:19:51 +0000 |
| parents | faeeac2c4c71 |
| children | c32dc72ba979 |
line wrap: on
line diff
--- a/treepkg/packager.py Wed Nov 18 18:11:22 2009 +0000 +++ b/treepkg/packager.py Fri Nov 20 20:19:51 2009 +0000 @@ -232,7 +232,8 @@ util.ensure_directory(self.binary_dir) util.ensure_directory(self.log_dir) logging.info("Building binary package; logging to %r", self.logfile) - self.track.builder.build(self.dsc_file, self.binary_dir, self.logfile) + self.track.builder.build(self.dsc_file, self.binary_dir, self.logfile, + extra_env=self.track.debian_environment()) self.sign_package() self.status.binary_package_created() @@ -348,13 +349,14 @@ deb_fullname, packager_class="treepkg.packager", pkg_revision_template="treepkg%(pkg_revision)d", handle_dependencies=False, signing_key_id="", do_build=True, - rules_svn_url=None): + rules_svn_url=None, deb_build_options=""): self.name = name self.base_dir = base_dir self.builder = PBuilder(pbuilderrc, root_cmd, release_signing_keyid=signing_key_id) self.deb_email = deb_email self.deb_fullname = deb_fullname + self.deb_build_options = deb_build_options self.pkg_revision_template = pkg_revision_template self.signing_key_id = signing_key_id self.do_build = do_build @@ -460,6 +462,11 @@ env = os.environ.copy() env["DEBFULLNAME"] = self.deb_fullname env["DEBEMAIL"] = self.deb_email + env["DEB_BUILD_OPTIONS"] = self.deb_build_options + # cdbs requires DEB_BUILD_PARALLEL set to something non-empty, + # otherwise it will ignore any parallel=<n> setting in + # DEB_BUILD_OPTIONS. + env["DEB_BUILD_PARALLEL"] = "true" return env def packager_for_new_revision(self):