#584 the bitmap/font tool now works when packaged on macos.

davetcc · davetcc · commit c45515ee6cc3 · 2026-06-14T08:28:00.000+01:00
diff --git a/.github/workflows/build_linux.yml b/.github/workflows/build_linux.yml
@@ -8,6 +8,8 @@ jobs:
   build-linux-binary:
 
     runs-on: ubuntu-latest
+    env:
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
 
     steps:
     - uses: actions/checkout@v4
@@ -19,13 +21,6 @@ jobs:
         distribution: 'liberica'
         cache: maven
 
-    - name: Extract version from Maven cache
-      id: get-version
-      run: |
-        version=$(mvn org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate \
-                  -Dexpression=project.version -q -DforceStdout --file archive/tcMenuGenerator/pom.xml)
-        echo "version=$version" >> $GITHUB_ENV
-
     - name: Build tcMenuGenerator binary
       run: |
         mvn -B install -DskipTests -Dgpg.skip=true --file api/tcMenuJavaApi/pom.xml
@@ -42,13 +37,33 @@ jobs:
                  --linux-app-category Development \
                  --linux-menu-group "Development;Utility;" \
                  --java-options "-Dprism.lcdtext=false -Djava.library.path=$APPDIR/lin" \
-                 --app-version ${{ env.version }} \
+                 --app-version 99.99.99 \
                  --add-modules "jdk.crypto.cryptoki" \
                  -m com.thecoderscorner.tcmenu.menuEditorUI/com.thecoderscorner.menu.editorui.cli.TcMenuDesignerCmd
 
+    - name: Build Bitmap and Font editor
+      run: |
+        mvn -B install -DskipTests -Dgpg.skip=true --file font-bmp-editor/pom.xml
+        cd font-bmp-editor/target
+        jpackage -n BitMapEdit -p jfx/deps --input jfx/app  \ 
+              --icon tcMenuDesigner.ico --app-version 99.99.99 --verbose \
+              --java-options '-Dprism.lcdtext=false  -Djava.library.path=$APPDIR/deb' \
+              --add-modules "jdk.crypto.cryptoki" \
+              --linux-app-category Development \
+              --linux-menu-group "Development;Utility;" \
+              -m com.thecoderscorner.bmped/com.thecoderscorner.bmped.BitMapEditApp
+
+
     - name: Upload DEB artifact
       uses: actions/upload-artifact@v4
       with:
-        name: tcmenudesigner_${{ env.version }}_linux_deb-${{ github.sha }}
+        name: tcmenudesigner_NIGHTLY_linux_deb-${{ github.sha }}
+        path: |
+          archive/tcMenuGenerator/target/tcmenudesigner_99.99.99_amd64.deb
+
+    - name: Upload macOS BitmapFontEditor artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: bitmapedit-NIGHTLY_macos-${{ github.sha }}.dmg
         path: |
-          archive/tcMenuGenerator/target/tcmenudesigner_${{ env.version }}_amd64.deb
+          font-bmp-editor/target/bitmapedit-99.99.99_amd64.deb
diff --git a/.github/workflows/build_mac.yml b/.github/workflows/build_mac.yml
@@ -8,6 +8,8 @@ jobs:
   build-macos-binary:
 
     runs-on: macos-latest
+    env:
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
 
     steps:
     - uses: actions/checkout@v4
@@ -19,13 +21,6 @@ jobs:
         distribution: 'liberica'
         cache: maven
 
-    - name: Extract version from Maven cache
-      id: get-version
-      run: |
-        version=$(mvn org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate \
-                  -Dexpression=project.version -q -DforceStdout --file archive/tcMenuGenerator/pom.xml)
-        echo "version=$version" >> $GITHUB_ENV
-
     - name: Build tcMenuGenerator binary
       run: |
         mvn -B install -DskipTests -Dgpg.skip=true --file api/tcMenuJavaApi/pom.xml
@@ -39,14 +34,32 @@ jobs:
                  --verbose \
                  --license-file ../../LICENSE \
                  --vendor TheCodersCorner \
-                 --app-version ${{ env.version }} \
+                 --app-version 99.99.99 \
                  --add-modules "jdk.crypto.cryptoki" \
-                 --java-options "-Dprism.lcdtext=false -Djava.library.path=$APPDIR/mac" \
+                 --java-options '-Dprism.lcdtext=false -Djava.library.path=$APPDIR/mac' \
                  -m com.thecoderscorner.tcmenu.menuEditorUI/com.thecoderscorner.menu.editorui.cli.TcMenuDesignerCmd
 
-    - name: Upload macOS artifact
+    - name: Build Bitmap and Font editor
+      run: |
+        mvn -B install -DskipTests -Dgpg.skip=true --file font-bmp-editor/pom.xml
+        cd font-bmp-editor/target
+        cp classes/img/tcMenuDesigner.ico .
+        jpackage --type app-image -n BitMapEdit -p jfx/deps --input jfx/app  \ 
+            --resource-dir .\classes\img\ --icon tcMenuDesigner.ico --app-version 99.99.99 --verbose \
+            --java-options '-Dprism.lcdtext=false  -Djava.library.path=$APPDIR/win' \
+            --add-modules "jdk.crypto.cryptoki" \
+            -m com.thecoderscorner.bmped/com.thecoderscorner.bmped.BitMapEditApp
+
+    - name: Upload macOS TcMenuDesigner artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: tcMenuDesigner-NIGHTLY_macos-${{ github.sha }}.dmg
+        path: |
+          archive/tcMenuGenerator/target/tcMenuDesigner-99.99.99.dmg
+          
+    - name: Upload macOS BitmapFontEditor artifact
       uses: actions/upload-artifact@v4
       with:
-        name: tcmenudesigner_${{ env.version }}_macos-${{ github.sha }}
+        name: BitMapEdit-NIGHTLY_macos-${{ github.sha }}.dmg
         path: |
-          archive/tcMenuGenerator/target/tcMenuDesigner-${{ env.version }}.dmg
+          font-bmp-editor/target/BitMapEdit-99.99.99.dmg
diff --git a/.github/workflows/build_windows.yml b/.github/workflows/build_windows.yml
@@ -8,6 +8,8 @@ jobs:
   build-windows-binary:
 
     runs-on: windows-latest
+    env:
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: true
 
     steps:
     - uses: actions/checkout@v4
@@ -19,14 +21,6 @@ jobs:
         distribution: 'liberica'
         cache: maven
 
-    - name: Extract version from Maven cache
-      id: get-version
-      shell: bash
-      run: |
-        version=$(mvn org.apache.maven.plugins:maven-help-plugin:3.2.0:evaluate \
-                  -Dexpression=project.version -q -DforceStdout --file archive/tcMenuGenerator/pom.xml)
-        echo "version=$version" >> $GITHUB_ENV
-
     - name: Build tcMenuGenerator binaries
       shell: bash
       run: |
@@ -41,7 +35,7 @@ jobs:
                  --win-console \
                  --resource-dir ./classes/img/ \
                  --icon tcMenuDesigner.ico \
-                 --app-version ${{ env.version }} \
+                 --app-version 99.99.99 \
                  --verbose \
                  --java-options "-Dprism.lcdtext=false -Djava.library.path=$APPDIR/win" \
                  --add-modules "jdk.crypto.cryptoki" \
@@ -52,12 +46,18 @@ jobs:
                  --input jfx/app \
                  --resource-dir ./classes/img/ \
                  --icon tcMenuDesigner.ico \
-                 --app-version ${{ env.version }} \
+                 --app-version 99.99.99 \
                  --verbose \
                  --java-options "-Dprism.lcdtext=false -Djava.library.path=$APPDIR/win" \
                  --add-modules "jdk.crypto.cryptoki" \
                  -m com.thecoderscorner.tcmenu.menuEditorUI/com.thecoderscorner.menu.editorui.cli.TcMenuDesignerCmd
 
+    - name: Build Bitmap and Font editor
+      run: |
+        mvn -B install -DskipTests -Dgpg.skip=true --file font-bmp-editor/pom.xml
+        cd font-bmp-editor/target
+       
+
     - name: Package EXE and config files
       shell: bash
       run: |
@@ -66,10 +66,25 @@ jobs:
         cp archive/tcMenuGenerator/target/tcmenu/app/tcmenu.cfg packaged/app/
         cp archive/tcMenuGenerator/target/tcMenuDesigner/tcMenuDesigner.exe packaged/
         cp archive/tcMenuGenerator/target/tcMenuDesigner/app/tcMenuDesigner.cfg packaged/app/
+        jpackage --type app-image -n BitMapEdit -p jfx/deps --input jfx/app  \
+              --resource-dir .\classes\img\ --icon tcMenuDesigner.ico --app-version 99.99.99 --verbose \
+              --java-options '-Dprism.lcdtext=false  -Djava.library.path=$APPDIR/win' \
+              --add-modules "jdk.crypto.cryptoki" \
+              -m com.thecoderscorner.bmped/com.thecoderscorner.bmped.BitMapEditApp
 
     - name: Upload Windows artifacts
       uses: actions/upload-artifact@v4
       with:
-        name: tcmenudesigner_${{ env.version }}_windows_exe-${{ github.sha }}
+        name: tcmenudesigner_NIGHTLY_windows_exe-${{ github.sha }}.exe
+        path: |
+          packaged
+
+    - name: Upload Windows BitmapFontEditor artifacts
+      uses: actions/upload-artifact@v4
+      with:
+        name: BitMapEdit_NIGHTLY_windows_exe-${{ github.sha }}.exe
         path: |
-          packaged
+          archive/font-bmp-editor/target/BitMapEdit/BitMapEdit.exe
+          
+          
+          
diff --git a/font-bmp-editor/scripts/packaging-bitmap-font-editor.md b/font-bmp-editor/scripts/packaging-bitmap-font-editor.md
@@ -44,9 +44,9 @@ Ensure you are in the `font-bmp-editor/target` directory.
 
     cp classes/img/tcMenuDesigner.ico .
 
-    jpackage --type app-image -n BitMapEdit -p jfx/deps --input jfx/app --win-console \ 
-    --resource-dir .\classes\img\ --icon tcMenuDesigner.ico --app-version 4.5.0 --verbose \
-    --java-options "-Dprism.lcdtext=false  -Djava.library.path=$APPDIR/win" \
+    jpackage --type app-image -n BitMapEdit -p jfx/deps --input jfx/app  \ 
+    --resource-dir .\classes\img\ --icon tcMenuDesigner.ico --app-version 4.5.9 --verbose \
+    --java-options '-Dprism.lcdtext=false  -Djava.library.path=$APPDIR/win' \
     --add-modules "jdk.crypto.cryptoki" \
     -m com.thecoderscorner.bmped/com.thecoderscorner.bmped.BitMapEditApp
 
@@ -56,7 +56,7 @@ Ensure you are in the `font-bmp-editor/target` directory.
 Ensure you are in the `font-bmp-editor/target` directory.
 
     jpackage  -n BitMapEdit -p jfx/deps --input jfx/app  --icon ./classes/img/AppIcon.icns \
-    --app-version 4.5.0 --verbose \
+    --app-version 4.5.9 --verbose \
     --java-options '-Djava.library.path=$APPDIR/mac -Dprism.lcdtext=false' \
     --add-modules "jdk.crypto.cryptoki" \
     -m com.thecoderscorner.bmped/com.thecoderscorner.bmped.BitMapEditApp
