1 files changed, 43 insertions, 32 deletions

diff --git a/tools/package.sh b/tools/package.sh
index a85ee6c..186dab5 100644
--- a/tools/package.sh
+++ b/tools/package.sh
@@ -22,63 +22,74 @@ for d in $RUNTIME_LIB_DIRS; do
   echo "  lib/$d/ ($n jars)"
 done
 
-echo "=== Generating console manifest ==="
+echo "=== Generating executable manifests ==="
 # 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")"
+for e in $EXECUTABLES; do
+  CPLINE=""
+  for m in $MODULES; do
+    [ "$m" = "$e" ] && 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
+  write_manifest_attr "$TMP/$e-manifest.txt" "Class-Path" "$CPLINE"
+  echo "  $e: $CPLINE"
 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
+  case " $EXECUTABLES " in
+  *" $m "*)
+    "$JAR" --create --file "$DIST/$m.jar" --main-class "$(mainclass_of "$m")" \
+      --manifest "$TMP/$m-manifest.txt" -C "build/classes/$m" .
+    ;;
+  *)
     "$JAR" --create --file "$DIST/$m.jar" -C "build/classes/$m" .
-  fi
+    ;;
+  esac
   echo "  $DIST/$m.jar"
 done
 
-cat >"$DIST/run.bat" <<'EOF'
+for e in $EXECUTABLES; do
+  cat >"$DIST/run-${e#ui-}.bat" <<EOF
 @echo off
 cd /d "%~dp0"
-java -jar "%~dp0ui-console.jar"
+java -jar "%~dp0$e.jar"
 if errorlevel 1 pause
 EOF
+done
 
 [ -f README.pdf ] && cp README.pdf "$DIST/"
 
 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"
+for e in $EXECUTABLES; do
+  rm -rf "$TMP/mf" && mkdir -p "$TMP/mf"
+  (cd "$TMP/mf" && "$JAR" -xf "$OLDPWD/$DIST/$e.jar" META-INF/MANIFEST.MF)
+  echo "-- $e.jar --"
+  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
-}
+  grep -q '^Main-Class:' "$TMP/mf/META-INF/MANIFEST.MF" || {
+    echo "*** Main-Class missing in $e.jar ***"
+    exit 1
+  }
+  grep -q 'Class-Path:' "$TMP/mf/META-INF/MANIFEST.MF" || {
+    echo "*** Class-Path missing in $e.jar ***"
+    exit 1
+  }
+done
 
 echo "======================================"
 echo "Self-contained output in $DIST"
-echo "  cd $DIST && java -jar ui-console.jar"
+for e in $EXECUTABLES; do
+  echo "  cd $DIST && java -jar $e.jar"
+done
 echo "======================================"