From 1f81cdc276011e35002013ef523958c35a77be1d Mon Sep 17 00:00:00 2001 From: Kevin Day Date: Sun, 28 Jul 2024 21:44:39 -0500 Subject: [PATCH] Cleanup: Stand alone build settings. --- data/build/stand_alone/fakefile | 11 ++++------- data/build/stand_alone/settings.controller | 3 +-- data/build/stand_alone/settings.init | 11 ++--------- 3 files changed, 7 insertions(+), 18 deletions(-) diff --git a/data/build/stand_alone/fakefile b/data/build/stand_alone/fakefile index 19000ad..defc0d5 100644 --- a/data/build/stand_alone/fakefile +++ b/data/build/stand_alone/fakefile @@ -29,17 +29,14 @@ main_init: build settings.init install: - shell ./install.sh parameter:'work' parameter:'verbosity' parameter:'color' - shell ./install.sh parameter:'work' parameter:'verbosity' parameter:'color' -s data/build/settings.controller - shell ./install.sh parameter:'work' parameter:'verbosity' parameter:'color' -s data/build/settings.init + shell ./install.sh parameter:'work' parameter:'verbosity' parameter:'color' -s data/build/stand_alone/settings.controller + shell ./install.sh parameter:'work' parameter:'verbosity' parameter:'color' -s data/build/stand_alone/settings.init install_controller: - shell ./install.sh parameter:'work' parameter:'verbosity' parameter:'color' - shell ./install.sh parameter:'work' parameter:'verbosity' parameter:'color' -s data/build/settings.controller + shell ./install.sh parameter:'work' parameter:'verbosity' parameter:'color' -s data/build/stand_alone/settings.controller install_init: - shell ./install.sh parameter:'work' parameter:'verbosity' parameter:'color' - shell ./install.sh parameter:'work' parameter:'verbosity' parameter:'color' -s data/build/settings.init + shell ./install.sh parameter:'work' parameter:'verbosity' parameter:'color' -s data/build/stand_alone/settings.init help: print diff --git a/data/build/stand_alone/settings.controller b/data/build/stand_alone/settings.controller index 0c0ed0b..b9e713b 100644 --- a/data/build/stand_alone/settings.controller +++ b/data/build/stand_alone/settings.controller @@ -10,7 +10,6 @@ # - coverage: Compile for building coverage. # - fanalyzer: Compile using GCC's -fanalyzer compile time option. # - gcc: Use GCC specific settings. -# - stand_alone: The stand alone build mode, which in general should always be used. # - test: Compile for a test, such as unit testing. # - thread: Compile with thread support. # - threadless: Compile without thread support. @@ -24,7 +23,7 @@ version_micro 0 version_file micro version_target minor -modes clang coverage fanalyzer gcc stand_alone test thread threadless +modes clang coverage fanalyzer gcc test thread threadless modes_default thread gcc build_compiler gcc diff --git a/data/build/stand_alone/settings.init b/data/build/stand_alone/settings.init index d2b618d..525ba11 100644 --- a/data/build/stand_alone/settings.init +++ b/data/build/stand_alone/settings.init @@ -2,21 +2,14 @@ # # See the fakefile for details about the stand alone build. # -# This requires that the sources structure to be changed. -# The FLL sources from the monolithic package must be dropped into the sources directory under the fll sub-directory (which must be created). -# The Controller sources must be dropped into the sources directory under the program sub-directory (which must be created). -# -# The data/build/stand_alone/config.h should be copied to sources/c/config.h. -# # This can be built directly via: -# fake -s data/build/stand_alone/settings.init clean build +# fake -s data/build/stand_alone/settings.init clean build # # Modes: # - clang: Use clang rather than the default, which is generally GCC. # - coverage: Compile for building coverage. # - fanalyzer: Compile using GCC's -fanalyzer compile time option. # - gcc: Use GCC specific settings. -# - stand_alone: The stand alone build mode, which in general should always be used. # - test: Compile for a test, such as unit testing. # - thread: Compile with thread support. # - threadless: Compile without thread support. @@ -30,7 +23,7 @@ version_micro 0 version_file micro version_target minor -modes clang coverage fanalyzer gcc stand_alone test thread threadless +modes clang coverage fanalyzer gcc test thread threadless modes_default thread gcc build_compiler gcc -- 1.8.3.1