<!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 (2011-06-11)</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>2011-06-09 Chris Johns <chrisj@rtems.org>
* specbuilder/specbuilder/build.py,
specbuilder/specbuilder/crossgcc.py,
specbuilder/specbuilder/defaults.py,
specbuilder/specbuilder/linux.py,
specbuilder/specbuilder/spec.py: Add CentOS support for older
Pythons. Add options to build the tools with specific flags.
</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.8&r2=text&tr2=1.9&diff_format=h">M</a></td><td width='1%'>1.9</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/build.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/build.py</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-tools/specbuilder/specbuilder/crossgcc.py.diff?r1=text&tr1=1.2&r2=text&tr2=1.3&diff_format=h">M</a></td><td width='1%'>1.3</td><td width='100%'>specbuilder/specbuilder/crossgcc.py</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.7&r2=text&tr2=1.8&diff_format=h">M</a></td><td width='1%'>1.8</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/linux.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/linux.py</td></tr>
<tr><td width='1%'><a href="http://www.rtems.com/cgi-bin/viewcvs.cgi//rtems-tools/specbuilder/specbuilder/spec.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/spec.py</td></tr>
</table>
<pre>
<font color='#006600'>diff -u rtems-tools/ChangeLog:1.8 rtems-tools/ChangeLog:1.9
--- rtems-tools/ChangeLog:1.8 Mon Feb 21 21:46:44 2011
+++ rtems-tools/ChangeLog Thu Jun 9 00:59:32 2011
</font><font color='#997700'>@@ -1,3 +1,12 @@
</font><font color='#000088'>+2011-06-09 Chris Johns <chrisj@rtems.org>
+
+ * specbuilder/specbuilder/build.py,
+ specbuilder/specbuilder/crossgcc.py,
+ specbuilder/specbuilder/defaults.py,
+ specbuilder/specbuilder/linux.py,
+ specbuilder/specbuilder/spec.py: Add CentOS support for older
+ Pythons. Add options to build the tools with specific flags.
+
</font> 2011-02-22 Chris Johns <chrisj@rtems.org>
* specbuilder/sb-versions, specbuilder/specbuilder/version.py:
<font color='#006600'>diff -u rtems-tools/specbuilder/specbuilder/build.py:1.3 rtems-tools/specbuilder/specbuilder/build.py:1.4
--- rtems-tools/specbuilder/specbuilder/build.py:1.3 Mon Feb 21 21:46:44 2011
+++ rtems-tools/specbuilder/specbuilder/build.py Thu Jun 9 00:59:32 2011
</font><font color='#997700'>@@ -84,9 +84,12 @@
</font> stat.S_IROTH | stat.S_IXOTH)
except IOError, err:
raise error.general('creating script: ' + name)
<font color='#880000'>- finally:
</font><font color='#000088'>+ except:
</font> if s is not None:
s.close()
<font color='#000088'>+ raise
+ if s is not None:
+ s.close()
</font>
class build:
"""Build a package given a spec file."""
<font color='#997700'>@@ -132,7 +135,7 @@
</font> for base in url_bases:
if base[-1:] != '/':
base += '/'
<font color='#880000'>- url_path = urlparse.urlsplit(url).path
</font><font color='#000088'>+ url_path = urlparse.urlsplit(url)[2]
</font> slash = url_path.rfind('/')
if slash < 0:
url_file = url_path
<font color='#997700'>@@ -155,9 +158,12 @@
</font> if os.path.exists(local):
os.remove(local)
failed = True
<font color='#880000'>- finally:
</font><font color='#000088'>+ except:
</font> if _out is not None:
_out.close()
<font color='#000088'>+ raise
+ if _out is not None:
+ _out.close()
</font> if _in is not None:
del _in
if not failed:
<font color='#006600'>diff -u rtems-tools/specbuilder/specbuilder/crossgcc.py:1.2 rtems-tools/specbuilder/specbuilder/crossgcc.py:1.3
--- rtems-tools/specbuilder/specbuilder/crossgcc.py:1.2 Mon Feb 21 21:46:44 2011
+++ rtems-tools/specbuilder/specbuilder/crossgcc.py Thu Jun 9 00:59:32 2011
</font><font color='#997700'>@@ -86,7 +86,8 @@
</font>
def every_package(self, _build, path):
self.copy(_build.spec.abspath('%{buildroot}'), path)
<font color='#880000'>- _build.cleanup()
</font><font color='#000088'>+ if not self.opts.no_clean():
+ _build.cleanup()
</font>
def last_package(self, _build, path):
tar = os.path.join('%{_rpmdir}', self.arch + '-tools.tar.bz2')
<font color='#997700'>@@ -129,8 +130,10 @@
</font> if s == len(arch_specs) - 1:
self.last_package(b, path)
del b
<font color='#880000'>- finally:
</font><font color='#000088'>+ except:
</font> os.environ['PATH'] = current_path
<font color='#000088'>+ raise
+ os.environ['PATH'] = current_path
</font>
def run():
import sys
<font color='#006600'>diff -u rtems-tools/specbuilder/specbuilder/defaults.py:1.7 rtems-tools/specbuilder/specbuilder/defaults.py:1.8
--- rtems-tools/specbuilder/specbuilder/defaults.py:1.7 Mon Feb 21 21:46:44 2011
+++ rtems-tools/specbuilder/specbuilder/defaults.py Thu Jun 9 00:59:32 2011
</font><font color='#997700'>@@ -75,6 +75,9 @@
</font> %{?buildroot:RPM_BUILD_ROOT="%{buildroot}"}
export RPM_BUILD_ROOT
%{?_javaclasspath:CLASSPATH="%{_javaclasspath}"; export CLASSPATH}
<font color='#000088'>+%{?_targetcflags:CFLAGS_FOR_TARGET="%{_targetcflags}"}
+%{?_targetcxxflags:CXXFLAGS_FOR_TARGET="%{_targetcxxflags}"}
+export CFLAGS_FOR_TARGET
</font> LANG=C
export LANG
unset DISPLAY || :
<font color='#997700'>@@ -184,17 +187,20 @@
</font> 'no-smp' : '0',
'rebuild' : '0' }
<font color='#880000'>- _long_opts = { '--prefix' : '_prefix',
- '--prefixbase' : '_prefixbase',
- '--topdir' : '_topdir',
- '--specdir' : '_specdir',
- '--builddir' : '_builddir',
- '--sourcedir' : '_sourcedir',
- '--usrlibrpm' : '_usrlibrpm',
- '--tmppath' : '_tmppath',
- '--log' : '_logfile',
- '--url' : '_url_base',
- '--rtems' : '_rtemssrc' }
</font><font color='#000088'>+ _long_opts = { '--prefix' : '_prefix',
+ '--prefixbase' : '_prefixbase',
+ '--topdir' : '_topdir',
+ '--specdir' : '_specdir',
+ '--builddir' : '_builddir',
+ '--sourcedir' : '_sourcedir',
+ '--usrlibrpm' : '_usrlibrpm',
+ '--tmppath' : '_tmppath',
+ '--log' : '_logfile',
+ '--url' : '_url_base',
+ '--rtems' : '_rtemssrc',
+ '--targetcflags' : '_targetcflags',
+ '--targetcxxflags' : '_targetcxxflags',
+ '--libstdcxxflags' : '_libstdcxxflags' }
</font>
_long_true_opts = { '--trace' : '_trace',
'--dry-run' : '_dry_run',
<font color='#006600'>diff -u rtems-tools/specbuilder/specbuilder/linux.py:1.1 rtems-tools/specbuilder/specbuilder/linux.py:1.2
--- rtems-tools/specbuilder/specbuilder/linux.py:1.1 Mon Aug 30 19:58:45 2010
+++ rtems-tools/specbuilder/specbuilder/linux.py Thu Jun 9 00:59:32 2011
</font><font color='#997700'>@@ -42,7 +42,7 @@
</font> for l in output.split('\n'):<span style="background-color: #FF0000"><CR></span>
count = l.split(':')[1].strip()<span style="background-color: #FF0000"><CR></span>
if count > cpus:<span style="background-color: #FF0000"><CR></span>
<font color='#880000'>- cpus = count<span style="background-color: #FF0000"><CR></span>
</font><font color='#000088'>+ cpus = int(count)<span style="background-color: #FF0000"><CR></span>
</font> if cpus > 0:<span style="background-color: #FF0000"><CR></span>
smp_mflags = '-j%d' % (cpus) <span style="background-color: #FF0000"><CR></span>
defines = { <span style="background-color: #FF0000"><CR></span>
<font color='#997700'>@@ -57,7 +57,7 @@
</font> '_var': '/usr/var',<span style="background-color: #FF0000"><CR></span>
'optflags': '-O2 -fasynchronous-unwind-tables',<span style="background-color: #FF0000"><CR></span>
'_smp_mflags': smp_mflags,<span style="background-color: #FF0000"><CR></span>
<font color='#880000'>- '__bzip2': '/bin/bzip2',<span style="background-color: #FF0000"><CR></span>
</font><font color='#000088'>+ '__bzip2': '/usr/bin/bzip2',<span style="background-color: #FF0000"><CR></span>
</font> '__gzip': '/bin/gzip',<span style="background-color: #FF0000"><CR></span>
'__tar': '/bin/tar'<span style="background-color: #FF0000"><CR></span>
}<span style="background-color: #FF0000"><CR></span>
<font color='#006600'>diff -u rtems-tools/specbuilder/specbuilder/spec.py:1.3 rtems-tools/specbuilder/specbuilder/spec.py:1.4
--- rtems-tools/specbuilder/specbuilder/spec.py:1.3 Mon Feb 21 21:46:44 2011
+++ rtems-tools/specbuilder/specbuilder/spec.py Thu Jun 9 00:59:32 2011
</font><font color='#997700'>@@ -717,8 +717,10 @@
</font> else:
self._error("invalid parse state: '" + r[0] + "'")
self._directive_extend(dir, data)
<font color='#880000'>- finally:
</font><font color='#000088'>+ except:
</font> spec.close()
<font color='#000088'>+ raise
+ spec.close()
</font>
def define(self, name):
if name.lower() in self.defines:
</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>