Skip to content

Commit 9ffe5e0

Browse files
committed
App: Make it compilable!
1 parent 5511900 commit 9ffe5e0

File tree

2 files changed

+26
-7
lines changed

2 files changed

+26
-7
lines changed

app/core/pom.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,12 @@
116116
<version>${saucer4j.version}</version>
117117
<scope>compile</scope>
118118
</dependency>
119+
<dependency>
120+
<groupId>com.github.saucer.saucer4j</groupId>
121+
<artifactId>native</artifactId>
122+
<version>${saucer4j.version}</version>
123+
<scope>compile</scope>
124+
</dependency>
119125
<dependency>
120126
<groupId>com.github.saucer.saucer4j</groupId>
121127
<artifactId>webview2</artifactId>

build.sh

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ APP_ID="co.casterlabs.caffeinated"
66
APP_NAME="Casterlabs-Caffeinated"
77
MAIN_CLASS="co.casterlabs.caffeinated.bootstrap.Bootstrap"
88
VM_OPTIONS='--arg=-Xms1M --arg=-XX:+UseCompressedOops --arg=-XX:MaxHeapFreeRatio=2 --arg=-XX:MinHeapFreeRatio=1'
9-
SAUCER4J_VERSION="64fddc7"
9+
SAUCER4J_VERSION="98dbc5f"
1010

1111
if [[ $@ == *"compile"* ]]; then
1212
echo "------------ Compiling app ------------"
@@ -32,6 +32,19 @@ if [[ $@ == *"dist-windows"* ]]; then
3232
echo "------------ Finished bundling for Windows ------------"
3333
fi
3434

35+
if [[ $@ == *"dist-nosign-windows"* ]]; then
36+
echo "------------ Bundling for Windows ------------"
37+
38+
java -jar bundler.jar bundle \
39+
--arch x86_64 --os windows \
40+
--id $APP_ID --name $APP_NAME --icon icon.png \
41+
--java 11 $VM_OPTIONS --main $MAIN_CLASS \
42+
--file app/core/WMC-JsonConsoleWrapper.exe --dependency "app/core/target/Caffeinated.jar" \
43+
--dependency "https://jitpack.io|com.github.saucer.saucer4j:webview2:$SAUCER4J_VERSION:.jar"
44+
45+
echo "------------ Finished bundling for Windows ------------"
46+
fi
47+
3548
if [[ $@ == *"dist-macos"* ]]; then
3649
echo "------------ Bundling for macOS ------------"
3750

@@ -62,12 +75,12 @@ if [[ $@ == *"dist-linux"* ]]; then
6275
--dependency "app/core/target/Caffeinated.jar" \
6376
--dependency "https://jitpack.io|com.github.saucer.saucer4j:webkitgtk:$SAUCER4J_VERSION:.jar"
6477

65-
java -jar bundler.jar bundle \
66-
--arch arm --os gnulinux \
67-
--id $APP_ID --name $APP_NAME --icon icon.png \
68-
--java 11 $VM_OPTIONS --main $MAIN_CLASS \
69-
--dependency "app/core/target/Caffeinated.jar" \
70-
--dependency "https://jitpack.io|com.github.saucer.saucer4j:webkitgtk:$SAUCER4J_VERSION:.jar"
78+
# java -jar bundler.jar bundle \
79+
# --arch arm --os gnulinux \
80+
# --id $APP_ID --name $APP_NAME --icon icon.png \
81+
# --java 11 $VM_OPTIONS --main $MAIN_CLASS \
82+
# --dependency "app/core/target/Caffeinated.jar" \
83+
# --dependency "https://jitpack.io|com.github.saucer.saucer4j:webkitgtk:$SAUCER4J_VERSION:.jar"
7184

7285
java -jar bundler.jar bundle \
7386
--arch x86_64 --os gnulinux \

0 commit comments

Comments
 (0)