<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>change log for rtems-tools (2010-08-13)</title>
</head>
<body text='#000000' bgcolor='#ffffff'>
<a name='cs1'></a>
<table border='0' cellspacing='0' cellpadding='5' width='100%' bgcolor='#eeeeee'>
<tr><td colspan='3' bgcolor='#dddddd'>
<font color='#bb2222'><strong>ccj</strong></font>
</td></tr>
<tr><td colspan='3' bgcolor='#dddddd'><pre>2010-08-13 Chris Johns <chrisj@rtems.org>
* specbuilder/specbuilder/defaults.py: Provide a default shell.
* specbuilder/specbuilder/rtems.py: Provide a default autoconf
version.
* specbuilder/specbuilder/setup.py: Use the default setup shell
and check the version of autoconf needed.
</pre></td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-tools/ChangeLog.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&diff_format=h">M</a></td><td width='1%'>1.5</td><td width='100%'>ChangeLog</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-tools/specbuilder/specbuilder/defaults.py.diff?r1=text&tr1=1.3&r2=text&tr2=1.4&diff_format=h">M</a></td><td width='1%'>1.4</td><td width='100%'>specbuilder/specbuilder/defaults.py</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-tools/specbuilder/specbuilder/rtems.py.diff?r1=text&tr1=1.1&r2=text&tr2=1.2&diff_format=h">M</a></td><td width='1%'>1.2</td><td width='100%'>specbuilder/specbuilder/rtems.py</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-tools/specbuilder/specbuilder/setup.py.diff?r1=text&tr1=1.4&r2=text&tr2=1.5&diff_format=h">M</a></td><td width='1%'>1.5</td><td width='100%'>specbuilder/specbuilder/setup.py</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems-tools/ChangeLog:1.4 rtems-tools/ChangeLog:1.5
--- rtems-tools/ChangeLog:1.4 Thu Aug 12 17:40:57 2010
+++ rtems-tools/ChangeLog Thu Aug 12 23:40:44 2010
</font><font color='#997700'>@@ -1,5 +1,15 @@
</font> 2010-08-13 Chris Johns <chrisj@rtems.org>
<font color='#000088'>+ * specbuilder/specbuilder/defaults.py: Provide a default shell.
+
+ * specbuilder/specbuilder/rtems.py: Provide a default autoconf
+ version.
+
+ * specbuilder/specbuilder/setup.py: Use the default setup shell
+ and check the version of autoconf needed.
+
+2010-08-13 Chris Johns <chrisj@rtems.org>
+
</font> * specbuilder/specbuilder/setup.py: Add import for execute.
2010-08-13 Chris Johns <chrisj@rtems.org>
<font color='#006600'>diff -u rtems-tools/specbuilder/specbuilder/defaults.py:1.3 rtems-tools/specbuilder/specbuilder/defaults.py:1.4
--- rtems-tools/specbuilder/specbuilder/defaults.py:1.3 Thu Aug 12 16:09:55 2010
+++ rtems-tools/specbuilder/specbuilder/defaults.py Thu Aug 12 23:40:44 2010
</font><font color='#997700'>@@ -84,6 +84,7 @@
</font> '___build_template': '''#!%{___build_shell}
%{___build_pre}
%{nil}''',
<font color='#000088'>+'___setup_shell': '/bin/sh',
</font> '__aclocal': 'aclocal',
'__ar': 'ar',
'__arch_install_post': '%{nil}',
<font color='#006600'>diff -u rtems-tools/specbuilder/specbuilder/rtems.py:1.1 rtems-tools/specbuilder/specbuilder/rtems.py:1.2
--- rtems-tools/specbuilder/specbuilder/rtems.py:1.1 Thu Aug 12 16:09:55 2010
+++ rtems-tools/specbuilder/specbuilder/rtems.py Thu Aug 12 23:40:44 2010
</font><font color='#997700'>@@ -36,6 +36,7 @@
</font> 'mpfr_provided': '0',
'gmp_provided': '0',
'libelf_provided': '0',
<font color='#000088'>+ '__setup_autoconf': '2.65'
</font> }
return defines
<font color='#006600'>diff -u rtems-tools/specbuilder/specbuilder/setup.py:1.4 rtems-tools/specbuilder/specbuilder/setup.py:1.5
--- rtems-tools/specbuilder/specbuilder/setup.py:1.4 Thu Aug 12 17:40:57 2010
+++ rtems-tools/specbuilder/specbuilder/setup.py Thu Aug 12 23:40:44 2010
</font><font color='#997700'>@@ -86,20 +86,33 @@
</font> filelist.append(os.path.join(root, f))
return filelist
<font color='#880000'>- def get_specs(self, path):
- return self._get_file_list(path, 'rtems', 'spec')
-
- def get_patches(self, path):
- return self._get_file_list(path, 'patches', 'diff')
-
</font> def run(self, command, shell_opts = '', cwd = None):
e = execute.capture_execution(log = log.default, dump = self.opts.quiet())
<font color='#880000'>- cmd = self.opts.expand('%{___build_shell} -ex ' + shell_opts + ' ' + command, self.defaults)
</font><font color='#000088'>+ cmd = self.opts.expand('%{__setup_shell} -ex ' + shell_opts + ' ' + command, self.defaults)
</font> self._output('run: ' + cmd)
exit_code, proc, output = e.shell(cmd, cwd = cwd)
if exit_code != 0:
raise error.general('shell cmd failed: ' + cmd)
<font color='#000088'>+ def check_version(self, cmd, macro):
+ vcmd = cmd + ' --version'
+ e = execute.capture_execution()
+ exit_code, proc, output = e.shell(vcmd)
+ if exit_code != 0 and len(output) != 0:
+ raise error.general('shell cmd failed: ' + vcmd)
+ version = output.split('\n')[0].split(' ')
+ need = self.opts.expand(macro, self.defaults)
+ if version < need:
+ _notice(self.opts, 'warning: ' + cmd + ' version is invalid, need ' + need + ' or higher')
+ return False
+ return True
+
+ def get_specs(self, path):
+ return self._get_file_list(path, 'rtems', 'spec')
+
+ def get_patches(self, path):
+ return self._get_file_list(path, 'patches', 'diff')
+
</font> def mkdir(self, path):
if not self.opts.dry_run():
self._output('making dir: ' + path)
<font color='#997700'>@@ -129,9 +142,10 @@
</font> if not os.path.isdir(crossrpms):
raise error.general('no crossrpms directory found under: ' + crossrpms)
if 'rebuild' in self.opts.opts:
<font color='#880000'>- self.run('../../bootstrap -c', '-c', crossrpms)
- self.run('../../bootstrap', '-c', crossrpms)
- self.run('./configure', '-c', crossrpms)
</font><font color='#000088'>+ if self.check_version('autoconf', '%{__setup_autoconf}'):
+ self.run('../../bootstrap -c', '-c', crossrpms)
+ self.run('../../bootstrap', '-c', crossrpms)
+ self.run('./configure', '-c', crossrpms)
</font> self._install_files(self.get_specs(crossrpms), os.path.join(path, 'SPECS'))
self._install_files(self.get_patches(crossrpms), os.path.join(path, 'SOURCES'))
</pre>
<p> </p>
<p>--<br />
<small>Generated by <a href="http://www.codewiz.org/projects/index.html#loginfo">Deluxe Loginfo</a> 2.122 by Bernardo Innocenti <bernie@develer.com></small></p>
</body>
</html>