--- a/Admin/lib/Tools/build_setup Sat Jul 17 13:42:21 2021 +0200
+++ b/Admin/lib/Tools/build_setup Sat Jul 17 21:31:15 2021 +0200
@@ -48,17 +48,39 @@
[ -d "$COMPONENT_DIR" ] && fail "Directory already exists: \"$COMPONENT_DIR\""
+# etc/settings
+
+mkdir -p "$COMPONENT_DIR/etc"
+cat > "$COMPONENT_DIR/etc/settings" <<EOF
+# -*- shell-script -*- :mode=shellscript:
+
+ISABELLE_SETUP_JAR="\$COMPONENT/lib/isabelle_setup.jar"
+classpath "\$ISABELLE_SETUP_JAR"
+EOF
+
+BUILD_PROPS="$COMPONENT_DIR/etc/build.props"
+echo >> "$BUILD_PROPS" "no_module = lib/isabelle_setup.jar"
+
+
# build jar
+SOURCE_DIR="$COMPONENT_DIR/src"
TARGET_DIR="$COMPONENT_DIR/lib"
-mkdir -p "$TARGET_DIR/isabelle/setup"
+mkdir -p "$SOURCE_DIR" "$TARGET_DIR/isabelle/setup"
declare -a ARGS=("-Xlint:unchecked")
+echo -n >> "$BUILD_PROPS" "sources ="
+
for SRC in "${SOURCES[@]}"
do
ARGS["${#ARGS[@]}"]="$(platform_path "$ISABELLE_HOME/src/Tools/Setup/isabelle/setup/$SRC")"
+ cp "$ISABELLE_HOME/src/Tools/Setup/isabelle/setup/$SRC" "$SOURCE_DIR"
+ echo >> "$BUILD_PROPS" " \\"
+ echo -n >> "$BUILD_PROPS" " src/$SRC"
done
+echo >> "$BUILD_PROPS"
+
isabelle_jdk javac $ISABELLE_JAVAC_OPTIONS -d "$TARGET_DIR" \
-classpath "$(platform_path "$ISABELLE_CLASSPATH")" "${ARGS[@]}" || \
fail "Failed to compile sources"
@@ -69,17 +91,6 @@
rm -rf "$TARGET_DIR/isabelle"
-# etc/settings
-
-mkdir -p "$COMPONENT_DIR/etc"
-cat > "$COMPONENT_DIR/etc/settings" <<EOF
-# -*- shell-script -*- :mode=shellscript:
-
-ISABELLE_SETUP_JAR="\$COMPONENT/lib/isabelle_setup.jar"
-classpath "\$ISABELLE_SETUP_JAR"
-EOF
-
-
# README
cat > "$COMPONENT_DIR/README" <<EOF