Mercurial > bitten > bitten-test
changeset 242:372d1de2e3ec
* Fixes to the `<c:configure>` command added in [247]: Set current directory when invoking the script, and correctly pass `CFLAGS` and `CXXFLAGS`.
* Clean-up of the `optparse` options: use `store_true` instead o `store_const` with `const=True`.
| author | cmlenz |
|---|---|
| date | Sun, 02 Oct 2005 17:59:15 +0000 |
| parents | d3c8a74922cd |
| children | e75816cb2f45 |
| files | bitten/build/ctools.py bitten/master.py bitten/slave.py |
| diffstat | 3 files changed, 10 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/bitten/build/ctools.py +++ b/bitten/build/ctools.py @@ -32,12 +32,12 @@ if without: args += ['--without-%s' % pkg for pkg in without.split()] if cflags: - args.append('CFLAGS="%s"' % cflags) + args.append('CFLAGS=%s' % cflags) if cxxflags: - args.append('CXXFLAGS="%s"' % cflags) + args.append('CXXFLAGS=%s' % cxxflags) log_elem = xmlio.Fragment() - cmdline = CommandLine(ctxt.resolve(file_), args) + cmdline = CommandLine(ctxt.resolve(file_), args, cwd=ctxt.basedir) for out, err in cmdline.execute(): if out is not None: log.info(out)
--- a/bitten/master.py +++ b/bitten/master.py @@ -356,8 +356,7 @@ parser.add_option('-i', '--interval', dest='interval', metavar='SECONDS', default=DEFAULT_CHECK_INTERVAL, type='int', help='poll interval for changeset detection') - parser.add_option('--timewarp', action='store_const', dest='timewarp', - const=True, + parser.add_option('--timewarp', action='store_true', dest='timewarp', help='adjust timestamps of builds to be neat the ' 'timestamps of the corresponding changesets') parser.add_option('--debug', action='store_const', dest='loglevel',
--- a/bitten/slave.py +++ b/bitten/slave.py @@ -246,18 +246,19 @@ metavar='FILE', help='path to configuration file') parser.add_option('-d', '--work-dir', action='store', dest='work_dir', metavar='DIR', help='working directory for builds') - parser.add_option('-k', '--keep-files', action='store_const', - dest='keep_files', const=True, + parser.add_option('-k', '--keep-files', action='store_true', + dest='keep_files', help='don\'t delete files after builds') - parser.add_option('-n', '--dry-run', action='store_const', dest='dry_run', - const=True, help='don\'t report results back to master') + parser.add_option('-n', '--dry-run', action='store_true', dest='dry_run', + help='don\'t report results back to master') parser.add_option('--debug', action='store_const', dest='loglevel', const=logging.DEBUG, help='enable debugging output') parser.add_option('-v', '--verbose', action='store_const', dest='loglevel', const=logging.INFO, help='print as much as possible') parser.add_option('-q', '--quiet', action='store_const', dest='loglevel', const=logging.ERROR, help='print as little as possible') - parser.set_defaults(dry_run=False, loglevel=logging.WARNING) + parser.set_defaults(dry_run=False, keep_files=False, + loglevel=logging.WARNING) options, args = parser.parse_args() if len(args) < 1: