Commize rootfs and toolchain summaries

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

3 files changed, 50 insertions, 52 deletions

diff --git a/core/mk/buildsystem.mk b/core/mk/buildsystem.mk
index ccaedb5..1d8a3b5 100644
--- a/core/mk/buildsystem.mk
+++ b/core/mk/buildsystem.mk
@@ -87,37 +87,8 @@ endef
 
 define __embtk_mk_print_selectedfeatures
 	$(call embtk_pinfo,"Starting build of selected features...")
-	$(call embtk_echo_blue," ~~~~~~~~~~~ ")
-	$(call embtk_echo_blue,"| Toolchain |")
-	$(call embtk_echo_blue," ~~~~~~~~~~~ ")
-	$(call embtk_echo_blue,"\tEmbToolkit          : v$(EMBTK_VERSION)")
-	$(call embtk_echo_blue,"\tArchitecture        : $(LINUX_ARCH) ($(EMBTK_MCU_FLAG))")
-	$(call embtk_echo_blue,"\tLinux kernel headers: linux-$(call __embtk_pkg_version,linux)")
-	$(call embtk_echo_blue,"\tBinutils            : binutils-$(call  __embtk_pkg_version,binutils)")
-	$(if $(CONFIG_EMBTK_HAVE_LLVM),
-	$(call embtk_echo_blue,"\tCLANG/LLVM          : clang/llvm-$(call __embtk_pkg_version,llvm)"))
-	$(call embtk_echo_blue,"\tGCC                 : gcc-$(call __embtk_pkg_version,gcc)")
-	$(call embtk_echo_blue,"\tC library           : $(call __embtk_pkg_name,$(embtk_clib))-$(call __embtk_pkg_version,$(embtk_clib))")
-	$(if $(CONFIG_EMBTK_HAVE_GDB_SYSTEM),
-	$(call embtk_echo_blue,"\tGDB                 : gdb-$(call __embtk_pkg_version,gdb)"))
-	$(if $(CONFIG_EMBTK_HAVE_STRACE),
-	$(call embtk_echo_blue,"\tStrace              : strace-$(call __embtk_pkg_version,strace)"))
-	$(call embtk_echo_blue," ~~~~~~~~~~~~ ")
-	$(call embtk_echo_blue,"| Host tools |")
-	$(call embtk_echo_blue," ~~~~~~~~~~~~ ")
-	$(call embtk_echo_blue,"\tNumber of host tools packages needed:$(__embtk_hosttools_nrpkgs-y)")
-	$(if $(CONFIG_EMBTK_HAVE_ROOTFS),
-		$(call embtk_echo_blue," ~~~~~~~~~~~~~~~~~~ ")
-		$(call embtk_echo_blue,"| Root FS packages |")
-		$(call embtk_echo_blue," ~~~~~~~~~~~~~~~~~~ ")
-		$(call embtk_echo_blue,"\tNumber of root FS packages:$(__embtk_rootfs_nrpkgs-y)")
-		$(call embtk_echo_blue," ~~~~~~~~~~~~~~~ ")
-		$(call embtk_echo_blue,"| Root FS types |")
-		$(call embtk_echo_blue," ~~~~~~~~~~~~~~~ ")
-		$(call embtk_echo_blue,"\tTAR.BZ2    : Yes")
-		$(call embtk_echo_blue,"\tInitramfs  : $(if $(CONFIG_EMBTK_ROOTFS_HAVE_INITRAMFS_CPIO),Yes,No)")
-		$(call embtk_echo_blue,"\tsquashFS   : $(if $(CONFIG_EMBTK_ROOTFS_HAVE_SQUASHFS),Yes,No)")
-		$(call embtk_echo_blue,"\tJFFS2      : $(if $(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2),Yes,No)"))
+	$(help_toolchain_summary)
+	$(help_rootfs_summary)
 endef
 
 __embtk_mk_startbuild-y						:= toolchain_install
diff --git a/core/mk/help.mk b/core/mk/help.mk
index 02ccd6a..e826661 100644
--- a/core/mk/help.mk
+++ b/core/mk/help.mk
@@ -72,33 +72,16 @@ help:
 
 # Successful build of EmbToolkit message
 successful_build:
-	$(call embtk_echo_blue," ~~~~~~~~~~~~~~~~~~~~~ ")
-	$(call embtk_echo_blue,"| Toolchain build log |")
-	$(call embtk_echo_blue," ~~~~~~~~~~~~~~~~~~~~~ ")
-	$(call embtk_echo_blue,"$(GNU_TARGET) ($(EMBTK_MCU_FLAG)) toolchain successfully generated.")
-	$(call embtk_echo_blue,"Generated tools (compilers, Binutils, etc.) are in:")
-	$(call embtk_echo_blue,"    $(embtk_tools)/bin")
-	$(call embtk_echo_blue,"The packaged toolchain (for external use) is in:")
-	$(call embtk_echo_blue,"    $(embtk_generated)")
-	@echo
-	$(call embtk_echo_blue," ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ")
-	$(call embtk_echo_blue,"| Root file system build log |")
-	$(call embtk_echo_blue," ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ")
-ifeq ($(CONFIG_EMBTK_HAVE_ROOTFS),y)
-	$(call embtk_echo_blue,"Generated root filesystems are located in the")
-	$(call embtk_echo_blue,"'generated' sub-directory of EmbToolkit.")
-else
-	$(call embtk_echo_green,"Build of root filesystem not selected.")
-endif
-	@echo
+	$(help_toolchain_summary)
+	$(help_rootfs_summary)
 	$(call embtk_echo_blue," ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ")
 	$(call embtk_echo_blue,"| Embedded systems Toolkit   |")
 	$(call embtk_echo_blue," ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ")
 	$(call embtk_echo_blue,"We hope that EmbToolkit will be useful for your project !!!")
 	$(call embtk_echo_blue,"We will be happy to know it at embtk-users@embtoolkit.org")
+	@echo
 	$(call embtk_echo_blue,"Please report any bugs/suggestion at:")
 	$(call embtk_echo_blue,"   $(EMBTK_BUGURL)")
-	$(call embtk_echo_blue,"You can also visit the wiki at:")
+	$(call embtk_echo_blue,"You can also visit the project web site at:")
 	$(call embtk_echo_blue,"   http://www.embtoolkit.org")
-	@echo
 	$(call embtk_echo_blue,$(__embtk_msg_h))
diff --git a/core/mk/macros.mk b/core/mk/macros.mk
index f0e44cf..0ec78a9 100644
--- a/core/mk/macros.mk
+++ b/core/mk/macros.mk
@@ -122,6 +122,7 @@ endef
 
 #
 # Packages management macros
+#
 include core/mk/pkg-macros/vars.mk
 include core/mk/pkg-macros/incl.mk
 include core/mk/pkg-macros/pkg-config.mk
@@ -130,3 +131,46 @@ include core/mk/pkg-macros/download.mk
 include core/mk/pkg-macros/configure.mk
 include core/mk/pkg-macros/install.mk
 include core/mk/pkg-macros/clean.mk
+
+#
+# help macros
+#
+define help_toolchain_summary
+	$(call embtk_echo_blue," ~~~~~~~~~~~ ")
+	$(call embtk_echo_blue,"| Toolchain |")
+	$(call embtk_echo_blue," ~~~~~~~~~~~ ")
+	$(call embtk_echo_blue,"\tArchitecture        : $(LINUX_ARCH) ($(EMBTK_MCU_FLAG))")
+	$(call embtk_echo_blue,"\tLinux kernel headers: linux-$(call __embtk_pkg_version,linux)")
+	$(call embtk_echo_blue,"\tBinutils            : binutils-$(call  __embtk_pkg_version,binutils)")
+	$(if $(CONFIG_EMBTK_HOST_HAVE_LLVM),
+	$(call embtk_echo_blue,"\tCLANG/LLVM          : clang/llvm-$(call __embtk_pkg_version,llvm_host)"))
+	$(call embtk_echo_blue,"\tGCC                 : gcc-$(call __embtk_pkg_version,gcc)")
+	$(call embtk_echo_blue,"\tC library           : $(call __embtk_pkg_name,$(embtk_clib))-$(call __embtk_pkg_version,$(embtk_clib))")
+	$(if $(CONFIG_EMBTK_HAVE_GDB_SYSTEM),
+	$(call embtk_echo_blue,"\tGDB                 : gdb-$(call __embtk_pkg_version,gdb)"))
+	$(if $(CONFIG_EMBTK_HAVE_STRACE),
+	$(call embtk_echo_blue,"\tStrace              : strace-$(call __embtk_pkg_version,strace)"))
+	$(call embtk_echo_blue,"\tToolchain location  :")
+	$(call embtk_echo_blue,"\t|\`-->generated")
+	$(call embtk_echo_blue,"\t|    |\`-->[ sysroot ] $(notdir $(embtk_sysroot))")
+	$(call embtk_echo_blue,"\t|     \`-->[ xtools  ] $(notdir $(embtk_tools))")
+	$(call embtk_echo_blue,"\t\`-->generated/toolchains")
+	$(call embtk_echo_blue,"\t      \`-->[ tarball ] toolchain-$(__xtools_archos)-$(__xtools_bins)-$(__xtools_env)")
+endef
+
+define help_rootfs_summary
+	$(if $(CONFIG_EMBTK_HAVE_ROOTFS),
+	$(call embtk_echo_blue," ~~~~~~~~~~~~~~~~~~ ")
+	$(call embtk_echo_blue,"| Root FS packages |")
+	$(call embtk_echo_blue," ~~~~~~~~~~~~~~~~~~ ")
+	$(call embtk_echo_blue,"\tNumber of root FS packages:$(__embtk_rootfs_nrpkgs-y)")
+	$(call embtk_echo_blue," ~~~~~~~~~~~~~~~ ")
+	$(call embtk_echo_blue,"| Root FS types |")
+	$(call embtk_echo_blue," ~~~~~~~~~~~~~~~ ")
+	$(call embtk_echo_blue,"\tTAR.BZ2        : Yes")
+	$(call embtk_echo_blue,"\tInitramfs      : $(if $(CONFIG_EMBTK_ROOTFS_HAVE_INITRAMFS_CPIO),Yes,No)")
+	$(call embtk_echo_blue,"\tsquashFS       : $(if $(CONFIG_EMBTK_ROOTFS_HAVE_SQUASHFS),Yes,No)")
+	$(call embtk_echo_blue,"\tJFFS2          : $(if $(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2),Yes,No)")
+	$(call embtk_echo_blue,"\tRootFS location:")
+	$(call embtk_echo_blue,"\t\`-->generated"))
+endef