Updated java build for platform compat

TwilCynder · Dec 2, 2024 · cbbb5d1 · cbbb5d1
1 parent 2fb4a4f
commit cbbb5d1
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/editor/javaEditor/Makefile b/editor/javaEditor/Makefile
@@ -9,9 +9,7 @@ SOURCES=$(shell find src -name "*.java")
 dependant: $(SOURCES)
 ifeq (, $(shell which ant 2> /dev/null))
 	-@mkdir classes 2> /dev/null
-	javac -d ./classes -cp "./src;./lib/*" ./src/main/Main.java
-	echo Main-Class: main.Main>manifest.mf
-	echo Class-Path: ./lib/*>>manifest.mf
+	./build/compile.sh
 	jar cvfm kuribrawl-editor.jar manifest.mf -C classes .
 else
 	ant dist-zip
@@ -24,16 +22,15 @@ ifeq (, $(shell which unzip 2> /dev/null))
 	$(error Release mode build requires either Ant or unzip)
 endif
 
-	-@mkdir classes 2> /dev/null
-	javac -d ./classes -cp "./src;./lib/*" ./src/main/Main.java
-	echo Main-Class: main.Main>manifest.mf
-	echo Class-Path: ./lib/*>>manifest.mf
+	./build/compile.sh
 
 	-@mkdir tmp
 	(cd tmp; unzip -uo ../lib/\*.jar)
 	-@rm -r tmp/META-INF
-	jar cvfm kuribrawl-editor.jar manifest.mf -C classes . -C tmp .
+	jar cvfm $(EXEC) manifest.mf -C classes . -C tmp .
 	-@rm -r tmp
+
+	chmod a+x $(EXEC)
 else
 	ant build
 endif 

diff --git a/editor/javaEditor/build.sh b/editor/javaEditor/build.sh
@@ -38,9 +38,6 @@ then
     fi
 
 else
-    mkdir -p classes
-    javac -d ./classes -cp "./src;./lib/*" ./src/main/Main.java
-    echo Main-Class: main.Main>manifest.mf
-    echo Class-Path: ./lib/*>>manifest.mf
+    ./build/compile.sh
     jar cvfm kuribrawl-editor.jar manifest.mf -C classes .
 fi
diff --git a/editor/javaEditor/build/compile.sh b/editor/javaEditor/build/compile.sh
@@ -0,0 +1,7 @@
+#! /bin/bash -x
+
+echo "Compiling ..."
+mkdir -p classes
+javac -d ./classes --source-path "./src/" -cp "./lib/*" ./src/main/Main.java
+echo Main-Class: main.Main>manifest.mf
+echo Class-Path: ./lib/*>>manifest.mf