fix build scriptsHEADmaster

1 files changed, 24 insertions, 24 deletions

diff --git a/build.sh b/build.sh
index ca768c4..6fdf7e1 100755
--- a/build.sh
+++ b/build.sh
@@ -3,23 +3,26 @@ set -e
 
 echo "=== 1. Cleaning Workspace ==="
 rm -rf bin stage
-mkdir bin bin/classes bin/test-classes stage
+mkdir -p bin/classes bin/test-classes stage dist # dist was never created
 
 echo "=== 2. Compiling Production Code ==="
-javac -d bin/classes -cp "lib/*" src/main/java/com/example/App.java
+javac -d bin/classes -cp "lib/*" @<(find src/main/java -name '*.java')
 
 echo "=== 3. Compiling Test Code ==="
-javac -d bin/test-classes -cp "bin:lib/*" src/test/java/com/example/AppTest.java
+# prod classes are in bin/classes, not bin
+javac -d bin/test-classes -cp "bin/classes:lib/*" @<(find src/test/java -name '*.java')
 
 echo "=== 4. Running Automated Tests ==="
-JUNIT_JAR=$(find lib/junit-platform-console-standalone-*.jar | head -n 1)
+JUNIT_JAR=$(find lib -maxdepth 1 -name 'junit-platform-console-standalone-*.jar' | head -n 1)
 if [ -z "$JUNIT_JAR" ]; then
   echo "JUnit jar missing."
   exit 1
 fi
 
 set +e
-java -jar "$JUNIT_JAR" execute -cp "bin:lib/*" --scan-classpath
+java -jar "$JUNIT_JAR" execute \
+  -cp "bin/classes:bin/test-classes:lib/*" \
+  --scan-classpath
 TEST_STATUS=$?
 set -e
 
@@ -32,30 +35,27 @@ echo "✅ Tests passed successfully!"
 echo "=== 5. Extracting Dependencies for Fat JAR ==="
 cd stage
 for jarfile in ../lib/*.jar; do
-  echo "$jarfile"
-  # Skip the JUnit jar so we don't bloat production code
-  if [[ "$jarfile" == *"junit-platform-console-standalone"* ]]; then
-    continue
-  fi
-  if [ -f "$jarfile" ]; then
-    echo "Extracting: $(basename "$jarfile")"
-    jar -xf "$jarfile"
-  fi
+  [ -f "$jarfile" ] || continue
+  case "$(basename "$jarfile")" in
+  junit-platform-console-standalone-*) continue ;;
+  esac
+  echo "Extracting: $(basename "$jarfile")"
+  jar -xf "$jarfile"
 done
-# Clean up extracted manifest directories to prevent conflicts
-rm -rf META-INF
+
+# Strip signatures + manifests (they break repacking), but KEEP
+# META-INF/services so ServiceLoader-based deps still work at runtime.
+find META-INF -type f \( -name '*.SF' -o -name '*.RSA' -o -name '*.DSA' -o -name 'MANIFEST.MF' \) -delete 2>/dev/null || true
 cd ..
 
 echo "=== 6. Merging Assets into Fat JAR ==="
-# Copy your own compiled production classes into the staging folder
-cp -r bin/* stage/
-
-# Package everything in the staging area into the final JAR
-jar cfe dist/app.jar com.example.App -C stage/classes/ .
+# Merge YOUR production classes on top of the extracted deps
+cp -r bin/classes/. stage/
+# Package the whole tree (deps + your classes), not just stage/classes
+jar cfe dist/app.jar com.example.App -C stage .
 
-# Clean up staging area
 rm -rf stage
 echo "======================================"
-echo "🎉 Fat JAR Created! Run it anywhere using:"
-echo "java -jar app.jar"
+echo "🎉 Fat JAR Created! Run it with:"
+echo "java -jar dist/app.jar"
 echo "======================================"