change log for rtems-tools (2010-08-28)

rtems-vc at rtems.org rtems-vc at rtems.org
Sat Aug 28 23:10:21 UTC 2010


 *ccj*:
2010-08-29      Chris Johns <chrisj at rtems.org>

        * specbuilder/specbuilder/defaults.py: Add default configure
        macro. Add --dry-run to the parsed arguments. Fix the case when
        run on a new host that does not have default support.

M    1.6  ChangeLog
M    1.5  specbuilder/specbuilder/defaults.py

diff -u rtems-tools/ChangeLog:1.5 rtems-tools/ChangeLog:1.6
--- rtems-tools/ChangeLog:1.5	Thu Aug 12 23:40:44 2010
+++ rtems-tools/ChangeLog	Sat Aug 28 18:01:20 2010
@@ -1,3 +1,9 @@
+2010-08-29	Chris Johns <chrisj at rtems.org>
+
+	* specbuilder/specbuilder/defaults.py: Add default configure
+	macro. Add --dry-run to the parsed arguments. Fix the case when
+	run on a new host that does not have default support.
+	
 2010-08-13	Chris Johns <chrisj at rtems.org>
 
 	* specbuilder/specbuilder/defaults.py: Provide a default shell.

diff -u rtems-tools/specbuilder/specbuilder/defaults.py:1.4 rtems-tools/specbuilder/specbuilder/defaults.py:1.5
--- rtems-tools/specbuilder/specbuilder/defaults.py:1.4	Thu Aug 12 23:40:44 2010
+++ rtems-tools/specbuilder/specbuilder/defaults.py	Sat Aug 28 18:01:20 2010
@@ -148,6 +148,26 @@
 '_usrsrc':             '%{_usr}/src',
 '_var':                '/usr/local/var',
 '_varrun':             '%{_var}/run',
+'configure': '''
+CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; 
+CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; 
+FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; 
+./configure --build=%{_build} --host=%{_host} \
+      --target=%{_target_platform} \
+      --program-prefix=%{?_program_prefix} \
+      --prefix=%{_prefix} \
+      --exec-prefix=%{_exec_prefix} \
+      --bindir=%{_bindir} \
+      --sbindir=%{_sbindir} \
+      --sysconfdir=%{_sysconfdir} \
+      --datadir=%{_datadir} \
+      --includedir=%{_includedir} \
+      --libdir=%{_libdir} \
+      --libexecdir=%{_libexecdir} \
+      --localstatedir=%{_localstatedir} \
+      --sharedstatedir=%{_sharedstatedir} \
+      --mandir=%{_mandir} \
+      --infodir=%{_infodir}''',
 'nil':                 ''
 }
 
@@ -176,6 +196,7 @@
                    '--rtems'      : '_rtemssrc' }
 
     _long_true_opts = { '--trace'    : '_trace',
+                        '--dry-run'  : '_dry_run',
                         '--warn-all' : '_warn_all',
                         '--no-clean' : '_no_clean',
                         '--no-smp'   : '_no_smp',
@@ -398,12 +419,15 @@
     if uname[0] == 'Darwin':
         import darwin
         overrides = darwin.load()
+    if overrides is None:
+        raise error.general('no hosts defaults found; please add')
     for k in overrides:
         d[k] = overrides[k]
     import rtems
     overrides = rtems.load()
-    for k in overrides:
-        d[k] = overrides[k]
+    if overrides is not None:
+        for k in overrides:
+            d[k] = overrides[k]
     o = command_line(args)
     for k in o.defaults:
         d[k] = o.defaults[k]



--

Generated by Deluxe Loginfo [http://www.codewiz.org/projects/index.html#loginfo] 2.122 by Bernardo Innocenti <bernie at develer.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.rtems.org/pipermail/vc/attachments/20100828/3f64db26/attachment.html>


More information about the vc mailing list