Build system: generalize use of embtk_{pinfo,perror,pwarning} in place of existing print macros

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

11 files changed, 52 insertions, 50 deletions

diff --git a/mk/cmake.mk b/mk/cmake.mk
index 86903b1..5b1cdf7 100644
--- a/mk/cmake.mk
+++ b/mk/cmake.mk
@@ -43,21 +43,21 @@ $(CMAKE_BUILD_DIR)/.installed: download_cmake \
 	@touch $@
 
 download_cmake:
-	$(call embtk_generic_message,"Downloading $(CMAKE_PACKAGE) if \
+	$(call embtk_pinfo,"Downloading $(CMAKE_PACKAGE) if \
 	necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(CMAKE_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(CMAKE_PACKAGE) \
 	$(CMAKE_SITE)/$(CMAKE_PACKAGE)
 
 $(CMAKE_BUILD_DIR)/.decompressed:
-	$(call embtk_generic_message,"Decompressing $(CMAKE_PACKAGE)...")
+	$(call embtk_pinfo,"Decompressing $(CMAKE_PACKAGE)...")
 	@tar -C $(TOOLS_BUILD) -xzf $(DOWNLOAD_DIR)/$(CMAKE_PACKAGE)
 	@mkdir -p $(CMAKE_BUILD_DIR)
 	@mkdir -p $(CMAKE_DIR)
 	@touch $@
 
 $(CMAKE_BUILD_DIR)/.configured:
-	$(call embtk_generic_message,"Configuring \
+	$(call embtk_pinfo,"Configuring \
 	cmake_$(CMAKE_VERSION)...")
 	@cd $(CMAKE_BUILD_DIR); \
 	$(TOOLS_BUILD)/cmake-$(CMAKE_VERSION)/configure \
diff --git a/mk/eglibc.mk b/mk/eglibc.mk
index 79ad46c..9233ca3 100644
--- a/mk/eglibc.mk
+++ b/mk/eglibc.mk
@@ -51,10 +51,10 @@ EGLIBC_VERSIONING_OPTION := \
 OPTION_GROUPS_FILE = $(EMBTK_ROOT)/mk/eglibc/eglibc-$(EGLIBC_VERSION)-options.mk
 
 eglibc_headers_install: $(EGLIBC_HEADERS_BUILD_DIR)/.installed
-	$(call embtk_generic_msg,"eglibc headers installed")
+	$(call embtk_pinfo,"eglibc headers installed")
 
 eglibc_install: $(EGLIBC_BUILD_DIR)/.installed
-	$(call embtk_generic_msg,"eglibc lbraries and headers installed")
+	$(call embtk_pinfo,"eglibc lbraries and headers installed")
 
 $(EGLIBC_HEADERS_BUILD_DIR)/.installed: download_eglibc \
 	$(EGLIBC_HEADERS_BUILD_DIR)/.decompressed \
@@ -71,7 +71,7 @@ $(EGLIBC_HEADERS_BUILD_DIR)/.installed: download_eglibc \
 	@touch $@
 
 download_eglibc download_eglibc_headers:
-	$(call embtk_generic_message,"downloading eglibc-$(EGLIBC_VERSION) \
+	$(call embtk_pinfo,"downloading eglibc-$(EGLIBC_VERSION) \
 	if necessary ...")
 ifeq ($(CONFIG_EMBTK_EGLIBC_VERSION_STRING),"trunk")
 	@cd $(EMBTK_ROOT)/src; \
@@ -148,7 +148,7 @@ $(EGLIBC_BUILD_DIR)/.configured:
 	@touch $@
 
 EGLIBC_OPTIONS_PARSE:
-	$(call embtk_generic_message,"Parsing \
+	$(call embtk_pinfo,"Parsing \
 	eglibc-$(EGLIBC_VERSION) option groups...")
 	@cat $(OPTION_GROUPS_FILE) > $(EGLIBC_HEADERS_BUILD_DIR)/option-groups.config
 	@echo "#######################################################" >> $(EGLIBC_HEADERS_BUILD_DIR)/option-groups.config
diff --git a/mk/fs.mk b/mk/fs.mk
index 1b6c94e..7f26999 100644
--- a/mk/fs.mk
+++ b/mk/fs.mk
@@ -29,18 +29,18 @@ SQUASHFS_ROOTFS		:= $(EMBTK_GENERATED)/rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG).sq
 INITRAMFS_ROOTFS	:= $(EMBTK_GENERATED)/initramfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG)
 
 build_rootfs_devnodes:
-	$(call embtk_generic_msg,"Populating device nodes of the rootfs...")
+	$(call embtk_pinfo,"Populating device nodes of the rootfs...")
 	$(Q)$(FAKEROOT_BIN) -s $(FAKEROOT_ENV_FILE) -- $(MAKEDEVS_BIN)		\
 			-d $(EMBTK_ROOT)/src/devices_table.txt $(ROOTFS)
 
 build_tarbz2_rootfs:
-	$(call embtk_generic_msg,"Generating TAR.BZ2 file of the rootfs...")
+	$(call embtk_pinfo,"Generating TAR.BZ2 file of the rootfs...")
 	@cd $(ROOTFS) ; $(FAKEROOT_BIN) -i $(FAKEROOT_ENV_FILE) -- \
 	tar cjf rootfs-$(GNU_TARGET)-$(EMBTK_MCU_FLAG).tar.bz2 * ; \
 	mv $(BZIP2_ROOTFS) $(EMBTK_GENERATED)/
 
 build_jffs2_rootfs:
-	$(call embtk_generic_msg,"Generating JFFS2 rootfs..")
+	$(call embtk_pinfo,"Generating JFFS2 rootfs..")
 	@$(FAKEROOT_BIN) -i $(FAKEROOT_ENV_FILE) -- \
 	$(HOSTTOOLS)/usr/sbin/mkfs.jffs2 \
 	--eraseblock=$(CONFIG_EMBTK_ROOTFS_HAVE_JFFS2_ERASEBLOCKSIZE) \
@@ -60,12 +60,12 @@ build_jffs2_rootfs:
 	@rm -rf $(JFFS2_ROOTFS).temp
 
 build_squashfs_rootfs:
-	$(call embtk_generic_msg,"Generating SQUASHFS rootfs...")
+	$(call embtk_pinfo,"Generating SQUASHFS rootfs...")
 	$(FAKEROOT_BIN) -i $(FAKEROOT_ENV_FILE) -- \
 	$(MKSQUASHFS_BIN) $(ROOTFS) $(SQUASHFS_ROOTFS)
 
 build_initramfs_archive:
-	$(call embtk_generic_msg,"Generating cpio archive for INITRAMFS...")
+	$(call embtk_pinfo,"Generating cpio archive for INITRAMFS...")
 	@$(FAKEROOT_BIN) -i $(FAKEROOT_ENV_FILE) -- \
 	$(EMBTK_ROOT)/scripts/mkinitramfs $(ROOTFS) \
 	$(if $(EMBTK_ROOTFS_HAVE_INITRAMFS_CPIO_GZIPED),gzip,bzip2) \
diff --git a/mk/help.mk b/mk/help.mk
index ab4f31c..78708cf 100644
--- a/mk/help.mk
+++ b/mk/help.mk
@@ -24,7 +24,7 @@
 ################################################################################
 
 help:
-	$(call embtk_generic_msg,"Embedded systems Toolkit help. Please \
+	$(call embtk_pinfo,"Embedded systems Toolkit help. Please \
 	visit - http://embtoolkit.org - for more details")
 	@echo " ---------------------------"
 	@echo "| Building and configuring: |"
diff --git a/mk/macros.mk b/mk/macros.mk
index 4886dd2..244c70c 100644
--- a/mk/macros.mk
+++ b/mk/macros.mk
@@ -39,8 +39,8 @@ endef
 define embtk_echo_green
 	echo -e $(__embtk_color_green)$(1)$(__embtk_no_color)
 endef
-#usage $(call echo_yellow,$(TEXT))
-define echo_yellow
+#usage $(call embtk_echo_yellow,$(TEXT))
+define embtk_echo_yellow
 	echo -e $(__embtk_color_yellow)$(1)$(__embtk_no_color)
 endef
 #usage $(call embtk_echo_blue,$(TEXT))
@@ -105,24 +105,26 @@ define EMBTK_INSTALL_MSG
 	$(call embtk_echo_blue,"################################################################################")
 endef
 
-#Install message
-#usage $(call embtk_error_msg,$(MESSAGE))
-define embtk_error_msg
+# Print warning message
+define embtk_pwarning
+	$(call embtk_echo_yellow,"################################################################################")
+	$(call embtk_echo_yellow,"# EmbToolkit # WARNING: $(1)")
+	$(call embtk_echo_yellow,"################################################################################")
+endef
+
+# Print error message
+define embtk_perror
 	$(call embtk_echo_red,"################################################################################")
 	$(call embtk_echo_red,"# EmbToolkit # ERROR: $(1)")
 	$(call embtk_echo_red,"################################################################################")
 endef
 
-#Generic message
-#usage $(call embtk_generic_message,$(GENERIC_MESSAGE))
-define embtk_generic_message
+# Print info message
+define embtk_pinfo
 	$(call embtk_echo_blue,"################################################################################")
 	$(call embtk_echo_blue,"# EmbToolkit # $(1)")
 	$(call embtk_echo_blue,"################################################################################")
 endef
-define embtk_generic_msg
-	$(call embtk_generic_message,$(1))
-endef
 
 #Successful build of EmbToolkit message
 successful_build:
@@ -323,7 +325,7 @@ define __embtk_print_configure_opts
 	do echo -e $(__embtk_color_blue)$$i$(__embtk_no_color); done
 endef
 define embtk_configure_pkg
-	$(call embtk_generic_msg,"Configure $(__embtk_pkg_package)...")
+	$(call embtk_pinfo,"Configure $(__embtk_pkg_package)...")
 	$(call __embtk_configure_autoreconfpkg,$(1))
 	$(Q)test -e $(__embtk_pkg_srcdir)/configure || exit 1
 	$(call __embtk_print_configure_opts,"$(__embtk_pkg_configureopts)")
@@ -368,7 +370,7 @@ __embtk_hostpkg_rpathldflags="-Wl,-rpath,$(HOSTTOOLS)/usr/lib"
 __embtk_hostpkg_rpath=$(strip $(if $(__embtk_pkg_setrpath),			\
 				$(__embtk_hostpkg_rpathldflags)))
 define embtk_configure_hostpkg
-	$(call embtk_generic_msg,"Configure $(__embtk_pkg_package) for host...")
+	$(call embtk_pinfo,"Configure $(__embtk_pkg_package) for host...")
 	$(call __embtk_configure_autoreconfpkg,$(1))
 	$(Q)test -e $(__embtk_pkg_srcdir)/configure || exit 1
 	$(call __embtk_print_configure_opts,"$(__embtk_pkg_configureopts)")
@@ -424,7 +426,7 @@ __embtk_single_make_hostinstall = $(__embtk_pkg_makeenv)			\
 
 __embtk_autotoolspkg-y=$(2)
 define __embtk_install_pkg_make
-	$(call embtk_generic_msg,"Compiling and installing $(__embtk_pkg_name)-$(__embtk_pkg_version) in your root filesystem...")
+	$(call embtk_pinfo,"Compiling and installing $(__embtk_pkg_name)-$(__embtk_pkg_version) in your root filesystem...")
 	$(Q)$(if $(strip $(__embtk_pkg_deps)),$(MAKE) $(__embtk_pkg_deps))
 	$(Q)$(call embtk_download_pkg,$(1))
 	$(Q)$(call embtk_decompress_pkg,$(1))
@@ -441,7 +443,7 @@ define __embtk_install_pkg_make
 	$(Q)touch $(__embtk_pkg_builddir)/.installed
 endef
 define __embtk_install_hostpkg_make
-	$(call embtk_generic_msg,"Compiling and installing $(__embtk_pkg_name)-$(__embtk_pkg_version) for host...")
+	$(call embtk_pinfo,"Compiling and installing $(__embtk_pkg_name)-$(__embtk_pkg_version) for host...")
 	$(Q)$(if $(strip $(__embtk_pkg_deps)),$(MAKE) $(__embtk_pkg_deps))
 	$(Q)$(call embtk_download_pkg,$(1))
 	$(Q)$(call embtk_decompress_pkg,$(1))
@@ -535,7 +537,7 @@ define __embtk_download_pkg_exitfailure
 endef
 
 define embtk_download_pkg
-	$(call embtk_generic_msg,"Download $(__embtk_pkg_package) if needed...")
+	$(call embtk_pinfo,"Download $(__embtk_pkg_package) if needed...")
 	$(Q)test -e $(__embtk_pkg_package_f) ||					\
 	$(call embtk_wget,							\
 		$(__embtk_pkg_package),						\
@@ -555,7 +557,7 @@ endef
 # $(call embtk_decompress_pkg,pkgname)
 #
 define embtk_decompress_pkg
-	$(call embtk_generic_msg,"Decrompressing $(__embtk_pkg_package) ...")
+	$(call embtk_pinfo,"Decrompressing $(__embtk_pkg_package) ...")
 	$(Q)if [ "x$(CONFIG_EMBTK_$(PKGV)_PKG_IS_TARGZ)" = "xy" ] &&		\
 	[ ! -e $(__embtk_pkg_srcdir)/.decompressed ]; then			\
 		tar -C $(dir $(__embtk_pkg_srcdir)) -xzf			\
@@ -589,7 +591,7 @@ endef
 # $(call embtk_cleanup_pkg,PACKAGE)
 #
 define embtk_cleanup_pkg
-	$(call embtk_generic_message,"Cleanup $(__embtk_pkg_name)...")
+	$(call embtk_pinfo,"Cleanup $(__embtk_pkg_name)...")
 	$(Q)-if [ "x$(__embtk_pkg_etc)" != "x" ] && [ -e $(SYSROOT)/etc ];	\
 		then								\
 		cd $(SYSROOT)/etc; rm -rf $(__embtk_pkg_etc);			\
diff --git a/mk/makedevs.mk b/mk/makedevs.mk
index 243a79e..12376a2 100644
--- a/mk/makedevs.mk
+++ b/mk/makedevs.mk
@@ -27,14 +27,14 @@ MAKEDEVS_DIR	:= $(HOSTTOOLS)/usr/bin
 MAKEDEVS_BIN	:= $(MAKEDEVS_DIR)/makedevs
 
 makedevs_install: $(MAKEDEVS_DIR)/.installed
-	$(call embtk_generic_msg,"Successfully installed makedevs")
+	$(call embtk_pinfo,"Successfully installed makedevs")
 
 $(MAKEDEVS_DIR)/.installed:
-	$(call embtk_generic_msg,"Installing makedevs...")
+	$(call embtk_pinfo,"Installing makedevs...")
 	$(Q)mkdir -p $(MAKEDEVS_DIR)/usr
 	$(Q)mkdir -p $(MAKEDEVS_DIR)/usr/bin
 	$(hostcc_cached) -o $(MAKEDEVS_BIN) $(MAKEDEVS_SRC)
 	$(Q)touch $@
 
 download_makedevs:
-	$(call embtk_generic_msg,"makedevs is in embtk source, download not needed...")
+	$(call embtk_pinfo,"makedevs is in embtk source, download not needed...")
diff --git a/mk/packages.mk b/mk/packages.mk
index 715ac85..1c50323 100644
--- a/mk/packages.mk
+++ b/mk/packages.mk
@@ -85,7 +85,7 @@ ROOTFS_COMPONENTS_CLEAN := $(subst install,clean,$(ROOTFS_COMPONENTS-))
 host_packages_build:
 ifeq ($(HOSTTOOLS_COMPONENTS-y),)
 else
-	$(call embtk_generic_msg,"Building extra packages intended to run \
+	$(call embtk_pinfo,"Building extra packages intended to run \
 	on your host machine ...")
 	@$(MAKE) $(HOSTTOOLS_COMPONENTS-y)
 endif
diff --git a/mk/rootfs.mk b/mk/rootfs.mk
index 3822b19..e477481 100644
--- a/mk/rootfs.mk
+++ b/mk/rootfs.mk
@@ -67,12 +67,12 @@ ROOTFS_STRIPPED_FILES += `[ -d $$ROOTFS/usr/libexec ] && find $$ROOTFS/usr/libex
 endif
 
 rootfs_build:
-	$(call embtk_generic_message,"Building selected root filesystems...")
+	$(call embtk_pinfo,"Building selected root filesystems...")
 	@$(MAKE) rootfs_clean mkinitialrootfs $(ROOTFS_HOSTTOOLS-y) \
 	$(ROOTFS_COMPONENTS-y) build_rootfs_devnodes rootfs_fill \
 	build_tarbz2_rootfs $(FILESYSTEMS-y)
 	$(Q)rm -rf $(ROOTFS)
-	$(call embtk_generic_message,"Build of selected root filesystems \
+	$(call embtk_pinfo,"Build of selected root filesystems \
 	ended successfully!")
 
 rootfs_fill:
@@ -102,7 +102,7 @@ endif
 	@-cp -R $(SYSROOT)/etc/* $(ROOTFS)/etc/ >/dev/null 2>/dev/null
 	@cp -R $(SYSROOT)/root $(ROOTFS)/
 ifeq ($(CONFIG_EMBTK_TARGET_STRIPPED),y)
-	$(call embtk_generic_message,"Stripping binaries as specified...")
+	$(call embtk_pinfo,"Stripping binaries as specified...")
 	@-$(FAKEROOT_BIN) -i $(EMBTK_ROOT)/.fakeroot.001 -- \
 	$(TARGETSTRIP) $(ROOTFS_STRIPPED_FILES) >/dev/null 2>&1
 endif
diff --git a/mk/squashfs.mk b/mk/squashfs.mk
index de54f49..ea0a429 100644
--- a/mk/squashfs.mk
+++ b/mk/squashfs.mk
@@ -51,13 +51,13 @@ $(SQUASHFS_HOST_BUILD_DIR)/.installed: download_squashfs \
 	@touch $@
 
 $(SQUASHFS_HOST_BUILD_DIR)/.decompressed:
-	$(call embtk_generic_message,"Decompressing $(SQUASHFS_PACKAGE)...")
+	$(call embtk_pinfo,"Decompressing $(SQUASHFS_PACKAGE)...")
 	@tar -C $(TOOLS_BUILD) -xzvf $(DOWNLOAD_DIR)/$(SQUASHFS_PACKAGE)
 	@mkdir -p $(SQUASHFS_HOST_BUILD_DIR)
 	@touch $@
 
 squashfs_host_clean:
-	$(call embtk_generic_message,"Cleaning squashfs in host ...")
+	$(call embtk_pinfo,"Cleaning squashfs in host ...")
 
 #squashfs for target
 $(SQUASHFS_TARGET_BUILD_DIR)/.installed: download_squashfs \
@@ -65,16 +65,16 @@ $(SQUASHFS_TARGET_BUILD_DIR)/.installed: download_squashfs \
 	@touch $@
 
 $(SQUASHFS_TARGET_BUILD_DIR)/.decompressed:
-	$(call embtk_generic_message,"Decompressing $(SQUASHFS_PACKAGE)...")
+	$(call embtk_pinfo,"Decompressing $(SQUASHFS_PACKAGE)...")
 	@tar -C $(PACKAGES_BUILD) -xzvf $(DOWNLOAD_DIR)/$(SQUASHFS_PACKAGE)
 	@mkdir -p $(SQUASHFS_TARGET_BUILD_DIR)
 	@touch $@
 
 squashfs_target_clean:
-	$(call embtk_generic_message,"Cleaning squashfs in target ...")
+	$(call embtk_pinfo,"Cleaning squashfs in target ...")
 
 download_squashfs:
-	$(call embtk_generic_message,"Downloading $(SQUASHFS_PACKAGE) \
+	$(call embtk_pinfo,"Downloading $(SQUASHFS_PACKAGE) \
 	if necessary...")
 	@test -e $(DOWNLOAD_DIR)/$(SQUASHFS_PACKAGE) || \
 	wget -O $(DOWNLOAD_DIR)/$(SQUASHFS_PACKAGE) \
diff --git a/mk/toolchain.mk b/mk/toolchain.mk
index 6860f5b..51862ff 100644
--- a/mk/toolchain.mk
+++ b/mk/toolchain.mk
@@ -107,7 +107,7 @@ endif
 
 #targets
 buildtoolchain: $(TOOLCHAINBUILD)
-	$(call embtk_generic_message,"You successfully build a toolchain for \
+	$(call embtk_pinfo,"You successfully build a toolchain for \
 	$(STRICT_GNU_TARGET) !!!")
 
 symlink_tools:
diff --git a/mk/uclibc.mk b/mk/uclibc.mk
index 7073203..c2d593f 100755
--- a/mk/uclibc.mk
+++ b/mk/uclibc.mk
@@ -40,13 +40,13 @@ EMBTK_UCLIBC_CFLAGS	+= $(EMBTK_TARGET_ABI) $(EMBTK_TARGET_FLOAT_CFLAGS)
 EMBTK_UCLIBC_CFLAGS	+= $(EMBTK_TARGET_MARCH) -pipe
 
 uclibc_install: $(UCLIBC_BUILD_DIR)/.installed
-	$(call embtk_generic_msg,"Successfully installed uClibc")
+	$(call embtk_pinfo,"Successfully installed uClibc")
 
 uclibc_headers_install: $(UCLIBC_BUILD_DIR)/.headers_installed
-	$(call embtk_generic_msg,"Successfully installed uClibc headers")
+	$(call embtk_pinfo,"Successfully installed uClibc headers")
 
 $(UCLIBC_BUILD_DIR)/.installed:
-	$(call embtk_generic_msg,"Build and install uClibc-$(UCLIBC_VERSION) ...")
+	$(call embtk_pinfo,"Build and install uClibc-$(UCLIBC_VERSION) ...")
 	$(Q)$(MAKE) -C $(UCLIBC_BUILD_DIR) PREFIX=$(SYSROOT)/			\
 		CROSS_COMPILER_PREFIX="$(TOOLS)/bin/$(STRICT_GNU_TARGET)-"	\
 		SHARED_LIB_LOADER_PREFIX="/$(LIBDIR)/"				\
@@ -58,7 +58,7 @@ $(UCLIBC_BUILD_DIR)/.installed:
 
 $(UCLIBC_BUILD_DIR)/.headers_installed: download_uclibc \
 	$(UCLIBC_BUILD_DIR)/.decompressed $(UCLIBC_BUILD_DIR)/.configured
-	$(call embtk_generic_msg,"Install uClibc-$(UCLIBC_VERSION) headers ...")
+	$(call embtk_pinfo,"Install uClibc-$(UCLIBC_VERSION) headers ...")
 	$(Q)$(MAKE) -C $(UCLIBC_BUILD_DIR) silentoldconfig
 	$(Q)$(MAKE) -C $(UCLIBC_BUILD_DIR) PREFIX=$(SYSROOT)/			\
 		CROSS_COMPILER_PREFIX="$(TOOLS)/bin/$(STRICT_GNU_TARGET)-"	\
@@ -80,7 +80,7 @@ $(UCLIBC_BUILD_DIR)/.headers_installed: download_uclibc \
 
 download_uclibc download_uclibc_headers:
 ifeq ($(CONFIG_EMBTK_UCLIBC_VERSION_GIT),y)
-	$(call embtk_generic_msg,"downloading uClibc using GIT")
+	$(call embtk_pinfo,"downloading uClibc using GIT")
 	@test -e $(EMBTK_ROOT)/src/uClibc-git || \
 	git clone $(UCLIBC_GIT_SITE) $(EMBTK_ROOT)/src/uClibc-git
 ifneq ($(UCLIBC_GIT_BRANCH),master)
@@ -110,5 +110,5 @@ define embtk_configure_uclibc
 	$(shell  $(__embtk_get_uclibc_config) | $(__embtk_set_uclibc_config))
 endef
 $(UCLIBC_BUILD_DIR)/.configured:
-	$(call embtk_generic_msg,"Configure uClibc-$(UCLIBC_VERSION) ...")
+	$(call embtk_pinfo,"Configure uClibc-$(UCLIBC_VERSION) ...")
 	$(Q)$(call embtk_configure_uclibc)