Author: johncarr
Date: Sun Feb 17 09:58:48 2008
New Revision: 1901
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1901&view=rev
Log:
Honor the --dist option. (closes: #514131)
Modified:
trunk/ChangeLog
trunk/jhbuild/modtypes/cmake.py
Modified: trunk/jhbuild/modtypes/cmake.py
==============================================================================
--- trunk/jhbuild/modtypes/cmake.py (original)
+++ trunk/jhbuild/modtypes/cmake.py Sun Feb 17 09:58:48 2008
@@ -35,6 +35,7 @@
STATE_FORCE_CHECKOUT = 'force_checkout'
STATE_CONFIGURE = 'configure'
STATE_BUILD = 'build'
+ STATE_DIST = 'dist'
STATE_INSTALL = 'install'
def __init__(self, name, branch, dependencies=[], after=[], suggests=[]):
@@ -96,9 +97,19 @@
buildscript.set_action('Building', self)
builddir = self.get_builddir(buildscript)
buildscript.execute(os.environ.get('MAKE', 'make'), cwd=builddir)
- do_build.next_state = STATE_INSTALL
+ do_build.next_state = STATE_DIST
do_build.error_states = [STATE_FORCE_CHECKOUT]
+ def skip_dist(self, buildscript, last_state):
+ return not buildscript.config.makedist
+
+ def do_dist(self, buildscript):
+ buildscript.set_action('Creating tarball for', self)
+ cmd = '%s package_source' % os.environ.get('MAKE', 'make')
+ buildscript.execute(cmd, cwd=self.get_builddir(buildscript))
+ do_dist.next_state = STATE_INSTALL
+ do_dist.error_states = [STATE_FORCE_CHECKOUT, STATE_CONFIGURE]
+
def skip_install(self, buildscript, last_state):
return buildscript.config.nobuild
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list
Want to limit the commits to a few modules? Go to above URL, log in to edit
your options and select the modules ('topics') you want.
Module maintainer? It is possible to set the reply-to to your development
mailing list. Email [EMAIL PROTECTED] if interested.
