From a73d15f6bcefa1494fe057a77cfa1e5b87be6ee1 Mon Sep 17 00:00:00 2001
From: thomas-bc <thomas.boyerchammard@gmail.com>
Date: Wed, 11 Oct 2023 10:24:22 -0700
Subject: [PATCH] Remove old impl target

---
 src/fprime/fbuild/target_definitions.py | 18 ------------------
 src/fprime/fpp/impl.py                  |  4 ++--
 src/fprime/util/help_text.py            |  8 ++++----
 3 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/src/fprime/fbuild/target_definitions.py b/src/fprime/fbuild/target_definitions.py
index 8b4c706f..b587dd1a 100644
--- a/src/fprime/fbuild/target_definitions.py
+++ b/src/fprime/fbuild/target_definitions.py
@@ -32,24 +32,6 @@
     build_type=BuildType.BUILD_TESTING,
 )
 
-
-#### Implementation targets ####
-BuildSystemTarget(
-    "impl",
-    mnemonic="impl",
-    desc="Generate implementation template files",
-    scope=TargetScope.LOCAL,
-)
-BuildSystemTarget(
-    "testimpl",
-    mnemonic="impl",
-    desc="Generate unit test files",
-    flags={"ut"},
-    build_type=BuildType.BUILD_TESTING,
-    scope=TargetScope.LOCAL,
-)
-
-
 #### Check targets ####
 check = BuildSystemTarget(
     "check",
diff --git a/src/fprime/fpp/impl.py b/src/fprime/fpp/impl.py
index ce782e30..21da06f0 100644
--- a/src/fprime/fpp/impl.py
+++ b/src/fprime/fpp/impl.py
@@ -136,7 +136,7 @@ def add_fpp_impl_parsers(
         Tuple of dictionary mapping command name to processor, and command to parser
     """
     impl_parser = subparsers.add_parser(
-        "fpp_impl",
+        "impl",
         help="Generate implementation templates",
         parents=[common],
         add_help=False,
@@ -153,4 +153,4 @@ def add_fpp_impl_parsers(
         help="Disable formatting (using clang-format) of generated files",
         required=False,
     )
-    return {"fpp_impl": run_fpp_impl}, {"fpp_impl": impl_parser}
+    return {"impl": run_fpp_impl}, {"impl": impl_parser}
diff --git a/src/fprime/util/help_text.py b/src/fprime/util/help_text.py
index 57047070..a3c1c315 100644
--- a/src/fprime/util/help_text.py
+++ b/src/fprime/util/help_text.py
@@ -135,12 +135,12 @@
 
 '{EXECUTABLE} impl' generates the implementation templates for the specified directory ('-p/--path' or current working
 directory). Implementation generation is only available for component directories and should not be used on deployments.
-Two files will be created <component>.cpp-template and <component>.hpp-template. These contain the fill-in base code for
+Two files will be created <component>.template.cpp and <component>.template.hpp. These contain the fill-in base code for
 the component implementation as defined by the component's model. 
 
-When the '--ut' flag is specified the unit test implementation templates are created instead. The user should use the
-Tester.cpp, Tester.hpp and TestMain.cpp files as their fill-in templates. Other files created can be safely removed as
-they will be regenerated at build time.
+When the '--ut' flag is specified the unit test implementation templates are created instead, under <path>/test/ut. The
+user should use the Tester.cpp, Tester.hpp and TestMain.cpp files as their fill-in templates. Other files created can be
+safely removed as they will be regenerated at build time.
 
 Example: