Merge development to master

.github/workflows/_compile.yml

@@ -20,10 +20,15 @@ on:
 
 env:
   archive_name: clib4-${{ inputs.git_tag }}${{ inputs.spe == 'yes' && '_SPE' || '' }}
+  SSH_KEY: ${{ secrets.DEBSERVER_PRIVATE_KEY }}
+  SSH_USER: ${{ secrets.DEBSERVER_USERNAME }}
+  SSH_PORT: ${{ secrets.DEBSERVER_PORT }}
+  SSH_HOST: ${{ secrets.DEBSERVER_HOST }}
 
 jobs:
   compile:
     runs-on: ubuntu-latest
+    environment: deploy_environment
     container:
       image: walkero/amigagccondocker:os4-gcc${{ inputs.gcc }}
       volumes:
@@ -75,19 +80,50 @@ jobs:
           asset_name: ${{ env.archive_name }}_amd64.deb
           asset_content_type: application/vnd.debian.binary-pac
 
-      - name: Upload DEB release file to the server
-        uses: kostya-ten/ssh-server-deploy@v4
-        with:
-          host: ${{ secrets.DEBSERVER_HOST }}
-          port: ${{ secrets.DEBSERVER_PORT }}
-          username: ${{ secrets.DEBSERVER_USERNAME }}
-          private_key: ${{ secrets.DEBSERVER_PRIVATE_KEY }}
-          scp_source: /opt/code/${{ env.archive_name }}_amd64.deb
-          scp_target: /opt/amigarepo/ubuntu/pool/main
-          before_script: |
-            rm /opt/amigarepo/ubuntu/pool/main/clib4-*_amd64.deb
-          after_script: |
-            /root/regenerate-packages.sh
+      - name: Install SSH client
+        run: sudo apt-get update && sudo apt-get install -y openssh-client
+
+      - name: Setup SSH key
+        if: ${{ inputs.spe == 'no' }}
+        run: |
+          mkdir -p ~/.ssh
+          echo "$SSH_KEY" > ~/.ssh/id_rsa
+          chmod 600 ~/.ssh/id_rsa
+          ssh-keyscan -p $SSH_PORT -H $SSH_HOST >> ~/.ssh/known_hosts
+
+      - name: Before script
+        if: ${{ inputs.spe == 'no' }}
+        run: |
+          echo "Remove old release"
+          ssh -i ~/.ssh/id_rsa \
+              -p $SSH_PORT \
+              -o StrictHostKeyChecking=no \
+              $SSH_USER@$SSH_HOST \
+              "rm /opt/amigarepo/ubuntu/pool/main/clib4-v*_amd64.deb"
+
+      - name: Upload via SCP
+        if: ${{ inputs.spe == 'no' }}
+        run: |
+          scp -i ~/.ssh/id_rsa \
+              -P $SSH_PORT \
+              -o StrictHostKeyChecking=no \
+              "/opt/code/${{ env.archive_name }}_amd64.deb" \
+              $SSH_USER@$SSH_HOST:/opt/amigarepo/ubuntu/pool/main
+
+      - name: After script
+        if: ${{ inputs.spe == 'no' }}
+        run: |
+          echo "Regenerate the packages"
+          ssh -i ~/.ssh/id_rsa \
+              -p $SSH_PORT \
+              -o StrictHostKeyChecking=no \
+              $SSH_USER@$SSH_HOST \
+              "sh /root/regenerate-packages.sh"
+
+      - name: SSH Cleanup
+        if: ${{ inputs.spe == 'no' }}
+        run: |
+          rm -f ~/.ssh/id_rsa
 
       - name: Create Pull Request
         if: ${{ inputs.spe == 'no' }}

.github/workflows/makeRelease.yml

@@ -15,6 +15,8 @@ jobs:
       git_tag: ${{ github.event.release.tag_name }}
       gcc: 11
       spe: "no"
+    secrets: inherit
+
 
   compile-spe:
     name: Build for PowerPC SPE cpus
@@ -23,6 +25,7 @@ jobs:
       git_tag: ${{ github.event.release.tag_name }}
       gcc: 6
       spe: "yes"
+    secrets: inherit
 
   announcements:
     needs: [compile-ppc, compile-spe]

.gitignore

@@ -17,4 +17,6 @@ build/
 clib4/
 
 .idea
-.vscode
+.vscode
+
+Makefile

GNUmakefile.os4

@@ -71,7 +71,7 @@ DPKG_LIB ?= clib4_1.0_amd64
 WARNINGS := \
 	-Wall -W -Wextra -Wpointer-arith -Wsign-compare -Wmissing-prototypes \
 	-Wundef -Wmissing-declarations -Wunused -Wwrite-strings -Wno-unused-value -Wno-comment -Wno-missing-braces \
-	-Wno-deprecated-declarations -Wno-sign-compare -Wno-unused-variable -Wno-parentheses -Wno-missing-prototypes \
+	-Wno-deprecated-declarations -Wno-unused-variable -Wno-parentheses -Wno-missing-prototypes \
 	-Wstrict-aliasing -Wno-shadow -Wno-discarded-qualifiers -Wno-unused-function -Wno-unused-parameter -Wno-strict-aliasing \
     -Wno-type-limits -Wno-cast-function-type -Wno-frame-address -Wno-error=unused-but-set-variable -Wno-stringop-overflow -Werror \
      # -Wbad-function-cast -Wconversion -Wformat
@@ -116,7 +116,7 @@ STATIC   := $(if $(STATIC),$(STATIC),yes)
 LARGEDATA :=
 OPTIONS  += $(LARGEDATA) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -Wa,-mregnames -fno-builtin -nostdlib -D_GNU_SOURCE -D_XOPEN_SOURCE -D_USE_GNU -pipe \
 		-nostdinc -nostartfiles -nostdlib
-OPTIMIZE := -O3 -mregnames -mmultiple -mupdate -mstrict-align
+OPTIMIZE := -O3 -mregnames
 
 STABS :=
 DLIBS :=
@@ -128,9 +128,14 @@ else
 	DLIBS += $(BUILD_DIR)/lib/libdebug.a
 endif
 
+
 CFLAGS     := $(WARNINGS) $(OPTIMIZE) $(OPTIONS) $(INCLUDES) -D__USE_INLINE__
 CFLAGS_N   := $(WARNINGS) $(OPTIMIZE) $(OPTIONS) $(INCLUDES)
-AFLAGS     := -Wa,-mregnames -mstrict-align
+AFLAGS     := -Wa,-mregnames
+
+ifdef USE_TEMPFILES
+	CFLAGS += -DUSE_TEMPFILES
+endif
 
 ifdef SPE
 	CC := ppc-amigaos-gcc-6.4.0
@@ -146,7 +151,8 @@ ifdef SPE
 endif
 
 ifdef PROFILE
-	CFLAGS += -pg
+	CFLAGS += -pg -falign-functions=32  -fno-omit-frame-pointer
+	AFLAGS += -fno-omit-frame-pointer
 	DLIBS += -Lbuild/lib -lprofile
 endif
 
@@ -196,6 +202,7 @@ include libpthread.gmk
 include libcrypt.gmk
 include librt.gmk
 include shared.gmk
+# Leave profile as latest one
 include libprofile.gmk
 
 prepare:

installer/Install

@@ -2,6 +2,7 @@
 (complete 0)
 (set @default-dest "LIBS:")
 (set @default-sdk-dest "SDK:clib4")
+(set @default-env-dest "ENVARC:")
 (set @default-dest
 	(askdir
 		(prompt "Where would you like to install clib4.library?\nA new Drawer will be created if necessary")
@@ -19,6 +20,16 @@
 	(dest @default-dest)
 	(confirm)
 )
+(complete 45)
+(copyfiles
+	(prompt "Do you want to install Terminfo files?")
+	(help @copyfiles-help)
+	(source "misc")
+	(choices "terminfo")
+	(dest @default-env-dest)
+	(confirm)
+)
+
 (complete 60)
 (copyfiles
 	(prompt "Do you want to install development files?")