# HG changeset patch
# User wenzelm
# Date 1322598593 -3600
# Node ID cd41e3903fbfa0b0edc0f4cb6b8277d1dc645b1f
# Parent  a497c5d4a523eb3bf2b90fba86ce0bd2a8a669c1
separate compilation of PIDE vs. Pure sources, which enables independent Scala library;

diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/Concurrent/counter.scala
--- a/src/Pure/Concurrent/counter.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/Concurrent/counter.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/Concurrent/counter.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Makarius
 
 Synchronized counter for unique identifiers < 0.
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/Concurrent/future.scala
--- a/src/Pure/Concurrent/future.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/Concurrent/future.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/Concurrent/future.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Makarius
 
 Future values.
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/Concurrent/simple_thread.scala
--- a/src/Pure/Concurrent/simple_thread.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/Concurrent/simple_thread.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/Concurrent/simple_thread.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Makarius
 
 Simplified thread operations.
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/Concurrent/volatile.scala
--- a/src/Pure/Concurrent/volatile.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/Concurrent/volatile.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/Concurrent/volatile.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Makarius
 
 Volatile variables.
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/General/exn.scala
--- a/src/Pure/General/exn.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/General/exn.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/General/exn.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Makarius
 
 Support for exceptions (arbitrary throwables).
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/General/properties.scala
--- a/src/Pure/General/properties.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/General/properties.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/General/properties.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Makarius
 
 Property lists.
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/General/sha1.scala
--- a/src/Pure/General/sha1.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/General/sha1.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/General/sha1.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Makarius
 
 Digest strings according to SHA-1 (see RFC 3174).
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/General/timing.scala
--- a/src/Pure/General/timing.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/General/timing.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/General/timing.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Makarius
 
 Basic support for time measurement.
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/PIDE/markup.scala
--- a/src/Pure/PIDE/markup.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/PIDE/markup.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/PIDE/markup.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Makarius
 
 Generic markup elements.
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/PIDE/markup_tree.scala
--- a/src/Pure/PIDE/markup_tree.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/PIDE/markup_tree.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/PIDE/markup_tree.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Fabian Immler, TU Munich
     Author:     Makarius
 
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/PIDE/text.scala
--- a/src/Pure/PIDE/text.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/PIDE/text.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/PIDE/text.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Fabian Immler, TU Munich
     Author:     Makarius
 
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/PIDE/xml.scala
--- a/src/Pure/PIDE/xml.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/PIDE/xml.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/PIDE/xml.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Makarius
 
 Untyped XML trees and basic data representation.
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/PIDE/yxml.scala
--- a/src/Pure/PIDE/yxml.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/PIDE/yxml.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/PIDE/yxml.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Makarius
 
 Efficient text representation of XML trees.  Suitable for direct
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/System/cygwin.scala
--- a/src/Pure/System/cygwin.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/System/cygwin.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/System/cygwin.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Makarius
 
 Accessing the Cygwin installation.
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/System/download.scala
--- a/src/Pure/System/download.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/System/download.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/System/download.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Makarius
 
 Download URLs -- with progress monitor.
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/System/event_bus.scala
--- a/src/Pure/System/event_bus.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/System/event_bus.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/System/event_bus.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Makarius
 
 Generic event bus with multiple receiving actors.
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/System/platform.scala
--- a/src/Pure/System/platform.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/System/platform.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/System/platform.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Makarius
 
 Raw platform identification.
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/System/standard_system.scala
--- a/src/Pure/System/standard_system.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/System/standard_system.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/System/standard_system.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Makarius
 
 Standard system operations, with basic Cygwin/Posix compatibility.
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/System/swing_thread.scala
--- a/src/Pure/System/swing_thread.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/System/swing_thread.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/System/swing_thread.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Makarius
     Author:     Fabian Immler, TU Munich
 
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/build-jars
--- a/src/Pure/build-jars	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/build-jars	Tue Nov 29 21:29:53 2011 +0100
@@ -121,6 +121,19 @@
 TARGET_DIR="$ISABELLE_HOME/lib/classes"
 TARGET="$TARGET_DIR/ext/Pure.jar"
 
+declare -a PIDE_SOURCES=()
+declare -a PURE_SOURCES=()
+
+for DEP in "${SOURCES[@]}"
+do
+  if grep "Module:.*PIDE" "$DEP" >/dev/null
+  then
+    PIDE_SOURCES["${#PIDE_SOURCES[@]}"]="$DEP"
+  else
+    PURE_SOURCES["${#PURE_SOURCES[@]}"]="$DEP"
+  fi
+done
+
 declare -a UPDATED=()
 
 if [ -n "$FRESH" ]; then
@@ -154,8 +167,15 @@
   }
 
   rm -rf classes && mkdir classes
-  "$SCALA_HOME/bin/scalac" -unchecked -deprecation -d classes -target:jvm-1.5 "${SOURCES[@]}" || \
-    fail "Failed to compile sources"
+
+  SCALAC_OPTIONS="-unchecked -deprecation -d classes -target:jvm-1.5"
+
+  "$SCALA_HOME/bin/scalac" $SCALAC_OPTIONS "${PIDE_SOURCES[@]}" || \
+    fail "Failed to compile PIDE sources"
+
+  "$SCALA_HOME/bin/scalac" $SCALAC_OPTIONS -classpath classes "${PURE_SOURCES[@]}" || \
+    fail "Failed to compile Pure sources"
+
   mkdir -p "$TARGET_DIR/ext" || fail "Failed to create directory $TARGET_DIR/ext"
 
   pushd classes >/dev/null
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/library.scala
--- a/src/Pure/library.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/library.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/library.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Makarius
 
 Basic library.
diff -r a497c5d4a523 -r cd41e3903fbf src/Pure/package.scala
--- a/src/Pure/package.scala	Tue Nov 29 20:18:02 2011 +0100
+++ b/src/Pure/package.scala	Tue Nov 29 21:29:53 2011 +0100
@@ -1,5 +1,5 @@
 /*  Title:      Pure/package.scala
-    Module:     Library
+    Module:     PIDE
     Author:     Makarius
 
 Toplevel isabelle package.