7 files changed, 192 insertions, 154 deletions

diff --git a/tools/_util.sh b/tools/_util.sh
new file mode 100644
index 0000000..4650616
--- /dev/null
+++ b/tools/_util.sh
@@ -0,0 +1,47 @@
+JAVA_RELEASE=25
+
+case "$(uname -s)" in
+  CYGWIN*|MINGW*|MSYS*) SEP=";" ;;
+  *) SEP=":" ;;
+esac
+
+MODULES="api service ui-console"
+
+DEPS_api=""
+DEPS_service="api"
+DEPS_ui_console="api service"
+
+RUNTIME_LIB_DIRS="pico jaxb gson"
+
+MAIN_CLASS="market.guess.ui.console.App"
+
+JAVA_HOME_DIR=$(java -XshowSettings:properties -version 2>&1 | sed -n 's/^ *java\.home = //p')
+JAR="$JAVA_HOME_DIR/bin/jar"
+[ -x "$JAR" ] || JAR="$JAVA_HOME_DIR/bin/jar.exe"
+if [ ! -x "$JAR" ]; then
+  echo "Could not locate the 'jar' tool under $JAVA_HOME_DIR" >&2
+  exit 1
+fi
+
+is_shippable_jar() {
+  case "$1" in *-sources.jar | *-javadoc.jar) return 1 ;; *) return 0 ;; esac
+}
+LIBCP=""
+for j in lib/*/*.jar; do
+  is_shippable_jar "$j" || continue
+  LIBCP="$LIBCP${LIBCP:+$SEP}$j"
+done
+
+TMP="${TMPDIR:-/tmp}/gm-build"
+mkdir -p "$TMP"
+
+deps_of() {
+  local v="DEPS_$(echo "$1" | tr '-' '_')"
+  eval "printf '%s' \"\${$v}\""
+}
+
+module_cp() {
+  local cp=""
+  for d in "$@"; do cp="$cp${cp:+$SEP}build/classes/$d"; done
+  printf '%s' "$cp"
+}
diff --git a/tools/build.bat b/tools/build.bat
deleted file mode 100644
index eb6b460..0000000
--- a/tools/build.bat
+++ /dev/null
@@ -1,72 +0,0 @@
-@echo off
-setlocal enabledelayedexpansion
-
-echo === 1. Cleaning Workspace ===
-if exist bin   rmdir /s /q bin
-if exist stage rmdir /s /q stage
-if exist dist  rmdir /s /q dist
-mkdir bin\classes
-mkdir bin\test-classes
-mkdir stage
-mkdir dist
-
-echo === 2. Compiling Production Code ===
-dir /s /b src\main\java\*.java > sources.txt
-javac -d bin\classes -cp "lib/*" @sources.txt
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo === 3. Compiling Test Code ===
-dir /s /b src\test\java\*.java > test-sources.txt
-javac -d bin\test-classes -cp "bin\classes;lib/*" @test-sources.txt
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-echo === 4. Running Automated Tests ===
-set "JUNIT_JAR="
-for %%f in (lib\junit-platform-console-standalone-*.jar) do set "JUNIT_JAR=%%f"
-if not defined JUNIT_JAR (echo JUnit jar missing. & exit /b 1)
-
-rem JUnit's --class-path does NOT expand lib\*  -> build it explicitly
-set "TEST_CP=bin\classes;bin\test-classes"
-for %%j in (lib\*.jar) do set "TEST_CP=!TEST_CP!;%%j"
-
-java -jar "!JUNIT_JAR!" execute -cp "!TEST_CP!" --scan-classpath
-if %errorlevel% neq 0 (
-    echo [X] Tests failed! Aborting build package.
-    exit /b %errorlevel%
-)
-echo [OK] Tests passed successfully!
-
-echo === 5. Extracting Dependencies for Fat JAR ===
-cd stage
-for %%j in (..\lib\*.jar) do (
-    echo %%~nxj | findstr /i "junit-platform-console-standalone" >nul
-    if errorlevel 1 (
-        echo Extracting: %%~nxj
-        jar -xf "%%j"
-    )
-)
-
-rem Strip signatures + manifests (they break repacking) but KEEP
-rem META-INF\services so ServiceLoader-based deps still work at runtime.
-if exist META-INF (
-    del /s /q META-INF\*.SF  >nul 2>&1
-    del /s /q META-INF\*.RSA >nul 2>&1
-    del /s /q META-INF\*.DSA >nul 2>&1
-    del /q    META-INF\MANIFEST.MF >nul 2>&1
-)
-cd ..
-
-echo === 6. Merging Assets into Fat JAR ===
-rem Merge ONLY production classes on top of the extracted deps
-xcopy /e /q /y /i bin\classes\* stage\ >nul
-rem Package the whole tree (deps + your classes), not just stage\classes
-jar cfe dist/app.jar com.example.App -C stage .
-if %errorlevel% neq 0 exit /b %errorlevel%
-
-del sources.txt test-sources.txt >nul 2>&1
-rmdir /s /q stage
-echo ======================================
-echo Fat JAR Created! Run it with:
-echo java -jar dist/app.jar
-echo ======================================
-pause
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 ==="
diff --git a/tools/package.sh b/tools/package.sh
new file mode 100644
index 0000000..5877444
--- /dev/null
+++ b/tools/package.sh
@@ -0,0 +1,82 @@
+#!/bin/bash
+
+set -e
+cd "$(dirname "$0")/.."
+. tools/_util.sh
+
+bash tools/build.sh
+
+DIST=build/dist
+rm -rf "$DIST"
+mkdir -p "$DIST"
+
+echo "=== Staging runtime libs beside the jars ==="
+for d in $RUNTIME_LIB_DIRS; do
+  mkdir -p "$DIST/lib/$d"
+  n=0
+  for j in lib/"$d"/*.jar; do
+    is_shippable_jar "$j" || continue # never ship -sources / -javadoc
+    cp "$j" "$DIST/lib/$d/"
+    n=$((n + 1))
+  done
+  echo "  lib/$d/ ($n jars)"
+done
+
+echo "=== Generating console manifest ==="
+# Generated from what is actually staged, never hand-maintained. Four silent
+# failure modes: wildcards match nothing; a missing trailing newline makes jar
+# drop the line; paths are relative to this jar; and java -jar ignores -cp, so
+# this line is the entire classpath at runtime.
+MF="$TMP/console-manifest.txt"
+CPLINE=""
+for m in $MODULES; do
+  [ "$m" = ui-console ] && continue
+  CPLINE="$CPLINE${CPLINE:+ }$m.jar"
+done
+for d in $RUNTIME_LIB_DIRS; do
+  for j in "$DIST"/lib/"$d"/*.jar; do
+    [ -f "$j" ] || continue
+    CPLINE="$CPLINE lib/$d/$(basename "$j")"
+  done
+done
+printf 'Class-Path: %s\n\n' "$CPLINE" >"$MF"
+echo "  $CPLINE"
+
+echo "=== Packaging ==="
+for m in $MODULES; do
+  if [ "$m" = ui-console ]; then
+    "$JAR" --create --file "$DIST/$m.jar" \
+      --main-class "$MAIN_CLASS" --manifest "$MF" -C "build/classes/$m" .
+  else
+    "$JAR" --create --file "$DIST/$m.jar" -C "build/classes/$m" .
+  fi
+  echo "  $DIST/$m.jar"
+done
+
+cat >"$DIST/run.bat" <<'EOF'
+@echo off
+cd /d "%~dp0"
+java -jar "%~dp0ui-console.jar"
+if errorlevel 1 pause
+EOF
+
+echo "=== Manifest as it actually landed in the jar ==="
+# Cheapest check that prevents a Level-0: if Main-Class or Class-Path didn't
+# survive, it surfaces here instead of on the grader's machine.
+rm -rf "$TMP/mf" && mkdir -p "$TMP/mf"
+(cd "$TMP/mf" && "$JAR" -xf "$OLDPWD/$DIST/ui-console.jar" META-INF/MANIFEST.MF)
+sed 's/^/  /' "$TMP/mf/META-INF/MANIFEST.MF"
+
+grep -q '^Main-Class:' "$TMP/mf/META-INF/MANIFEST.MF" || {
+  echo "*** Main-Class missing ***"
+  exit 1
+}
+grep -q 'Class-Path:' "$TMP/mf/META-INF/MANIFEST.MF" || {
+  echo "*** Class-Path missing ***"
+  exit 1
+}
+
+echo "======================================"
+echo "Self-contained output in $DIST"
+echo "  cd $DIST && java -jar ui-console.jar"
+echo "======================================"
diff --git a/tools/run.bat b/tools/run.bat
deleted file mode 100644
index 8480652..0000000
--- a/tools/run.bat
+++ /dev/null
@@ -1,16 +0,0 @@
-@echo off
-:: clean old binaries
-rmdir /s /q bin
-mkdir bin
-
-:: compile source files and include libraries
-javac -d "bin/classes" -cp "lib/*" src/main/java/com/example/App.java
-
-:: run the application if compilation succeeded
-if %errorlevel% equ 0 (
-    echo --- Running Application ---
-    java -cp "bin/classes;lib/*" com.example.App
-) else (
-    echo Compilation failed.
-)
-pause
diff --git a/tools/run.sh b/tools/run.sh
deleted file mode 100644
index 55f1094..0000000
--- a/tools/run.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-# clean up
-rm -rf bin && mkdir bin
-
-# run the app if compilation succeeded
-if javac -d "bin/classes" -cp "lib/*" src/main/java/com/example/App.java; then
-  echo "--- Running Application ---"
-  java -cp "bin/classes:lib/*" com.example.App
-else
-  echo "Compilation failed."
-fi
diff --git a/tools/test.sh b/tools/test.sh
new file mode 100644
index 0000000..4eaeb82
--- /dev/null
+++ b/tools/test.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+
+set -e
+cd "$(dirname "$0")/.."
+. tools/_util.sh
+
+[ -d build/classes ] || {
+  echo "No build/classes - run tools/build.sh first"
+  exit 1
+}
+
+JUNIT_JAR=$(ls lib/junit/junit-platform-console-standalone-*.jar 2>/dev/null | head -n 1)
+[ -n "$JUNIT_JAR" ] || {
+  echo "JUnit standalone jar missing from lib/junit/"
+  exit 1
+}
+
+PROD_CP="$(module_cp $MODULES)"
+
+echo "=== Compiling test sources ==="
+: >"$TMP/tests.txt"
+for m in $MODULES; do
+  [ -d "$m/src/test/java" ] && find "$m/src/test/java" -name '*.java' >>"$TMP/tests.txt"
+done
+if [ ! -s "$TMP/tests.txt" ]; then
+  echo "  (no test sources)"
+  exit 0
+fi
+
+mkdir -p build/test-classes
+javac --release "$JAVA_RELEASE" -d build/test-classes \
+  -cp "$PROD_CP$SEP$JUNIT_JAR$SEP$LIBCP" "@$TMP/tests.txt"
+
+echo "=== Running tests ==="
+
+TEST_CP="$PROD_CP${SEP}build/test-classes"
+for j in lib/*/*.jar; do
+  case "$j" in *junit-platform-console-standalone*) continue ;; esac
+  TEST_CP="$TEST_CP$SEP$j"
+done
+
+AGENT_JAR=$(ls lib/mockito/byte-buddy-agent-*.jar 2>/dev/null | head -n 1)
+AGENT_ARG=""
+[ -n "$AGENT_JAR" ] && AGENT_ARG="-javaagent:$AGENT_JAR"
+
+java $AGENT_ARG -jar "$JUNIT_JAR" execute \
+  --class-path "$TEST_CP" --scan-class-path --details=summary