Merge pull request #502 from uyjulian/buildsystem_improvements_240116

fjtrujy · web-flow · commit 2b68e93f2e0d · 2024-01-16T18:20:08.000+01:00
Buildsystem improvements 240116
diff --git a/.github/workflows/compilation.yml b/.github/workflows/compilation.yml
@@ -20,11 +20,10 @@ jobs:
         run: |
           apk add build-base git bash
 
-      # Still compilation is not fully compatible with multi-thread
       - name: Compile project ${{ matrix.debug }}
         run: |
           make -j $(getconf _NPROCESSORS_ONLN) clean
-          make -j 1 ${{ matrix.debug }}
+          make -j $(getconf _NPROCESSORS_ONLN) ${{ matrix.debug }}
           make -j $(getconf _NPROCESSORS_ONLN) install
           ln -sf "$PS2SDK/ee/lib/libcglue.a" "$PS2DEV/ee/mips64r5900el-ps2-elf/lib/libcglue.a"
           ln -sf "$PS2SDK/ee/lib/libpthreadglue.a" "$PS2DEV/ee/mips64r5900el-ps2-elf/lib/libpthreadglue.a"
@@ -39,7 +38,7 @@ jobs:
 
       - name: Get short SHA
         id: slug
-        run: echo "sha8=$(echo ${GITHUB_SHA} | cut -c1-8)" >> $GITHUB_OUTPUT
+        run: printf '%s\n' "sha8=$(printf '%s\n' ${GITHUB_SHA} | cut -c1-8)" >> $GITHUB_OUTPUT
 
       - name: Upload artifacts
         if: ${{ success() }}
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -23,12 +23,12 @@ jobs:
     - name: Extract DOCKER_TAG using tag name
       if: startsWith(github.ref, 'refs/tags/')
       run: |
-        echo "DOCKER_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
+        printf '%s\n' "DOCKER_TAG=${GITHUB_REF/refs\/tags\//}" >> $GITHUB_ENV
 
     - name: Use default DOCKER_TAG
       if: startsWith(github.ref, 'refs/tags/') != true
       run: |
-        echo "DOCKER_TAG=latest" >> $GITHUB_ENV
+        printf '%s\n' "DOCKER_TAG=latest" >> $GITHUB_ENV
 
     - name: Login to DockerHub
       uses: docker/login-action@v2
@@ -47,12 +47,12 @@ jobs:
     - name: Set docker tag list to include DockerHub if credentials available
       if: env.DOCKER_USERNAME != null
       run: |
-        echo "DOCKER_TAG_LIST=ghcr.io/${{ github.repository }}:${{ env.DOCKER_TAG }},${{ github.repository }}:${{ env.DOCKER_TAG }}" >> $GITHUB_ENV
+        printf '%s\n' "DOCKER_TAG_LIST=ghcr.io/${{ github.repository }}:${{ env.DOCKER_TAG }},${{ github.repository }}:${{ env.DOCKER_TAG }}" >> $GITHUB_ENV
 
     - name: Set docker tag list to not include DockerHub if credentials not available
       if: env.DOCKER_USERNAME == null
       run: |
-        echo "DOCKER_TAG_LIST=ghcr.io/${{ github.repository }}:${{ env.DOCKER_TAG }}" >> $GITHUB_ENV
+        printf '%s\n' "DOCKER_TAG_LIST=ghcr.io/${{ github.repository }}:${{ env.DOCKER_TAG }}" >> $GITHUB_ENV
 
     - name: Build and Push to container registry
       uses: docker/build-push-action@v3
@@ -64,8 +64,8 @@ jobs:
 
     - name: Send Compile action
       run: |
-        export DISPATCH_ACTION="$(echo run_build)"
-        echo "NEW_DISPATCH_ACTION=$DISPATCH_ACTION" >> $GITHUB_ENV
+        export DISPATCH_ACTION="$(printf '%s\n' run_build)"
+        printf '%s\n' "NEW_DISPATCH_ACTION=$DISPATCH_ACTION" >> $GITHUB_ENV
 
     - name: Repository Dispatch to ps2sdk-ports
       uses: peter-evans/repository-dispatch@v2
diff --git a/Defs.make b/Defs.make
@@ -57,5 +57,6 @@ STRIP ?= strip
 MKDIR ?= mkdir
 RMDIR ?= rmdir
 ECHO ?= echo
+PRINTF ?= printf
 
 MAKEREC ?= $(MAKE) -C
diff --git a/Dockerfile b/Dockerfile
@@ -9,7 +9,7 @@ RUN apk add build-base git bash
 # Still compilation is not fully compatible with multi-thread
 RUN cd /src && \
     make -j $(getconf _NPROCESSORS_ONLN) clean && \
-    make -j 1 && \
+    make -j $(getconf _NPROCESSORS_ONLN) && \
     make -j $(getconf _NPROCESSORS_ONLN) install
 RUN ln -sf "$PS2SDK/ee/lib/libcglue.a" "$PS2DEV/ee/mips64r5900el-ps2-elf/lib/libcglue.a"
 RUN ln -sf "$PS2SDK/ee/lib/libpthreadglue.a" "$PS2DEV/ee/mips64r5900el-ps2-elf/lib/libpthreadglue.a"
diff --git a/Makefile b/Makefile
@@ -15,9 +15,7 @@ endif
 SUBDIRS = tools iop ee common samples
 
 all: build
-	@$(ECHO) .;
-	@$(ECHO) .PS2SDK Built.;
-	@$(ECHO) .;
+	@$(PRINTF) '.\n.PS2SDK Built.\n.\n'
 
 # Common rules shared by all build targets.
 
@@ -84,13 +82,13 @@ release_base: | env_release_check
 env_build_check:
 	@if test -z $(PS2SDKSRC) ; \
 	then \
-	  $(ECHO) PS2SDKSRC environment variable should be defined. ; \
+	  $(PRINTF) 'PS2SDKSRC environment variable should be defined.\n' ; \
 	fi
 
 env_release_check:
 	@if test -z $(PS2SDK) ; \
 	then \
-	  $(ECHO) PS2SDK environment variable must be defined. ; \
+	  $(PRINTF) 'PS2SDK environment variable must be defined.\n' ; \
 	  exit 1; \
 	fi
 
diff --git a/common/Rules.release b/common/Rules.release
@@ -15,9 +15,9 @@ release-include:
 	@if test -d include ; then \
 	   for file in $$(find include -type f | cut -d'/' -f2-); do \
 	      if test -f include/$$file ; then \
-	         $(ECHO) Installing include/$$file to $(PS2SDK)/common/include ; \
+	         $(PRINTF) 'Installing include/%s to %s/common/include\n' $$file $(PS2SDK) ; \
 	         mkdir -p $(PS2SDK)/common/include/$$(dirname $$file) ; \
-	         cp -t $(PS2SDK)/common/include/$$(dirname $$file) -f include/$$file ; \
+	         cp -f include/$$file $(PS2SDK)/common/include/$$(dirname $$file) ; \
 	         chmod 644 $(PS2SDK)/common/include/$$file ; \
 	      fi \
 	   done; \
diff --git a/common/external_deps/Makefile b/common/external_deps/Makefile
@@ -4,11 +4,11 @@ LWIP := $(PS2SDKSRC)/common/external_deps/lwip
 all: $(LWIP)
 
 $(LWIP):
-	cd $(PS2SDKSRC) && ./dowload_dependencies.sh
+	cd $(PS2SDKSRC) && ./download_dependencies.sh
 
 clean:
-	$(ECHO) Cleaning PS2SDK dependencies.
-	$(ECHO) Cleaning lwip.
+	@$(PRINTF) 'Cleaning PS2SDK dependencies.\n'
+	@$(PRINTF) 'Cleaning lwip.\n'
 	rm -rf $(LWIP) $(LWIP)_inprogress
 
 include $(PS2SDKSRC)/Defs.make
diff --git a/download_dependencies.sh b/download_dependencies.sh
diff --git a/ee/Rules.release b/ee/Rules.release
@@ -26,15 +26,15 @@ release-ee-dirs:
 
 release-ee-lib:
 	@if test $(EE_LIB) ; then \
-	   $(ECHO) Installing $(EE_LIB) to $(PS2SDK)/ee/lib ; \
+	   $(PRINTF) 'Installing %s to %s/ee/lib\n' $(EE_LIB) $(PS2SDK) ; \
 	   cp -f $(EE_LIB) $(PS2SDK)/ee/lib ; \
 	   cp -f $(EE_LIB:%.a=%.erl) $(PS2SDK)/ee/lib ; \
-	   chmod 644 $(PS2SDK)/ee/lib/`basename $(EE_LIB)` $(PS2SDK)/ee/lib/`basename $(EE_LIB:%.a=%.erl)`; \
+	   chmod 644 $(PS2SDK)/ee/lib/$$(basename $(EE_LIB)) $(PS2SDK)/ee/lib/$$(basename $(EE_LIB:%.a=%.erl)); \
 	   for file in $(EE_LIB_ALTNAMES); do \
-	      ln -s `basename $(EE_LIB)` $(PS2SDK)/ee/lib/$$file; \
+	      ln -s $$(basename $(EE_LIB)) $(PS2SDK)/ee/lib/$$file; \
 	   done; \
 	   for file in $(EE_LIB_ALTNAMES:%.a=%.erl); do \
-	      ln -sf `basename $(EE_LIB:%.a=%.erl)` $(PS2SDK)/ee/lib/$$file; \
+	      ln -sf $$(basename $(EE_LIB:%.a=%.erl)) $(PS2SDK)/ee/lib/$$file; \
 	   done; \
 	fi;
 
@@ -45,11 +45,11 @@ release-ee-lib:
 
 release-ee-bin:
 	@if test $(EE_BIN) ; then \
-	   $(ECHO) Installing $(EE_BIN) to $(PS2SDK)/ee/bin ; \
+	   $(PRINTF) 'Installing %s to %s/ee/bin\n' $(EE_BIN) $(PS2SDK) ; \
 	   cp -f $(EE_BIN) $(PS2SDK)/ee/bin ; \
-	   chmod 644 $(PS2SDK)/ee/bin/`basename $(EE_BIN)` ; \
+	   chmod 644 $(PS2SDK)/ee/bin/$$(basename $(EE_BIN)) ; \
 	   for file in $(EE_BIN_ALTNAMES); do \
-	      ln -sf `basename $(EE_BIN)` $(PS2SDK)/ee/bin/$$file; \
+	      ln -sf $$(basename $(EE_BIN)) $(PS2SDK)/ee/bin/$$file; \
 	   done; \
 	fi;
 
@@ -62,9 +62,9 @@ release-ee-include:
 	@if test -d include ; then \
 	   for file in $$(find include -type f | cut -d'/' -f2-); do \
 	      if test -f include/$$file ; then \
-	         $(ECHO) Installing include/$$file to $(PS2SDK)/ee/include ; \
+	         $(PRINTF) 'Installing include/%s to %s/ee/include\n' $$file $(PS2SDK) ; \
 	         mkdir -p $(PS2SDK)/ee/include/$$(dirname $$file) ; \
-	         cp -t $(PS2SDK)/ee/include/$$(dirname $$file) -f include/$$file ; \
+	         cp -f include/$$file $(PS2SDK)/ee/include/$$(dirname $$file) ; \
 	         chmod 644 $(PS2SDK)/ee/include/$$file ; \
 	      fi \
 	   done; \
diff --git a/ee/erl-loader/Makefile b/ee/erl-loader/Makefile
@@ -27,7 +27,7 @@ clean:
 	rm -f -r $(EE_OBJS_DIR) $(EE_BIN_DIR) $(EE_SRC_DIR)exports.c
 
 release:
-	$(ECHO) Installing $(LOADER_BIN) to $(PS2SDK)/ee/bin/ ;
+	@$(ECHO) 'Installing %s to %s/ee/bin/\n' $(LOADER_BIN) $(PS2SDK) ;
 	cp -f $(LOADER_BIN) $(PS2SDK)/ee/bin/
 	chmod 644 $(PS2SDK)/ee/bin/erl-loader.elf
 
diff --git a/ee/libcglue/samples/regress/Makefile.sample b/ee/libcglue/samples/regress/Makefile.sample
@@ -19,7 +19,7 @@ all: $(EE_BIN) input
 
 input:
 	mkdir -p testfiles/
-	echo "hello world" > testfiles/dummy
+	$(PRINTF) '%s\n' "hello world" > testfiles/dummy
 
 
 clean:
diff --git a/ee/libcglue/samples/rewinddir/Makefile.sample b/ee/libcglue/samples/rewinddir/Makefile.sample
@@ -25,7 +25,7 @@ all: $(EE_BIN) input
 
 input:
 	mkdir -p testfiles/
-	echo "hello world" > testfiles/dummy
+	$(PRINTF) '%s\n' "hello world" > testfiles/dummy
 
 clean:
 	rm -rf $(EE_BIN) $(EE_OBJS)
diff --git a/ee/startup/Makefile b/ee/startup/Makefile
@@ -16,8 +16,8 @@ include $(PS2SDKSRC)/ee/Rules.make
 include $(PS2SDKSRC)/ee/Rules.release
 
 release: all
-	@$(ECHO) Installing $(EE_SRC_DIR)linkfile into $(PS2SDK)/ee/startup
+	@$(PRINTF) 'Installing %slinkfile into %s/ee/startup\n' $(EE_SRC_DIR) $(PS2SDK)
 	cp -f $(EE_SRC_DIR)linkfile $(PS2SDK)/ee/startup
 	@# Override the generated by newlib
-	@$(ECHO) Installing $(EE_OBJS_DIR)crt0.o into $(PS2DEV)/ee/mips64r5900el-ps2-elf/lib overriding the dummy crt0 created by newlib
+	@$(PRINTF) 'Installing %scrt0.o into %s/ee/mips64r5900el-ps2-elf/lib overriding the dummy crt0 created by newlib\n' $(EE_OBJS_DIR) $(PS2DEV)
 	cp -f $(EE_OBJS_DIR)crt0.o $(PS2DEV)/ee/mips64r5900el-ps2-elf/lib
diff --git a/iop/Rules.make b/iop/Rules.make
@@ -95,7 +95,7 @@ $(IOP_OBJS_DIR)%.o: $(IOP_SRC_DIR)%.s
 
 $(IOP_OBJS_DIR)template-imports.h:
 	$(DIR_GUARD)
-	$(ECHO) "#include \"irx_imports.h\"" > $@
+	$(PRINTF) '%s\n' "#include \"irx_imports.h\"" > $@
 
 # Rules to build imports.lst.
 $(IOP_OBJS_DIR)build-imports.c: $(IOP_OBJS_DIR)template-imports.h $(IOP_SRC_DIR)imports.lst
@@ -108,7 +108,7 @@ $(IOP_OBJS_DIR)imports.o: $(IOP_OBJS_DIR)build-imports.c
 
 $(IOP_OBJS_DIR)template-exports.h:
 	$(DIR_GUARD)
-	$(ECHO) "#include \"irx.h\"" > $@
+	$(PRINTF) '%s\n' "#include \"irx.h\"" > $@
 
 # Rules to build exports.tab.
 $(IOP_OBJS_DIR)build-exports.c: $(IOP_OBJS_DIR)template-exports.h $(IOP_SRC_DIR)exports.tab
diff --git a/iop/Rules.release b/iop/Rules.release
@@ -26,11 +26,11 @@ release-iop-dirs:
 
 release-iop-lib:
 	@if test $(IOP_LIB) ; then \
-	   $(ECHO) Installing $(IOP_LIB) to $(PS2SDK)/iop/lib ; \
+	   $(PRINTF) 'Installing %s to %s/iop/lib\n' $(IOP_LIB) $(PS2SDK) ; \
 	   cp -f $(IOP_LIB) $(PS2SDK)/iop/lib/ ; \
-	   chmod 644 $(PS2SDK)/iop/lib/`basename $(IOP_LIB)` ; \
+	   chmod 644 $(PS2SDK)/iop/lib/$$(basename $(IOP_LIB)) ; \
 	   for file in $(IOP_LIB_ALTNAMES); do \
-	      ln -sf `basename $(IOP_LIB)` $(PS2SDK)/iop/lib/$$file; \
+	      ln -sf $$(basename $(IOP_LIB)) $(PS2SDK)/iop/lib/$$file; \
 	   done; \
 	fi;
 
@@ -41,11 +41,11 @@ release-iop-lib:
 
 release-iop-bin:
 	@if test $(IOP_BIN) ; then \
-	   $(ECHO) Installing $(IOP_BIN) to $(PS2SDK)/iop/irx ; \
+	   $(PRINTF) 'Installing %s to %s/iop/irx\n' $(IOP_BIN) $(PS2SDK) ; \
 	   cp -f $(IOP_BIN) $(PS2SDK)/iop/irx/ ; \
-	   chmod 644 $(PS2SDK)/iop/irx/`basename $(IOP_BIN)` ; \
+	   chmod 644 $(PS2SDK)/iop/irx/$$(basename $(IOP_BIN)) ; \
 	   for file in $(IOP_BIN_ALTNAMES); do \
-	      ln -sf `basename $(IOP_BIN)` $(PS2SDK)/iop/irx/$$file; \
+	      ln -sf $$(basename $(IOP_BIN)) $(PS2SDK)/iop/irx/$$file; \
 	   done; \
 	fi;
 
@@ -58,9 +58,9 @@ release-iop-include:
 	@if test -d include ; then \
 	   for file in $$(find include -type f | cut -d'/' -f2-); do \
 	      if test -f include/$$file ; then \
-	         $(ECHO) Installing include/$$file to $(PS2SDK)/iop/include ; \
+	         $(PRINTF) 'Installing include/%s to %s/iop/include\n' $$file $(PS2SDK) ; \
 	         mkdir -p $(PS2SDK)/iop/include/$$(dirname $$file) ; \
-	         cp -t $(PS2SDK)/iop/include/$$(dirname $$file) -f include/$$file ; \
+	         cp -f include/$$file $(PS2SDK)/iop/include/$$(dirname $$file) ; \
 	         chmod 644 $(PS2SDK)/iop/include/$$file ; \
 	      fi \
 	   done; \
diff --git a/iop/startup/Makefile b/iop/startup/Makefile
@@ -15,6 +15,6 @@ include $(PS2SDKSRC)/iop/Rules.release
 clean:
 
 release:
-	$(ECHO) Installing $(IOP_SRC_DIR)linkfile into $(PS2SDK)/iop/startup
+	@$(PRINTF) 'Installing %slinkfile into %s/iop/startup\n' $(IOP_SRC_DIR) $(PS2SDK)
 	cp -f $(IOP_SRC_DIR)linkfile $(PS2SDK)/iop/startup
 
diff --git a/samples/Makefile b/samples/Makefile
@@ -10,13 +10,13 @@ SAMPLES_TARGET = $(PS2SDK)/samples
 SHARE_TARGET = $(PS2DEV)/share
 
 all:
-	@$(ECHO) Nothing to do in samples
+	@$(PRINTF) 'Nothing to do in samples\n'
 
 clean:
-	@$(ECHO) Nothing to clean in samples
+	@$(PRINTF) 'Nothing to clean in samples\n'
 
 release: release-samples
-	@$(ECHO) Released samples dir.
+	@$(PRINTF) 'Released samples dir.\n'
 
 release-samples:
 	$(MKDIR) -p $(SAMPLES_TARGET)
diff --git a/samples/Makefile.iopglobal_sample b/samples/Makefile.iopglobal_sample
@@ -94,7 +94,7 @@ $(IOP_OBJS_DIR)%.o: $(IOP_SRC_DIR)%.s
 # Rules to build imports.lst.
 $(IOP_OBJS_DIR)build-imports.c: $(IOP_SRC_DIR)imports.lst
 	$(DIR_GUARD)
-	$(ECHO) "#include \"irx_imports.h\"" > $@
+	$(PRINTF) '%s\n' "#include \"irx_imports.h\"" > $@
 	cat $< >> $@
 
 $(IOP_OBJS_DIR)imports.o: $(IOP_OBJS_DIR)build-imports.c
@@ -103,7 +103,7 @@ $(IOP_OBJS_DIR)imports.o: $(IOP_OBJS_DIR)build-imports.c
 
 # Rules to build exports.tab.
 $(IOP_OBJS_DIR)build-exports.c: $(IOP_SRC_DIR)exports.tab
-	$(ECHO) "#include \"irx.h\"" > $@
+	$(PRINTF) '%s\n' "#include \"irx.h\"" > $@
 	cat $< >> $@
 
 $(IOP_OBJS_DIR)exports.o: $(IOP_OBJS_DIR)build-exports.c
diff --git a/samples/Makefile.pref_sample b/samples/Makefile.pref_sample
@@ -57,5 +57,6 @@ STRIP ?= strip
 MKDIR ?= mkdir
 RMDIR ?= rmdir
 ECHO ?= echo
+PRINTF ?= printf
 
 MAKEREC ?= $(MAKE) -C
diff --git a/samples/Rules.samples b/samples/Rules.samples
@@ -13,18 +13,18 @@ TARGET = $(PS2SDK)/samples/$(SAMPLE_DIR)
 #
 
 all:
-	@$(ECHO) Nothing to do here.
+	@$(PRINTF) 'Nothing to do here.\n'
 
 clean:
-	@$(ECHO) Nothing to do here.
+	@$(PRINTF) 'Nothing to do here.\n'
 
 
 #
 # Default release target creates the directory and copies files.
 #
 
-release: sample-dir sample-files
-	@$(ECHO) Released: $(SAMPLE_DIR)
+release: | sample-dir sample-files
+	@$(PRINTF) 'Released: %s\n' $(SAMPLE_DIR)
 
 
 #
@@ -34,7 +34,7 @@ release: sample-dir sample-files
 
 sample-dir:
 	@if test -z $(SAMPLE_DIR) ; then \
-	  $(ECHO) SAMPLE_DIR must define the target directory. ; \
+	  $(PRINTF) 'SAMPLE_DIR must define the target directory.\n' ; \
 	  exit 1; \
 	fi
 	$(MKDIR) -p $(TARGET)
@@ -45,16 +45,16 @@ sample-dir:
 # directory.  This does not currently handle subdirectories.
 #
 
-sample-files:
+sample-files: | sample-dir
 	@for file in *; do \
 	   if [ $$file = "Makefile" ] ; then \
-	      $(ECHO) Skipping Makefile. ; \
+	      $(PRINTF) 'Skipping Makefile.\n' ; \
 	   elif [ $$file = "Makefile.sample" ] ; then \
-	      $(ECHO) Installing $$file to $(TARGET)/Makefile ; \
+	      $(PRINTF) 'Installing %s to %s/Makefile\n' $$file $(TARGET) ; \
 	      cp -f $$file $(TARGET)/Makefile ; \
 	      chmod 644 $(TARGET)/Makefile ; \
 	   elif test -f $$file  ; then \
-	      $(ECHO) Installing $$file to $(TARGET) ; \
+	      $(PRINTF) 'Installing %s to %s\n' $$file $(TARGET) ; \
 	      cp -f $$file $(TARGET) ; \
 	      chmod 644 $(TARGET)/$$file ; \
 	   fi ; \
diff --git a/tools/Rules.release b/tools/Rules.release
@@ -22,7 +22,7 @@ release-dirs:
 
 release-bin:
 	 @if test $(TOOLS_BIN) ; then \
-	    $(ECHO) Installing $(TOOLS_BIN) to $(PS2SDK) ; \
+	    $(PRINTF) 'Installing %s to %s\n' $(TOOLS_BIN) $(PS2SDK) ; \
 	    cp -f $(TOOLS_BIN) $(RELEASE_TOOLS_DIRS) ; \
 	 fi;
 
