Merge pull request #134 from youpong/refactor-build-tool

Refactor build tool

Author: TanmayPatil105

.github/workflows/coverage.yml

@@ -16,9 +16,9 @@ jobs:
     steps:
     - uses: actions/checkout@v3
     - name: configure
-      run: ./configure
+      run: ./configure --enable-code-coverage
     - name: build
-      run: make COVERAGE_TEST=1
+      run: make -j
     - name: check
       run: make check
     - name: gcov

configure

@@ -5,6 +5,8 @@ set -o nounset
 PROJECT=procfetch
 VERSION="$(cat VERSION)"
 CXX=g++
+CXXFLAGS=${CXXFLAGS:-}
+LIBS=${LIBS:-}           
 unset PREFIX
 BIN_DIR=/bin
 LIB_DIR=/share/procfetch
@@ -20,13 +22,16 @@ function show_usage {
 	Usage: $0 [OPTION]...
 
 	Options:
-	  -h, --help       display this help and exit.
-	  -v, --versoin    display version information and exit.
-	  --prefix=PREFIX  install files in PREFIX.
-	  --with-cxx=CXX   use CXX to compile (default=gcc).
+	  -h, --help              display this help and exit.
+	  -v, --versoin           display version information and exit.
+	  --prefix=PREFIX         install files in PREFIX.
+	  --with-cxx=CXX          use CXX to compile (default=gcc).
+	  --enable-code-coverage  enable coverage testing
 
 	Some influential environment variables:
-	  CXX  C++ compiler command
+	  CXX       C++ compiler command
+      CXXFLAGS  C++ compiler flags
+      LIBS      libraries to pass to the linker, e.g. -l<library>
 EOF
     exit $1
 }
@@ -37,19 +42,23 @@ EOF
 
 help_option=0
 version_option=0
+code_coverage_option=0
 
-parsed_arguments=$(getopt -n $0 -o hv --long help,version,prefix:,with-cxx: -- "$@")
+parsed_arguments=$(getopt -n $0 -o hv \
+                   --long help,version,prefix:,with-cxx:,enable-code-coverage -- "$@")
 if [[ $? != 0 ]]; then
     show_usage 1
 fi
 
 eval set -- "$parsed_arguments"
 while true; do
     case "$1" in
-        -h | --help     ) help_option=1    ; shift   ;;
-        -v | --version  ) version_option=1 ; shift   ;;
-             --prefix   ) PREFIX="$2"      ; shift 2 ;;
-             --with-cxx ) CXX="$2"         ; shift 2 ;;
+        -h | --help     ) help_option=1          ; shift   ;;
+        -v | --version  ) version_option=1       ; shift   ;;
+             --prefix   ) PREFIX="$2"            ; shift 2 ;;
+             --with-cxx ) CXX="$2"               ; shift 2 ;;
+             --enable-code-coverage )
+                          code_coverage_option=1 ; shift   ;;
         --) shift; break;;
         *) echo "Error: Unknown option: $1"
            show_usage 1;;
@@ -74,6 +83,16 @@ if [[ $version_option == 1 ]]; then
     exit 0
 fi
 
+if [[ $code_coverage_option == 1 ]]; then
+    if [[ $CXX =~ clang\+\+ ]]; then    # for clang++
+        echo "Not implemented yet"
+        exit 1
+    else                                # for gcc
+        CXXFLAGS="-fprofile-arcs -ftest-coverage -O0"
+        LIBS="-lgcov"
+    fi
+fi
+
 BIN_DIR="${PREFIX:-}${BIN_DIR}"
 LIB_DIR="${PREFIX:-/usr}${LIB_DIR}"
 
@@ -82,6 +101,8 @@ do
     echo "creating $f"
     sed -e "s/@VERSION@/${VERSION}/g" \
         -e "s/@CXX@/${CXX}/g" \
+        -e "s/@CXXFLAGS@/${CXXFLAGS}/g" \
+        -e "s/@LIBS@/${LIBS}/g" \
         -e "s:@BIN_DIR@:${BIN_DIR}:g" \
         -e "s:@LIB_DIR@:${LIB_DIR}:g" "$f.in" > "$f"
 done

src/Makefile.in

@@ -3,12 +3,8 @@ SRCS = fetch.cpp main.cpp util.cpp
 OBJS = $(SRCS:.cpp=.o)
 
 CXX = @CXX@
-CXXFLAGS = -std=c++2a -Wall -Wextra --pedantic-errors
-
-ifeq ($(COVERAGE_TEST), 1)
-	CXXFLAGS += -fprofile-arcs -ftest-coverage -O0
-	LIBS += -lgcov
-endif
+CXXFLAGS = -std=c++2a -Wall -Wextra --pedantic-errors @CXXFLAGS@
+LIBS = @LIBS@
 
 INSTALL = /usr/bin/install -c -D
 FORMATTER = clang-format -i