treepkg: recipes/kde_enterprise_3

annotate recipes/kde_enterprise_3_5/base.py @ 296:ce7be2fb93ee

Make it easy to install extra binaries into subdirectories of extra-pkg. This makes it easier to manage the extra-pkg directory when it contains manually added packages and automatically added packages from one of the package tracks by putting the automatically added packages into extra-pkg/auto and manually added packages into extra-pkg/manual. To this end, add parameter subdir to PBuilder.add_binaries_to_extra_pkg method with default value "auto". Adapt the test case accordingly. Also add the command line argument --subdir to bin/treepkgbuilder.py add-binaries command, this time with default value "manual".

author	Bernhard Herzog <bh@intevation.de>
date	Wed, 18 Nov 2009 18:11:22 +0000
parents	faeeac2c4c71
children	3fcebc5cf93c

rev	line source
271 12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	1 # Copyright (C) 2007, 2008, 2009 by Intevation GmbH
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	2 # Authors:
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	3 # Bernhard Herzog <bh@intevation.de>
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	4 #
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	5 # This program is free software under the GPL (>=v2)
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	6 # Read the file COPYING coming with the software for details.
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	7
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	8 """Base classes for all kdepim packagers"""
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	9
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	10 import os
286 4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	11 import re
271 12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	12 import time
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	13 import logging
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	14
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	15 import treepkg.packager
286 4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	16 import treepkg.subversion as subversion
271 12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	17
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	18
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	19 class BaseSourcePackager(treepkg.packager.SourcePackager):
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	20
275 c0cbd133b607 Define changemsg_template in BaseSourcePackager and not in the kdepim Bernhard Herzog <bh@intevation.de> parents: 274 diff changeset	21 changemsg_template = "Update to SVN enterprise35 branch rev. %(revision)d"
c0cbd133b607 Define changemsg_template in BaseSourcePackager and not in the kdepim Bernhard Herzog <bh@intevation.de> parents: 274 diff changeset	22
271 12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	23 def __init__(self, args, *kw):
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	24 super(BaseSourcePackager, self).__init__(args, *kw)
283 cd10b835d9b8 kdepim recipes: introduce a BaseRevisionPackager that allows the track Bernhard Herzog <bh@intevation.de> parents: 280 diff changeset	25 self.enterprise_version = (self.parent.pkg_date + "."
cd10b835d9b8 kdepim recipes: introduce a BaseRevisionPackager that allows the track Bernhard Herzog <bh@intevation.de> parents: 280 diff changeset	26 + str(self.revision))
271 12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	27
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	28 def determine_package_version(self, directory):
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	29 enterprise_version = self.enterprise_version
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	30 return self.track.version_template % locals()
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	31
276 f3dee156e3e3 Add pkgbaseversion parameter to the prepare_sources_for_tarball method Bernhard Herzog <bh@intevation.de> parents: 275 diff changeset	32 def prepare_sources_for_tarball(self, pkgbasedir, pkgbaseversion):
271 12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	33 self.update_version_numbers(pkgbasedir)
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	34
274 2676abfc0e1d Refactoring: Implement do_package in treepkg.packager.SourcePackager. Bernhard Herzog <bh@intevation.de> parents: 273 diff changeset	35 def update_version_numbers(self, pkgbasedir):
2676abfc0e1d Refactoring: Implement do_package in treepkg.packager.SourcePackager. Bernhard Herzog <bh@intevation.de> parents: 273 diff changeset	36 """Updates the version numbers in the code in pkgbasedir.
2676abfc0e1d Refactoring: Implement do_package in treepkg.packager.SourcePackager. Bernhard Herzog <bh@intevation.de> parents: 273 diff changeset	37 The default implementation does nothing. Derived classes should
2676abfc0e1d Refactoring: Implement do_package in treepkg.packager.SourcePackager. Bernhard Herzog <bh@intevation.de> parents: 273 diff changeset	38 override this method if necessary.
2676abfc0e1d Refactoring: Implement do_package in treepkg.packager.SourcePackager. Bernhard Herzog <bh@intevation.de> parents: 273 diff changeset	39 """
271 12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	40
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	41
283 cd10b835d9b8 kdepim recipes: introduce a BaseRevisionPackager that allows the track Bernhard Herzog <bh@intevation.de> parents: 280 diff changeset	42 class BaseRevisionPackager(treepkg.packager.RevisionPackager):
cd10b835d9b8 kdepim recipes: introduce a BaseRevisionPackager that allows the track Bernhard Herzog <bh@intevation.de> parents: 280 diff changeset	43
cd10b835d9b8 kdepim recipes: introduce a BaseRevisionPackager that allows the track Bernhard Herzog <bh@intevation.de> parents: 280 diff changeset	44 def __init__(self, args, *kw):
cd10b835d9b8 kdepim recipes: introduce a BaseRevisionPackager that allows the track Bernhard Herzog <bh@intevation.de> parents: 280 diff changeset	45 self.pkg_date = kw.pop("pkg_date",
cd10b835d9b8 kdepim recipes: introduce a BaseRevisionPackager that allows the track Bernhard Herzog <bh@intevation.de> parents: 280 diff changeset	46 time.strftime("%Y%m%d", time.localtime()))
cd10b835d9b8 kdepim recipes: introduce a BaseRevisionPackager that allows the track Bernhard Herzog <bh@intevation.de> parents: 280 diff changeset	47 super(BaseRevisionPackager, self).__init__(args, *kw)
cd10b835d9b8 kdepim recipes: introduce a BaseRevisionPackager that allows the track Bernhard Herzog <bh@intevation.de> parents: 280 diff changeset	48
cd10b835d9b8 kdepim recipes: introduce a BaseRevisionPackager that allows the track Bernhard Herzog <bh@intevation.de> parents: 280 diff changeset	49
271 12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	50 class BasePackageTrack(treepkg.packager.PackageTrack):
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	51
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	52 extra_config_desc = [("version_template", str, "%(enterprise_version)s"),
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	53 ("tags_url", str, ""),
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	54 ("tags_pattern", str, ""),
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	55 ("tags_subdir", str, "")]
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	56
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	57 def __init__(self, args, *kw):
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	58 self.version_template = kw.pop("version_template")
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	59 tags_url = kw.pop("tags_url")
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	60 tags_pattern = kw.pop("tags_pattern")
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	61 tags_subdir = kw.pop("tags_subdir")
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	62 super(BasePackageTrack, self).__init__(args, *kw)
286 4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	63 self.tag_detector = subversion.TagDetector(tags_url, tags_pattern,
4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	64 tags_subdir)
271 12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	65
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	66 def packager_for_new_revision(self):
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	67 logging.info("Checking tags")
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	68 self.tag_url = None
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	69 tag_url, tag_revision = self.tag_detector.newest_tag_revision()
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	70 logging.info("Found: %s: %s", tag_url, tag_revision)
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	71 if tag_url is not None:
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	72 revision = (tag_revision,
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	73 self.rules_working_copy.last_changed_revision())
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	74 logging.info("New revision is %s", revision)
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	75 if revision not in self.get_revision_numbers():
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	76 logging.info("Revision %s has not been packaged yet",
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	77 revision)
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	78 self.tag_url = tag_url
280 d2382953b2c8 When building a tagged revision, make sure to explicitly use the Bernhard Herzog <bh@intevation.de> parents: 276 diff changeset	79 self.tag_revision = tag_revision
286 4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	80 tag_date, tag_change_count = self.tag_pkg_parameters(tag_url)
293 faeeac2c4c71 Replace debrevision_prefix with pkg_revision_template. Their meaning is Bernhard Herzog <bh@intevation.de> parents: 286 diff changeset	81 pkg_revision = (self.pkg_revision_template
faeeac2c4c71 Replace debrevision_prefix with pkg_revision_template. Their meaning is Bernhard Herzog <bh@intevation.de> parents: 286 diff changeset	82 % dict(pkg_revision=tag_change_count))
286 4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	83 return self.revision_packager_cls(self, tag=tag_url,
4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	84 pkg_revision=pkg_revision,
4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	85 pkg_date=tag_date,
4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	86 *revision)
271 12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	87 else:
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	88 logging.info("Revision %s has already been packaged.",
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	89 revision)
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	90
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	91 return super(BasePackageTrack, self).packager_for_new_revision()
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	92
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	93 def export_sources(self, to_dir):
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	94 if self.tag_url is not None:
280 d2382953b2c8 When building a tagged revision, make sure to explicitly use the Bernhard Herzog <bh@intevation.de> parents: 276 diff changeset	95 self.export_tag(self.tag_url, to_dir, revision=self.tag_revision)
271 12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	96 else:
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	97 super(BasePackageTrack, self).export_sources(to_dir)
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	98
280 d2382953b2c8 When building a tagged revision, make sure to explicitly use the Bernhard Herzog <bh@intevation.de> parents: 276 diff changeset	99 def export_tag(self, tag_url, to_dir, revision=None):
271 12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	100 logging.info("Exporting sources from %s to %r",
12facd1b5f19 Implement tag detection for the KDEPIM enterprise 3.5 packages. This is Bernhard Herzog <bh@intevation.de> parents: diff changeset	101 tag_url, to_dir)
286 4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	102 subversion.export(tag_url, to_dir, revision=revision)
4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	103
4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	104 def tag_pkg_parameters(self, tag_url):
4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	105 match = re.search(r"/enterprise[^.]\.[^.]\."
4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	106 r"(?P<date>[0-9]{8})\.(?P<baserev>[0-9]+)/",
4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	107 tag_url)
4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	108 if match:
4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	109 date = match.group("date")
4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	110 baserev = int(match.group("baserev"))
4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	111 xml_log = subversion.log_xml(tag_url, baserev)
4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	112 revisions = subversion.extract_tag_revisions(xml_log)
4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	113 tag_change_count = len(revisions)
4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	114 return (date, tag_change_count)
4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	115 else:
4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	116 raise RuntimeError("Cannot determine tag parameters from %r"
4376c5315c72 kdepim 3.5 recipes: Use the official tag date as the date in the package Bernhard Herzog <bh@intevation.de> parents: 283 diff changeset	117 % tag_url)

Mercurial > treepkg

annotate recipes/kde_enterprise_3_5/base.py @ 296:ce7be2fb93ee