rtems-bsp-builder: Refactor for better config format, warnings and errors.

Refactor the code to improve the warnings and errors reporting.

Improve the configuration file format to better support any type
of build by separating the flags away from the builds.

1 files changed, 45 insertions, 26 deletions

diff --git a/tester/rtems/rtems-bsps.ini b/tester/rtems/rtems-bsps.ini
index ad63e6d..a88aced 100644
--- a/tester/rtems/rtems-bsps.ini
+++ b/tester/rtems/rtems-bsps.ini
@@ -1,9 +1,9 @@
 #
 # RTEMS Tools Project (http://www.rtems.org/)
-# Copyright 2016 Chris Johns (chrisj@rtems.org)
+# Copyright 2016-2017 Chris Johns (chrisj@rtems.org)
 # All rights reserved.
 #
-# This file is part of the RTEMS Tools package in 'rtems-bdp-builder'.
+# This file is part of the RTEMS Tools package in 'rtems-bsp-builder'.
 #
 # Permission to use, copy, modify, and/or distribute this software for any
 # purpose with or without fee is hereby granted, provided that the above
@@ -29,7 +29,7 @@ bsps_arm = altcycv_devkit,
     altcycv_devkit_smp,
     xilinx_zynq_zc702, xilinx_zynq_zc706, xilinx_zynq_zedboard
 bsps_i386 = pc686
-bsps_sparc = erc32
+bsps_sparc = leon2, leon3
 
 #
 # Tier 2: no build errors and no unexpected tests failures on hardware and
@@ -40,8 +40,7 @@ archs = arm, sparc
 bsps_arm = lm3s6965_qemu,
     realview_pbx_a9_qemu, realview_pbx_a9_qemu_smp,
     xilinx_zynq_a9_qemu
-bsps_sparc = sis
-
+bsps_sparc = erc32
 #
 # Tier 3: no build errors, no tests run.
 #
@@ -143,7 +142,7 @@ bspopts_pc686 = BSP_PRINT_EXCEPTION_CONTEXT=1
 bsps = moxiesim
 
 [sparc]
-bsps = erc32, sis
+bsps = erc32, leon2, leon3
 
 [powerpc]
 bsps =
@@ -160,45 +159,65 @@ bsps = epiphany-sim
 #
 default = all
 #
-# The variations, basic is just a BSP build and all is the maximum number of
-# variations.
+# A default build with tests
 #
-variations = basic, all
+tests = config:base, config:tests
 #
-# The variations, default is Yes and can be overriden in an architecture.
+# A default build without tests
 #
-basic = standard
+no-tests = config:base
 #
 # The all, default is Yes and can be overriden in an architecture.
 #
 all = debug, profiling, smp, smp-debug,
-      posix, no-posix, posix-debug, posix-profiling, posix-smp,
-      network, no-network, network-debug, smp-network, smp-network-debug
+      posix, no-posix, posix-debug, posix-profiling,
+      network, no-network, network-debug,
+      smp-network, smp-network-debug
+#
+# The options for each varations.
+#
+debug             = config:base, config:tests, config:debug
+profiling         = config:base, config:tests, config:profiling
+smp               = config:base, config:tests, config:smp
+smp-debug         = config:base, config:tests, config:smp, config:debug
+posix             = config:base, config:tests, config:posix
+no-posix          = config:base, config:tests, config:no-posix
+posix-debug       = config:base, config:tests, config:posix, config:debug
+posix-profiling   = config:base, config:tests, config:posix, config:profiling
+network           = config:base, config:tests, config:network
+no-network        = config:base, config:tests, config:no-network
+network-debug     = config:base, config:tests, config:network, config:debug
+smp-network       = config:base, config:tests, config:smp, config:network
+smp-network-debug = config:base, config:tests, config:smp, config:network,
+                    config:debug
+
+#
+# The config section holds the configuration options used in the builds.
+#
+[config]
+#
+# Base set of configure options every build needs.
+#
+base = --target=@ARCH@-rtems@RTEMS_VERSION@
+       --enable-rtemsbsp=@BSP@
+       --prefix=@PREFIX@
 #
-# The base build options, tests the default configuration, all variations are
-# added on.
+# Tests.
 #
-standard = --target=@ARCH@-rtems@RTEMS_VERSION@
-           --enable-rtemsbsp=@BSP@
-           --prefix=@PREFIX@
-           --enable-tests
+tests = --enable-tests
 #
 # The options for each varations.
 #
 debug             = --enable-debug
+no-debug          = --disable-debug
 profiling         = --enable-profiling
+no-profiling      = --disable-profiling
 smp               = --enable-smp
-smp-debug         = --enable-smp --enable-debug
+no-smp            = --disable-smp
 posix             = --enable-posix
 no-posix          = --disable-posix
-posix-debug       = --enable-posix --enable-debug
-posix-profiling   = --enable-posix --enable-profiling
-posix-smp         = --enable-posix --enable-smp
 network           = --enable-networking
 no-network        = --disable-networking
-network-debug     = --enable-debug --enable-networking
-smp-network       = --enable-smp --enable-networking
-smp-network-debug = --enable-smp --enable-debug --enable-networking
 
 #
 # Define how each profile is to be treated. Note, hardware vs simulator testing