clarified component setup: exclude jar from active component, but use sources from template within ISABELLE_HOME (relevant for "isabelle scala_project -L");
authorwenzelm
Sun, 18 Jul 2021 13:27:23 +0200
changeset 74303 8c213672f6f3
parent 74302 b4f57bfe82e7
child 74304 aa36845ad5ad
clarified component setup: exclude jar from active component, but use sources from template within ISABELLE_HOME (relevant for "isabelle scala_project -L");
Admin/components/components.sha1
Admin/components/main
Admin/lib/Tools/build_setup
etc/components
src/Pure/ROOT.scala
src/Tools/Setup/etc/build.props
--- a/Admin/components/components.sha1	Sun Jul 18 12:48:31 2021 +0200
+++ b/Admin/components/components.sha1	Sun Jul 18 13:27:23 2021 +0200
@@ -131,6 +131,7 @@
 692a39f716998e556ec9559c9ca362fc8fc9d5b6  isabelle_setup-20210717-1.tar.gz
 7322d6d84d75c486a58ed36630431db4499e3232  isabelle_setup-20210717-2.tar.gz
 14f8508bcae9140815bb23e430e26d2cbc504b81  isabelle_setup-20210717.tar.gz
+ca801d5c380ea896ee32b309ff19ae5f34538963  isabelle_setup-20210718.tar.gz
 0b2206f914336dec4923dd0479d8cee4b904f544  jdk-11+28.tar.gz
 e12574d838ed55ef2845acf1152329572ab0cc56  jdk-11.0.10+9.tar.gz
 3e05213cad47dbef52804fe329395db9b4e57f39  jdk-11.0.2+9.tar.gz
--- a/Admin/components/main	Sun Jul 18 12:48:31 2021 +0200
+++ b/Admin/components/main	Sun Jul 18 13:27:23 2021 +0200
@@ -8,7 +8,7 @@
 flatlaf-1.2
 idea-icons-20210508
 isabelle_fonts-20210322
-isabelle_setup-20210717-2
+isabelle_setup-20210718
 jdk-15.0.2+7
 jedit-20210717
 jfreechart-1.5.1
--- a/Admin/lib/Tools/build_setup	Sun Jul 18 12:48:31 2021 +0200
+++ b/Admin/lib/Tools/build_setup	Sun Jul 18 13:27:23 2021 +0200
@@ -4,17 +4,6 @@
 #
 # DESCRIPTION: build component for Isabelle/Java setup tool
 
-## sources
-
-declare -a SOURCES=(
-  "Build.java"
-  "Environment.java"
-  "Exn.java"
-  "Library.java"
-  "Setup.java"
-)
-
-
 ## usage
 
 PRG=$(basename "$0")
@@ -58,29 +47,20 @@
 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 "$SOURCE_DIR" "$TARGET_DIR/isabelle/setup"
+mkdir -p "$TARGET_DIR/isabelle/setup"
 
 declare -a ARGS=("-Xlint:unchecked")
-echo -n >> "$BUILD_PROPS" "sources ="
 
-for SRC in "${SOURCES[@]}"
+SOURCES="$(perl -e 'while (<>) { if (m/(\S+\.java)/)  { print "$1 "; } }' "$ISABELLE_HOME/src/Tools/Setup/etc/build.props")"
+for SRC in $SOURCES
 do
-  ARGS["${#ARGS[@]}"]="$(platform_path "$ISABELLE_HOME/src/Tools/Setup/src/$SRC")"
-  cp "$ISABELLE_HOME/src/Tools/Setup/src/$SRC" "$SOURCE_DIR"
-  echo >> "$BUILD_PROPS" " \\"
-  echo -n >> "$BUILD_PROPS" "  src/$SRC"
+  ARGS["${#ARGS[@]}"]="$(platform_path "$ISABELLE_HOME/src/Tools/Setup/$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"
--- a/etc/components	Sun Jul 18 12:48:31 2021 +0200
+++ b/etc/components	Sun Jul 18 13:27:23 2021 +0200
@@ -2,6 +2,7 @@
 src/Tools/jEdit
 src/Tools/GraphBrowser
 src/Tools/Graphview
+src/Tools/Setup
 src/Tools/VSCode
 src/HOL/Mutabelle
 src/HOL/Library/Sum_of_Squares
--- a/src/Pure/ROOT.scala	Sun Jul 18 12:48:31 2021 +0200
+++ b/src/Pure/ROOT.scala	Sun Jul 18 13:27:23 2021 +0200
@@ -21,3 +21,4 @@
   val proper_string = Library.proper_string _
   def proper_list[A](list: List[A]): Option[List[A]] = Library.proper_list(list)
 }
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/Tools/Setup/etc/build.props	Sun Jul 18 13:27:23 2021 +0200
@@ -0,0 +1,7 @@
+no_module = $ISABELLE_SETUP_JAR
+sources = \
+  src/Build.java \
+  src/Environment.java \
+  src/Exn.java \
+  src/Library.java \
+  src/Setup.java