165 dont include sdk include in the public include fields of clib4

.github/workflows/makeRelease.yml

@@ -1,6 +1,8 @@
 name: Make a new release
 on:
   release:
+    branches:
+      - master
     types: 
       - published
 
@@ -14,16 +16,19 @@ jobs:
         - '${{ github.workspace }}:/opt/code'
     steps:
       - name: Pull code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Compile clib4
         run: |
           cd /opt/code && \
-          make -j1 -f GNUmakefile.os4 OS=os4 SHARED=no
-      - name: Create the release archive
+          make -j1 -f GNUmakefile.os4 OS=os4 SHARED=no GITTAG=${{ github.event.release.tag_name }}
+      - name: Create the LHA release archive
         run: |
           make -f GNUmakefile.os4 release && \
           mv clib4.lha clib4-${{ github.event.release.tag_name }}.lha
-      - name: Upload Release Asset
+      - name: Create the DEB release archive
+        run: |
+          make -f GNUmakefile.os4 dpkg DPKG_LIB=clib4-${{ github.event.release.tag_name }}_amd64
+      - name: Upload LHA release file in GitHub
         uses: actions/upload-release-asset@v1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -32,7 +37,41 @@ jobs:
           asset_path: /opt/code/clib4-${{ github.event.release.tag_name }}.lha
           asset_name: clib4-${{ github.event.release.tag_name }}.lha
           asset_content_type: application/x-lzh-compressed
+      - name: Upload DEB release file in GitHub
+        uses: actions/upload-release-asset@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ github.event.release.upload_url }}
+          asset_path: /opt/code/clib4-${{ github.event.release.tag_name }}_amd64.deb
+          asset_name: clib4-${{ github.event.release.tag_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: clib4-${{ github.event.release.tag_name }}_amd64.deb
+          scp_target: /opt/amigarepo/ubuntu/pool/main
+          before_script: |
+            rm /opt/amigarepo/ubuntu/pool/main/clib4*.deb
+          after_script: |
+            /root/regenerate-packages.sh
+      # - name: Prepare OS4Depot release
+      #   run: |
+      #     mkdir os4depot-release
+      #     cp clib4-${{ github.event.release.tag_name }}.lha ./os4depot-release/clib4.lha
+      #     cp ./os4depot.readme ./os4depot-release/clib4_lha.readme
+      #     sed -i "s/VERSION_TAG/${{ github.event.release.tag_name }}/" ./os4depot-release/os4depot.readme
+      #     sed -i "s/OS4DEPOT_PASSPHRASE/${{ secrets.OS4DEPOT_PASSPHRASE }}/" ./os4depot-release/os4depot.readme
       # - name: Release on OS4Depot
-      # - name: Release on Aminet
-      # - name: Prepare Ubuntu apt packages
-      # - name: Release on Ubuntu apt server
+      #   uses: SamKirkland/FTP-Deploy-Action@v4.3.4
+      #   with:
+      #     server: os4depot.net
+      #     port: 21
+      #     username: ftp
+      #     password: 
+      #     server-dir: ./upload
+      #     local-dir: /opt/code/os4depot-release/

.github/workflows/mergeMaster.yml

@@ -0,0 +1,26 @@
+name: Merge into master build
+on:
+  pull_request:
+    branches:
+      - master
+    types:
+      - closed
+
+jobs:
+  run_if_merged:
+    if: github.event.pull_request.merged == true
+    name: Build latest code
+    runs-on: ubuntu-latest
+    container:
+      image: walkero/amigagccondocker:os4-gcc11-exp
+      volumes:
+        - '${{ github.workspace }}:/opt/code'
+    steps:
+      - name: Pull code
+        uses: actions/checkout@v4
+      - name: Compile clib4
+        run: |
+          cd /opt/code && \
+          make -j1 -f GNUmakefile.os4 OS=os4 SHARED=no
+      - name: Create the release archive
+        run: make -f GNUmakefile.os4 release

.github/workflows/buildWithDocker.yml → .github/workflows/prChecks.yml

@@ -1,11 +1,11 @@
-name: Build with Docker
+name: Pull request build
 on:
-  push:
+  pull_request:
     branches:
       - master
-      - actions-cicd
-  pull_request:
-  workflow_dispatch:
+    types: 
+      - opened
+      - reopened
 
 jobs:
   run:
@@ -17,7 +17,7 @@ jobs:
         - '${{ github.workspace }}:/opt/code'
     steps:
       - name: Pull code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
       - name: Compile clib4
         run: |
           cd /opt/code && \

GNUmakefile.os4

@@ -8,7 +8,7 @@
 ##############################################################################
 
 .PHONY : all prepare all-targets all-libs clean \
-	version compile-tests install release dpkg 
+	gitver version compile-tests install release dpkg 
 
 # You may have to change the following sets of macro definitions which will
 # be used throughout the build makefile. These definitions cover the paths
@@ -55,7 +55,7 @@ LIB_ROOT ?= $(shell pwd)
 LIB_DIR = $(LIB_ROOT)/library
 BUILD_DIR = $(LIB_ROOT)/build
 OUTPUT_LIB = $(BUILD_DIR)/lib
-DPKG_LIB = clib4_1.0_amd64
+DPKG_LIB ?= clib4_1.0_amd64
 
 ##############################################################################
 
@@ -132,11 +132,30 @@ endif
 
 VERBOSE    ?= @
 
+##########################################################################
+# Set up version and date properties
+##########################################################################
+
+DATEISO = $(shell date --iso=date)
+DATESTR = $(shell date "+%d.%m.%Y")
+
+# Parse the repo tag to different defines, that will be used while
+# compiling clib4 library
+#
+# The tags should be like v(MAJOR).(MINOR).(PATCH)
+# in example v1.2.3
+#
+ifneq ($(origin GITTAG),undefined)
+MAJOR = $(patsubst v%,%,$(firstword $(subst ., ,$(GITTAG))))
+MINOR = $(word 2, $(subst ., ,$(GITTAG)))
+PATCH = $(word 3, $(subst ., ,$(GITTAG)))
+endif
+
 ##############################################################################
 
 # This is the first target: it depends on all the targets
 
-all: prepare all-targets all-libs clib4.library.debug clib4.library
+all: gitver prepare all-targets all-libs clib4.library.debug clib4.library
 
 ##############################################################################
 
@@ -182,12 +201,12 @@ ALL_TARGETS = \
 	$(OUTPUT_LIB)/crtend.o \
 	$(OUTPUT_LIB)/shcrtbegin.o \
 	$(OUTPUT_LIB)/shcrtend.o \
-    $(OUT_SHARED_LIB)/shared_library/clib4.o \
-    $(OUT_SHARED_LIB)/shared_library/math.o \
+	$(OUT_SHARED_LIB)/shared_library/clib4.o \
+	$(OUT_SHARED_LIB)/shared_library/math.o \
 	$(MAIN_LIB)
 
 ifdef SPE
-    ALL_TARGETS := PatchForSPE | $(ALL_TARGETS)
+	ALL_TARGETS := PatchForSPE | $(ALL_TARGETS)
 endif
 
 all-targets: $(ALL_TARGETS)
@@ -213,6 +232,16 @@ clean:
 
 ##############################################################################
 
+gitver:
+	$(VERBOSE)sed -i 's/[(]\([0-9]*\.[0-9]*\.[0-9]*\)[)]/($(DATESTR))/g' library/c.lib_rev.h
+	$(VERBOSE)sed -i 's/"\([0-9]*\.[0-9]*\.[0-9]*\)"/"$(DATESTR)"/g' library/c.lib_rev.h
+ifdef GITTAG
+	$(VERBOSE)sed -i 's/VERSION\t*[[:digit:]]/VERSION\t\t\t$(MAJOR)/g' library/c.lib_rev.h
+	$(VERBOSE)sed -i 's/REVISION\t*[[:digit:]]/REVISION\t\t$(MINOR)/g' library/c.lib_rev.h
+	$(VERBOSE)sed -i 's/SUBREVISION\t*[[:digit:]]/SUBREVISION\t\t$(PATCH)/g' library/c.lib_rev.h
+	$(VERBOSE)sed -i 's/clib4.library [0-9]*\.[0-9]*\.[0-9]*/clib4.library $(MAJOR).$(MINOR).$(PATCH)/g' library/c.lib_rev.h
+endif
+
 # Update the version numbers bound to the individual libraries
 version:
 	$(COPY) c.lib_rev.rev amiga/amiga.lib_rev.rev

library/c.lib_rev.h

@@ -1,8 +1,8 @@
 #define VERSION			1
 #define REVISION		0
-#define SUBREVISION     0
+#define SUBREVISION		0
 
 #define DATE			"27.09.2023"
 #define VERS			"clib4.library 1.0.0"
 #define VSTRING			"clib4.library 1.0.0 (27.09.2023)\r\n"
-#define VERSTAG			"\0$VER: clib4.library 1.0.0 (27.09.2023)"
+#define VERSTAG			"\0$VER: clib4.library 1.0.0 (27.09.2023)"

library/include/pthread.h

@@ -142,7 +142,12 @@ struct pthread_mutexattr {
 
 typedef struct pthread_mutexattr pthread_mutexattr_t;
 
-struct pthread_mutex;
+struct pthread_mutex {
+    void* mutex; // APTR
+    int kind;
+    int incond;
+    struct Task *owner;
+};
 
 typedef struct pthread_mutex pthread_mutex_t;
 
@@ -166,11 +171,15 @@ struct pthread_condattr {
 
 typedef struct pthread_condattr pthread_condattr_t;
 
-struct pthread_cond;
+struct pthread_cond {
+    int pad1;
+    void* semaphore; // SignalSemaphore
+    void* waiters;	// MinList
+};
 
 typedef struct pthread_cond pthread_cond_t;
 
-#define PTHREAD_COND_INITIALIZER {0, NULL_SEMAPHORE, NULL_MINLIST}
+#define PTHREAD_COND_INITIALIZER {0, 0, 0}
 
 //
 // Barriers
@@ -198,7 +207,9 @@ struct pthread_rwlockattr {
 
 typedef struct pthread_rwlockattr pthread_rwlockattr_t;
 
-struct pthread_rwlock;
+struct pthread_rwlock {
+    void* semaphore; // SignalSemaphore
+};
 
 typedef struct pthread_rwlock pthread_rwlock_t;