[jhbuild/jhdebuild: 532/536] [jhdebuild] Iterate depends
- From: John Carr <johncarr src gnome org>
- To: svn-commits-list gnome org
- Subject: [jhbuild/jhdebuild: 532/536] [jhdebuild] Iterate depends
- Date: Sun, 17 May 2009 14:44:43 -0400 (EDT)
commit 11a3af5b709a5b0fdcdd4e53857ba1c1f0ddc738
Author: John Carr <john carr unrouted co uk>
Date: Sun May 17 17:54:04 2009 +0100
[jhdebuild] Iterate depends
---
jhbuild/modtypes/autotools.py | 6 ++----
jhbuild/modtypes/debian.py | 1 +
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/jhbuild/modtypes/autotools.py b/jhbuild/modtypes/autotools.py
index d51bdfc..ccf45ad 100644
--- a/jhbuild/modtypes/autotools.py
+++ b/jhbuild/modtypes/autotools.py
@@ -256,10 +256,6 @@ class AutogenModule(Package, DebianBasePackage):
return DebianBasePackage.do_deb_build_deps(self, buildscript)
do_deb_build_deps.error_phases = []
- def do_deb_build_package(self, buildscript):
- DebianBasePackage.do_deb_build_package(self, buildscript)
- do_deb_build_package.error_phases = [DebianBasePackage.PHASE_TAR_X, PHASE_DIST]
-
def skip_install(self, buildscript, last_state):
return buildscript.config.nobuild
@@ -347,6 +343,7 @@ class AutogenModule(Package, DebianBasePackage):
except:
pass
do_deb_dist.error_phases = []
+ do_deb_dist.depends = [PHASE_CHECKOUT]
def get_distdir(self, buildscript):
tarball_dir = self.get_tarball_dir(buildscript)
@@ -382,6 +379,7 @@ class AutogenModule(Package, DebianBasePackage):
buildscript.execute(['tar', 'xzf', orig_filename], cwd = builddebdir)
do_deb_tar_x.error_phases = []
+ do_deb_tar_x.depends = [DebianBasePackage.PHASE_DEB_DIST]
def skip_force_clean(self, buildscript, last_state):
return False
diff --git a/jhbuild/modtypes/debian.py b/jhbuild/modtypes/debian.py
index 7067022..8926ecb 100644
--- a/jhbuild/modtypes/debian.py
+++ b/jhbuild/modtypes/debian.py
@@ -10,6 +10,7 @@ from jhbuild.utils import debian
class DebianBasePackage:
+ PHASE_DEB_DIST = 'deb_dist'
PHASE_TAR_X = 'deb_tar_x'
PHASE_DEBIAN_DIR = 'deb_debian_dir'
PHASE_BUILD_PACKAGE = 'deb_build_package'
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]