Skip to content

Commit 18cf72f

Browse files
committed
#584 the bitmap/font tool now works when packaged on macos.
1 parent 656463f commit 18cf72f

3 files changed

Lines changed: 10 additions & 9 deletions

File tree

.github/workflows/build_linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646
mvn -B install -DskipTests -Dgpg.skip=true --file font-bmp-editor/pom.xml
4747
cd font-bmp-editor/target
4848
jpackage -n BitMapEdit -p jfx/deps --input jfx/app \
49-
--icon tcMenuDesigner.ico --app-version 99.99.99 --verbose \
49+
--icon ./classes/img/menu-icon.png --app-version 99.99.99 --verbose \
5050
--java-options '-Dprism.lcdtext=false -Djava.library.path=$APPDIR/deb' \
5151
--add-modules "jdk.crypto.cryptoki" \
5252
--linux-app-category Development \

.github/workflows/build_mac.yml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,9 @@ jobs:
4444
mvn -B install -DskipTests -Dgpg.skip=true --file font-bmp-editor/pom.xml
4545
cd font-bmp-editor/target
4646
jpackage --type app-image -n BitMapEdit -p jfx/deps --input jfx/app \
47-
--resource-dir .\classes\img\ --icon tcMenuDesigner.ico --app-version 99.99.99 --verbose \
48-
--java-options '-Dprism.lcdtext=false -Djava.library.path=$APPDIR/win' \
47+
--icon ./classes/img/AppIcon.icns \
48+
--app-version 99.99.99 --verbose \
49+
--java-options '-Dprism.lcdtext=false -Djava.library.path=$APPDIR/mac' \
4950
--add-modules "jdk.crypto.cryptoki" \
5051
-m com.thecoderscorner.bmped/com.thecoderscorner.bmped.BitMapEditApp
5152

.github/workflows/build_windows.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,15 @@ jobs:
5353
-m com.thecoderscorner.tcmenu.menuEditorUI/com.thecoderscorner.menu.editorui.cli.TcMenuDesignerCmd
5454
5555
- name: Build Bitmap and Font editor
56+
shell: bash
5657
run: |
5758
mvn -B install -DskipTests -Dgpg.skip=true --file font-bmp-editor/pom.xml
5859
cd font-bmp-editor/target
59-
60+
jpackage --type app-image -n BitMapEdit -p jfx/deps --input jfx/app \
61+
--resource-dir .\classes\img\ --icon tcMenuDesigner.ico --app-version 99.99.99 --verbose \
62+
--java-options '-Dprism.lcdtext=false -Djava.library.path=$APPDIR/win' \
63+
--add-modules "jdk.crypto.cryptoki" \
64+
-m com.thecoderscorner.bmped/com.thecoderscorner.bmped.BitMapEditApp
6065
6166
- name: Package EXE and config files
6267
shell: bash
@@ -66,11 +71,6 @@ jobs:
6671
cp archive/tcMenuGenerator/target/tcmenu/app/tcmenu.cfg packaged/app/
6772
cp archive/tcMenuGenerator/target/tcMenuDesigner/tcMenuDesigner.exe packaged/
6873
cp archive/tcMenuGenerator/target/tcMenuDesigner/app/tcMenuDesigner.cfg packaged/app/
69-
jpackage --type app-image -n BitMapEdit -p jfx/deps --input jfx/app \
70-
--resource-dir .\classes\img\ --icon tcMenuDesigner.ico --app-version 99.99.99 --verbose \
71-
--java-options '-Dprism.lcdtext=false -Djava.library.path=$APPDIR/win' \
72-
--add-modules "jdk.crypto.cryptoki" \
73-
-m com.thecoderscorner.bmped/com.thecoderscorner.bmped.BitMapEditApp
7474
7575
- name: Upload Windows artifacts
7676
uses: actions/upload-artifact@v4

0 commit comments

Comments
 (0)