[Treepkg-commits] r337 - in trunk/recipes/kde: enterprise maemo
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed Jul 7 11:33:50 CEST 2010
Author: bricks
Date: 2010-07-07 11:33:49 +0200 (Wed, 07 Jul 2010)
New Revision: 337
Modified:
trunk/recipes/kde/enterprise/generic.py
trunk/recipes/kde/enterprise/kde_l10n.py
trunk/recipes/kde/enterprise/kde_l10n_tags.py
trunk/recipes/kde/maemo/kde_l10n.py
trunk/recipes/kde/maemo/kde_l10n_tags.py
Log:
merged maemo packager into enterprise packager
maemo generic is obsolete with builder_cls: sbdmock setting
maemo sepecific kde_l10n packager are still necessary
Modified: trunk/recipes/kde/enterprise/generic.py
===================================================================
--- trunk/recipes/kde/enterprise/generic.py 2010-06-21 13:06:51 UTC (rev 336)
+++ trunk/recipes/kde/enterprise/generic.py 2010-07-07 09:33:49 UTC (rev 337)
@@ -24,7 +24,12 @@
+ str(self.revision))
def determine_package_version(self, directory):
+ revision = self.revision
+ rules_revision = self.parent.rules_revision
+ pkg_revision = self.parent.pkg_revision
+ pkg_date = self.parent.pkg_date
enterprise_version = self.enterprise_version
+
return self.track.version_template % locals()
def prepare_sources_for_tarball(self, pkgbasedir, pkgbaseversion):
@@ -36,6 +41,10 @@
override this method if necessary.
"""
+ def get_change_msg(self):
+ return self.changemsg_template % dict(revision=self.revision,
+ pkg_date=self.parent.pkg_date,
+ rules_revision=self.parent.rules_revision)
class RevisionPackager(treepkg.packager.RevisionPackager):
Modified: trunk/recipes/kde/enterprise/kde_l10n.py
===================================================================
--- trunk/recipes/kde/enterprise/kde_l10n.py 2010-06-21 13:06:51 UTC (rev 336)
+++ trunk/recipes/kde/enterprise/kde_l10n.py 2010-07-07 09:33:49 UTC (rev 337)
@@ -1,6 +1,7 @@
-# Copyright (C) 2007, 2008, 2009 by Intevation GmbH
+# Copyright (C) 2007 - 2010 by Intevation GmbH
# Authors:
# Bernhard Herzog <bh at intevation.de>
+# Bjoern Ricks <bjoern.ricks at intevation.de>
#
# This program is free software under the GPL (>=v2)
# Read the file COPYING coming with the software for details.
@@ -63,6 +64,11 @@
def determine_package_version(self, directory):
enterprise_version = self.enterprise_version
+ revision = self.revision
+ rules_revision = self.parent.rules_revision
+ pkg_revision = self.parent.pkg_revision
+ pkg_date = self.parent.pkg_date
+
return self.track.version_template % locals()
def create_l10n_de_tarball(self, pkgbasedir, pkgbaseversion):
Modified: trunk/recipes/kde/enterprise/kde_l10n_tags.py
===================================================================
--- trunk/recipes/kde/enterprise/kde_l10n_tags.py 2010-06-21 13:06:51 UTC (rev 336)
+++ trunk/recipes/kde/enterprise/kde_l10n_tags.py 2010-07-07 09:33:49 UTC (rev 337)
@@ -1,6 +1,7 @@
-# Copyright (C) 2007, 2008, 2009 by Intevation GmbH
+# Copyright (C) 2007 - 2010 by Intevation GmbH
# Authors:
# Bernhard Herzog <bh at intevation.de>
+# Bjoern Ricks <bjoern.ricks at intevation.de>
#
# This program is free software under the GPL (>=v2)
# Read the file COPYING coming with the software for details.
@@ -42,7 +43,7 @@
# that it gets removed along with the build environment. Otherwise we
# end up with a directory containing files that cannot be removed by
# treepkg
-workdir=/tmp/work
+workdir=/tmp/work-tags
cp -a %(basedir)s $workdir
cd $workdir
@@ -58,13 +59,7 @@
def __init__(self, *args, **kw):
super(SourcePackager, self).__init__(*args, **kw)
- self.enterprise_version = (time.strftime("%Y%m%d", time.localtime())
- + "." + str(self.revision))
- def determine_package_version(self, directory):
- enterprise_version = self.enterprise_version
- return self.track.version_template % locals()
-
def create_l10n_de_tarball(self, pkgbasedir, pkgbaseversion):
logging.info("Creating kde-l10n-de tarball")
de_tarball = os.path.join(self.work_dir,
Modified: trunk/recipes/kde/maemo/kde_l10n.py
===================================================================
--- trunk/recipes/kde/maemo/kde_l10n.py 2010-06-21 13:06:51 UTC (rev 336)
+++ trunk/recipes/kde/maemo/kde_l10n.py 2010-07-07 09:33:49 UTC (rev 337)
@@ -1,4 +1,4 @@
-# Copyright (C) 2007, 2008, 2009 by Intevation GmbH
+# Copyright (C) 2007 - 2010 by Intevation GmbH
# Authors:
# Bernhard Herzog <bh at intevation.de>
# Bjoern Ricks <bjoern.ricks at intevation.de>
@@ -15,7 +15,7 @@
from treepkg.cmdexpand import cmdexpand
from treepkg import run
-import recipes.kde.maemo.generic as generic
+import recipes.kde.enterprise.kde_l10n as generic
class SourcePackager(generic.SourcePackager):
@@ -63,21 +63,7 @@
def __init__(self, *args, **kw):
super(SourcePackager, self).__init__(*args, **kw)
- self.enterprise_version = (time.strftime("%Y%m%d", time.localtime())
- + "." + str(self.revision))
- self.maemo_version = "%s.%s" % (self.revision,
- self.parent.pkg_date)
- def determine_package_version(self, directory):
- enterprise_version = self.enterprise_version
- maemo_version = self.maemo_version
- revision = self.revision
- rules_revision = self.parent.rules_revision
- pkg_revision = self.parent.pkg_revision
- pkg_date = self.parent.pkg_date
-
- return self.track.version_template % locals()
-
def create_l10n_de_tarball(self, pkgbasedir, pkgbaseversion):
logging.info("Creating kde-l10n-de tarball")
de_tarball = os.path.join(self.work_dir,
@@ -91,6 +77,7 @@
treepkg.util.writefile(script_name, script, 0755)
treepkg.util.ensure_directory(self.src_dir)
treepkg.util.ensure_directory(self.log_dir)
+ # do not run scratchbox
#self.track.builder.run_script([script_name],
# logfile=os.path.join(self.log_dir,
# "tarball_log.txt"),
@@ -101,17 +88,10 @@
return de_tarball
def run_script(self, script_name, logfile):
+ ''' run script outside of scratchbox '''
run.call(cmdexpand("@script", script=script_name),
suppress_output=False, logfile=logfile)
- def prepare_sources_for_tarball(self, pkgbasedir, pkgbaseversion):
- de_tarball = self.create_l10n_de_tarball(pkgbasedir, pkgbaseversion)
- shutil.rmtree(pkgbasedir)
- os.mkdir(pkgbasedir)
- os.rename(de_tarball,
- os.path.join(pkgbasedir, os.path.basename(de_tarball)))
-
-
class RevisionPackager(generic.RevisionPackager):
source_packager_cls = SourcePackager
Modified: trunk/recipes/kde/maemo/kde_l10n_tags.py
===================================================================
--- trunk/recipes/kde/maemo/kde_l10n_tags.py 2010-06-21 13:06:51 UTC (rev 336)
+++ trunk/recipes/kde/maemo/kde_l10n_tags.py 2010-07-07 09:33:49 UTC (rev 337)
@@ -15,7 +15,7 @@
from treepkg.cmdexpand import cmdexpand
from treepkg import run
-import recipes.kde.maemo.tags as tags
+import recipes.kde.generic.kde_l10n_tags as tags
class SourcePackager(tags.SourcePackager):
@@ -63,21 +63,7 @@
def __init__(self, *args, **kw):
super(SourcePackager, self).__init__(*args, **kw)
- self.enterprise_version = (time.strftime("%Y%m%d", time.localtime())
- + "." + str(self.revision))
- self.maemo_version = "%s.%s" % (self.revision,
- self.parent.pkg_date)
- def determine_package_version(self, directory):
- enterprise_version = self.enterprise_version
- maemo_version = self.maemo_version
- revision = self.revision
- rules_revision = self.parent.rules_revision
- pkg_revision = self.parent.pkg_revision
- pkg_date = self.parent.pkg_date
-
- return self.track.version_template % locals()
-
def create_l10n_de_tarball(self, pkgbasedir, pkgbaseversion):
logging.info("Creating kde-l10n-de tarball")
de_tarball = os.path.join(self.work_dir,
@@ -101,17 +87,10 @@
return de_tarball
def run_script(self, script_name, logfile):
+ ''' run script without builder '''
run.call(cmdexpand("@script", script=script_name),
suppress_output=False, logfile=logfile)
- def prepare_sources_for_tarball(self, pkgbasedir, pkgbaseversion):
- de_tarball = self.create_l10n_de_tarball(pkgbasedir, pkgbaseversion)
- shutil.rmtree(pkgbasedir)
- os.mkdir(pkgbasedir)
- os.rename(de_tarball,
- os.path.join(pkgbasedir, os.path.basename(de_tarball)))
-
-
class RevisionPackager(tags.RevisionPackager):
source_packager_cls = SourcePackager
More information about the Treepkg-commits
mailing list