1 files changed, 16 insertions, 54 deletions

diff --git a/tools/build.sh b/tools/build.sh
index 6fdf7e1..72880ee 100755
--- a/tools/build.sh
+++ b/tools/build.sh
@@ -1,61 +1,23 @@
 #!/bin/bash
-set -e
-
-echo "=== 1. Cleaning Workspace ==="
-rm -rf bin 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/*" @<(find src/main/java -name '*.java')
-
-echo "=== 3. Compiling Test Code ==="
-# 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 -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/classes:bin/test-classes:lib/*" \
-  --scan-classpath
-TEST_STATUS=$?
 set -e
+cd "$(dirname "$0")/.."
+. tools/_util.sh
 
-if [ $TEST_STATUS -ne 0 ]; then
-  echo "❌ Tests failed! Aborting build package."
-  exit 1
-fi
-echo "✅ Tests passed successfully!"
-
-echo "=== 5. Extracting Dependencies for Fat JAR ==="
-cd stage
-for jarfile in ../lib/*.jar; do
-  [ -f "$jarfile" ] || continue
-  case "$(basename "$jarfile")" in
-  junit-platform-console-standalone-*) continue ;;
-  esac
-  echo "Extracting: $(basename "$jarfile")"
-  jar -xf "$jarfile"
-done
+echo "=== Cleaning build/ ==="
+rm -rf build
+mkdir -p build/classes
 
-# 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 "=== Compiling production code (dependency order) ==="
+for m in $MODULES; do
+  deps=$(deps_of "$m")
+  cp="$(module_cp $deps)"
+  cp="${cp:+$cp$SEP}$LIBCP"
 
-echo "=== 6. Merging Assets into Fat JAR ==="
-# 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 .
+  find "$m/src/main/java" -name '*.java' >"$TMP/src.txt"
+  mkdir -p "build/classes/$m"
+  printf '  %-11s sees: %s\n' "$m" "${deps:-<nothing>}"
+  javac --release "$JAVA_RELEASE" -d "build/classes/$m" -cp "$cp" "@$TMP/src.txt"
+done
 
-rm -rf stage
-echo "======================================"
-echo "🎉 Fat JAR Created! Run it with:"
-echo "java -jar dist/app.jar"
-echo "======================================"
+echo "=== Build OK ==="