slightly faster default compilation of Isabelle/Scala;
authorwenzelm
Mon Apr 09 20:57:23 2012 +0200 (2012-04-09)
changeset 4740863c05991882e
parent 47407 8da23ecc70cd
child 47409 c5be1120980d
slightly faster default compilation of Isabelle/Scala;
Admin/CHECKLIST
Admin/build
src/Pure/build-jars
     1.1 --- a/Admin/CHECKLIST	Mon Apr 09 20:42:05 2012 +0200
     1.2 +++ b/Admin/CHECKLIST	Mon Apr 09 20:57:23 2012 +0200
     1.3 @@ -34,6 +34,9 @@
     1.4      etc/components
     1.5      lib/html/library_index_content.template
     1.6  
     1.7 +- test separate compilation of Isabelle/Scala PIDE sources:
     1.8 +    Admin/build jars_test
     1.9 +
    1.10  - test contrib components:
    1.11      x86_64-linux without 32bit C/C++ libraries
    1.12      Mac OS X Leopard
     2.1 --- a/Admin/build	Mon Apr 09 20:42:05 2012 +0200
     2.2 +++ b/Admin/build	Mon Apr 09 20:57:23 2012 +0200
     2.3 @@ -28,6 +28,7 @@
     2.4      doc             documentation (requires latex and rail)
     2.5      doc-src         documentation sources from Isabelle theories
     2.6      jars            Isabelle/Scala layer (requires \$ISABELLE_JDK_HOME and \$SCALA_HOME)
     2.7 +    jars_test       test separate build of jars
     2.8      jars_fresh      fresh build of jars
     2.9  
    2.10  EOF
    2.11 @@ -121,6 +122,7 @@
    2.12      doc-src) build_doc-src;;
    2.13      jars) build_jars;;
    2.14      jars_fresh) build_jars -f;;
    2.15 +    jars_test) build_jars -t;;
    2.16      *) fail "Bad module $MODULE"
    2.17    esac
    2.18  done
     3.1 --- a/src/Pure/build-jars	Mon Apr 09 20:42:05 2012 +0200
     3.2 +++ b/src/Pure/build-jars	Mon Apr 09 20:57:23 2012 +0200
     3.3 @@ -77,6 +77,7 @@
     3.4    echo
     3.5    echo "  Options are:"
     3.6    echo "    -f           fresh build"
     3.7 +  echo "    -t           test separate compilation of PIDE"
     3.8    echo
     3.9    exit 1
    3.10  }
    3.11 @@ -95,13 +96,17 @@
    3.12  # options
    3.13  
    3.14  FRESH=""
    3.15 +TEST_PIDE=""
    3.16  
    3.17 -while getopts "f" OPT
    3.18 +while getopts "ft" OPT
    3.19  do
    3.20    case "$OPT" in
    3.21      f)
    3.22        FRESH=true
    3.23        ;;
    3.24 +    t)
    3.25 +      TEST_PIDE=true
    3.26 +      ;;
    3.27      \?)
    3.28        usage
    3.29        ;;
    3.30 @@ -171,11 +176,16 @@
    3.31  
    3.32    SCALAC_OPTIONS="$ISABELLE_SCALA_BUILD_OPTIONS -d classes"
    3.33  
    3.34 -  isabelle_scala scalac $SCALAC_OPTIONS "${PIDE_SOURCES[@]}" || \
    3.35 -    fail "Failed to compile PIDE sources"
    3.36 -
    3.37 -  isabelle_scala scalac $SCALAC_OPTIONS -classpath classes "${PURE_SOURCES[@]}" || \
    3.38 -    fail "Failed to compile Pure sources"
    3.39 +  if [ "$TEST_PIDE" = true ]; then
    3.40 +    isabelle_scala scalac $SCALAC_OPTIONS "${PIDE_SOURCES[@]}" || \
    3.41 +      fail "Failed to compile PIDE sources"
    3.42 +    isabelle_scala scalac $SCALAC_OPTIONS -classpath classes "${PURE_SOURCES[@]}" || \
    3.43 +      fail "Failed to compile Pure sources"
    3.44 +  else
    3.45 +    isabelle_scala scalac $SCALAC_OPTIONS -classpath classes \
    3.46 +      "${PIDE_SOURCES[@]}" "${PURE_SOURCES[@]}" || \
    3.47 +      fail "Failed to compile sources"
    3.48 +  fi
    3.49  
    3.50    mkdir -p "$TARGET_DIR/ext" || fail "Failed to create directory $TARGET_DIR/ext"
    3.51