Actions rebased

.github/workflows/distribute-latest.yml

@@ -0,0 +1,150 @@
+name: Automatic build and release
+
+on:
+  push:
+    branches: [ master ]
+
+jobs:
+  build_win:
+    name: Build for Windows
+    runs-on: windows-latest
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: make
+        run: |
+          make test
+          make clean
+          make echeck
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: binaries.win
+          # note: mingw gcc appears to ignore -o option
+          path: echeck.exe
+
+  build_mac:
+    name: Build for MacOS
+    runs-on: macOS-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: make
+        run: |
+          make test
+          make clean
+          make echeck
+
+      - name: Upload artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: binaries.mac
+          path: echeck
+
+  build_nix:
+    name: Build and zip
+    needs: [ build_win, build_mac ]
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          # get all tags
+          fetch-depth: 0
+      - name: make
+        run: |
+          make test
+          make clean
+          make echeck
+
+      - name: configure tag
+        run: |
+          VERSION=$(grep echeck_version echeck.c | head -1 | cut -f2 -d'"')
+          if [[ ! "${VERSION}" =~ ^[0-9][.][0-9]+[.][0-9]+$ ]]; then
+            echo "version tag X.Y.Z not found: $VERSION"
+            exit 1
+          fi
+          LASTTAG=$(git tag -l "v*" --sort='-committerdate' | head -1)
+          if [[ ! "${LASTTAG}" =~ ^v[0-9][.][0-9]+[.][0-9]+$ ]]; then
+            echo "last tag vX.Y.Z not found: $LASTTAG"
+            exit 1
+          fi
+          VTAG=$(git tag -l "v$VERSION")
+
+          echo "latest tag: $LASTTAG, current version: $VERSION, existing tag: $VTAG"
+
+          git config user.name "$GITHUB_ACTOR"
+          git config user.email "[email protected]"
+          git remote -v
+          REMOTE="https://$GITHUB_ACTOR:${{ secrets.GITHUB_TOKEN }}@github.com/$GITHUB_REPOSITORY.git"
+
+          if [[ "v$VERSION" != "$LASTTAG" && "$VTAG" == "" ]]; then
+            # create new tag and release draft
+            TAG="v$VERSION"
+            name="Release $VERSION"
+            body="Dies ist ein stabiles Release. Diese Beschrebung solle geändert werden.\n\nThis is a stable release draft. This description should be updated.\n\n$date"
+            draft=true
+            prerelease=false
+
+            git tag "$TAG"
+            git push "$REMOTE" "$TAG"
+          elif [[ "$VTAG" != "" && "$VTAG" == "v$VERSION" ]]; then
+            # update vX.Y-latest tag and prerelease
+            draft=false
+            prerelease=true
+            name="Pre-Release $VERSION"
+            body="Dies ist eine automatisch generierte Version mit den neuesten Änderungen. Sie kann eher Fehler enthalten als eine stabile Version.\n\nThis is an automatic release of the latest version. It is less safe to use than a stable version.\n\n$date"
+            short=$(echo "${VERSION}" | cut -d. -f-2)
+            TAG="${short}-latest"
+
+            git tag -f "$TAG"
+            git push --force "$REMOTE" "$TAG"
+          else
+            echo "not creating any release"
+            draft=
+            prerelease=
+          fi
+
+          body="${body//'%'/'%25'}"
+          body="${body//'\n'/'%0A'}"
+          body="${body//'\r'/'%0D'}"
+
+          echo "::set-env name=PRERELEASE::$prerelease"
+          echo "::set-env name=DRAFT::$draft"
+          echo "::set-env name=VERSION::$VERSION"
+          echo "::set-env name=TAG::$TAG"
+          echo "::set-env name=NAME::$name"
+          echo "::set-env name=BODY::$body"
+
+      - name: Download all binaries
+        uses: actions/download-artifact@v2
+
+      - name: Create zip
+        run: |
+          mv binaries.mac/echeck ./echeck.macos
+          mv binaries.win/echeck.exe ./echeck.exe
+          zip -r echeck.zip echeck echeck.macos echeck.exe e2 e3 changelog.txt LIESMICH.txt README.txt
+
+      - name: Upload zip artifact
+        uses: actions/upload-artifact@v2
+        with:
+          name: release
+          path: echeck.zip
+
+      - name: Create release
+        uses: meeDamian/[email protected]
+        if: env.PRERELEASE != '' && env.DRAFT != ''
+        with:
+          prerelease: ${{ env.PRERELEASE }}
+          draft: ${{ env.DRAFT }}
+          allow_override: true
+          token: ${{ secrets.GITHUB_TOKEN }}
+          tag: ${{ env.TAG }}
+          # commitish: ${{ github.ref }}
+          name: ${{ env.NAME }}
+          body: ${{ env.BODY }}
+          gzip: folders
+          files: >
+            echeck.zip

Makefile

@@ -1,5 +1,6 @@
 MINGW_STRIP = i686-w64-mingw32-strip
 MINGW_CC = i686-w64-mingw32-gcc
+GCC = gcc
 CFLAGS = -Wall -std=c99 -Werror -I.
 RELEASE_CFLAGS = $(CFLAGS) -Os
 DEBUG_CFLAGS = $(CFLAGS) -g
@@ -31,15 +32,18 @@ echeck.exe: echeck.c unicode.c unicode.h config.h
 	$(MINGW_CC) $(RELEASE_CFLAGS) -o echeck.exe echeck.c unicode.c
 	$(MINGW_STRIP) echeck.exe
 
-echeck: echeck.c unicode.c unicode.h config.h $(TEST_SRC) $(TEST_HDR)
-	$(CC) $(DEBUG_CFLAGS) -DWITH_CUTEST -o echeck echeck.c unicode.c $(TEST_SRC)
+echeck.dbg: echeck.c unicode.c unicode.h config.h $(TEST_SRC) $(TEST_HDR)
+	$(GCC) $(DEBUG_CFLAGS) -DWITH_CUTEST -o echeck.dbg echeck.c unicode.c $(TEST_SRC)
+
+echeck: echeck.c unicode.c unicode.h config.h
+	$(GCC) $(RELEASE_CFLAGS) -o echeck echeck.c unicode.c
 
 clean:
-	@rm -f *.o core *.bak echeck echeck.exe echeck.zip
+	@rm -f *.o core *.bak echeck echeck.dbg echeck.exe echeck.zip
 
-test: echeck
-	@./echeck -T=all -Lde -Re3 -b
-	@./echeck -T=all -Lde -Re2 -b
+test: echeck.dbg
+	@./echeck.dbg -T=all -Lde -Re3 -b
+	@./echeck.dbg -T=all -Lde -Re2 -b
 
 echeck.zip: echeck.exe changelog.txt LIESMICH.txt README.txt
 	zip -r echeck.zip echeck.exe e2 e3 changelog.txt LIESMICH.txt README.txt

echeck.c

@@ -1688,6 +1688,13 @@ void set_order_unit(unit * u)
   order_unit = u;
 }
 
+void set_output(FILE *out, FILE *err) {
+  if (out)
+    OUT = out;
+  if (err)
+    ERR = err;
+}
+
 #ifdef WITH_CUTEST
 
 void mock_input(const char *input)
@@ -1697,13 +1704,6 @@ void mock_input(const char *input)
   mock_pos = mocked_input;
 }
 
-void set_output(FILE *out, FILE *err) {
-  if (out)
-    OUT = out;
-  if (err)
-    ERR = err;
-}
-
 int get_long_order_line() {
   if (order_unit)
     return order_unit->long_order_line;
@@ -2585,8 +2585,7 @@ void checkemail(void)
     return;
   }
   scat(errtxt[DELIVERYTO]);
-  scat(" ");
-  scat(addr);
+  Scat(addr);
 }
 
 /*
@@ -3562,7 +3561,7 @@ void check_ally(void)
   case P_GUARD:
   case P_FACTIONSTEALTH:
   case P_ALLES:
-  case P_NOT: /* FIXME: legal? */
+  case P_NOT: /* server actually accepts HELFE foe NICHT = HELFE foe ALLES NICHT */
     Scat(printparam(i));
     break;
   default:
@@ -4629,7 +4628,7 @@ void checkanorder(char *Orders)
     break;
 
   case K_SCHOOL:               /* Magiegebiet */
-    /* FIXME not an order any more */
+    /* not an order any more */
     s = getstr();
     i = findstr(magiegebiet, s, 5);
     if (i < 0) {