[commit-cp] classpath ChangeLog configure.ac external/Makef... [generics-branch]

[Tom Tromey]

CVSROOT:        /cvsroot/classpath
Module name:    classpath
Branch:         generics-branch
Changes by:     Tom Tromey <tromey>     06/06/16 18:04:09

Modified files:
        .              : ChangeLog configure.ac 
        external       : Makefile.am 
        lib            : Makefile.am gen-classlist.sh.in 
Added files:
        external/jsr166: Makefile.am 

Log message:
                * lib/Makefile.am (compile_classpath): Added jsr166.
                * configure.ac: Added external/jsr166/Makefile.
                * external/Makefile.am (SUBDIRS): Added jsr166.
                * external/jsr166/Makefile.am: New file.
                * lib/gen-classlist.sh.in: Look in external/jsr166.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2386.2.271&r2=1.2386.2.272
http://cvs.savannah.gnu.org/viewcvs/classpath/configure.ac?cvsroot=classpath&only_with_tag=generics-branch&r1=1.43.2.36&r2=1.43.2.37
http://cvs.savannah.gnu.org/viewcvs/classpath/external/Makefile.am?cvsroot=classpath&only_with_tag=generics-branch&r1=1.2.2.3&r2=1.2.2.4
http://cvs.savannah.gnu.org/viewcvs/classpath/external/jsr166/Makefile.am?cvsroot=classpath&only_with_tag=generics-branch&rev=1.1.2.1
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/Makefile.am?cvsroot=classpath&only_with_tag=generics-branch&r1=1.63.2.25&r2=1.63.2.26
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/gen-classlist.sh.in?cvsroot=classpath&only_with_tag=generics-branch&r1=1.12.2.14&r2=1.12.2.15

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.2386.2.271
retrieving revision 1.2386.2.272
diff -u -b -r1.2386.2.271 -r1.2386.2.272
--- ChangeLog   16 Jun 2006 17:39:11 -0000      1.2386.2.271
+++ ChangeLog   16 Jun 2006 18:04:06 -0000      1.2386.2.272
@@ -1,5 +1,13 @@
 2006-06-16  Tom Tromey  <address@hidden>
 
+       * lib/Makefile.am (compile_classpath): Added jsr166.
+       * configure.ac: Added external/jsr166/Makefile.
+       * external/Makefile.am (SUBDIRS): Added jsr166.
+       * external/jsr166/Makefile.am: New file.
+       * lib/gen-classlist.sh.in: Look in external/jsr166.
+
+2006-06-16  Tom Tromey  <address@hidden>
+
        Imported JSR 166 reference implementation:
        * .classpath: Added external/jsr166.
        * java/util/concurrent/CopyOnWriteArrayList.java: New file.

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.43.2.36
retrieving revision 1.43.2.37
diff -u -b -r1.43.2.36 -r1.43.2.37
--- configure.ac        11 Jun 2006 18:23:17 -0000      1.43.2.36
+++ configure.ac        16 Jun 2006 18:04:09 -0000      1.43.2.37
@@ -706,6 +706,7 @@
 external/sax/Makefile
 external/w3c_dom/Makefile
 external/relaxngDatatype/Makefile
+external/jsr166/Makefile
 gnu/classpath/Configuration.java
 include/Makefile
 native/Makefile

Index: external/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/external/Makefile.am,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- external/Makefile.am        2 Mar 2006 09:33:44 -0000       1.2.2.3
+++ external/Makefile.am        16 Jun 2006 18:04:09 -0000      1.2.2.4
@@ -1,5 +1,5 @@
 ## Input file for automake to generate the Makefile.in used by configure
 
-SUBDIRS = sax w3c_dom relaxngDatatype
+SUBDIRS = sax w3c_dom relaxngDatatype jsr166
 
 EXTRA_DIST = README

Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.63.2.25
retrieving revision 1.63.2.26
diff -u -b -r1.63.2.25 -r1.63.2.26
--- lib/Makefile.am     11 Jun 2006 18:23:28 -0000      1.63.2.25
+++ lib/Makefile.am     16 Jun 2006 18:04:09 -0000      1.63.2.26
@@ -10,7 +10,7 @@
 metafiles :=  $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS 
-prune -o -type f -print)
 iconfiles :=  $(shell cd $(top_srcdir) && $(FIND) 
gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print)
 
-compile_classpath = 
$(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:.:$(USER_CLASSLIB)
+compile_classpath = 
$(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:$(top_srcdir)/external/jsr166:.:$(USER_CLASSLIB)
 
 # handling source to bytecode compiler programs like gcj, jikes  and kjc
 if FOUND_ECJ

Index: lib/gen-classlist.sh.in
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/gen-classlist.sh.in,v
retrieving revision 1.12.2.14
retrieving revision 1.12.2.15
diff -u -b -r1.12.2.14 -r1.12.2.15
--- lib/gen-classlist.sh.in     11 Jun 2006 18:23:28 -0000      1.12.2.14
+++ lib/gen-classlist.sh.in     16 Jun 2006 18:04:09 -0000      1.12.2.15
@@ -26,8 +26,12 @@
 
 # The same, but for the external code.
 # Right now all external code is in org/.
-for dir in @top_srcdir@/external/w3c_dom \
-   @top_srcdir@/external/sax @top_srcdir@/external/relaxngDatatype; do
+for dir in \
+   @top_srcdir@/external/w3c_dom \
+   @top_srcdir@/external/sax \
+   @top_srcdir@/external/relaxngDatatype \
+   @top_srcdir@/external/jsr166 \
+   ; do
   (cd $dir
   @FIND@ org -follow -name '*.java' -print |
   sort -r | sed -e 's,/\([^/]*\)$, \1,' |

Index: external/jsr166/Makefile.am
===================================================================
RCS file: external/jsr166/Makefile.am
diff -N external/jsr166/Makefile.am
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ external/jsr166/Makefile.am 16 Jun 2006 18:04:09 -0000      1.1.2.1
@@ -0,0 +1,74 @@
+## Input file for automake to generate the Makefile.in used by configure
+
+EXTRA_DIST = IMPORTING \
+readme \
+java/util/AbstractQueue.java \
+java/util/concurrent/ScheduledThreadPoolExecutor.java \
+java/util/concurrent/ExecutorCompletionService.java \
+java/util/concurrent/LinkedBlockingQueue.java \
+java/util/concurrent/BlockingDeque.java        \
+java/util/concurrent/Delayed.java \
+java/util/concurrent/ThreadFactory.java        \
+java/util/concurrent/ArrayBlockingQueue.java \
+java/util/concurrent/RunnableFuture.java \
+java/util/concurrent/LinkedBlockingDeque.java \
+java/util/concurrent/CopyOnWriteArraySet.java \
+java/util/concurrent/DelayQueue.java \
+java/util/concurrent/SynchronousQueue.java \
+java/util/concurrent/Executor.java \
+java/util/concurrent/ExecutionException.java \
+java/util/concurrent/Semaphore.java \
+java/util/concurrent/BrokenBarrierException.java \
+java/util/concurrent/CompletionService.java \
+java/util/concurrent/CyclicBarrier.java        \
+java/util/concurrent/AbstractExecutorService.java \
+java/util/concurrent/TimeoutException.java \
+java/util/concurrent/ConcurrentMap.java        \
+java/util/concurrent/PriorityBlockingQueue.java        \
+java/util/concurrent/CancellationException.java        \
+java/util/concurrent/ConcurrentSkipListSet.java        \
+java/util/concurrent/ConcurrentLinkedQueue.java        \
+java/util/concurrent/RejectedExecutionHandler.java \
+java/util/concurrent/TimeUnit.java \
+java/util/concurrent/RejectedExecutionException.java \
+java/util/concurrent/ExecutorService.java \
+java/util/concurrent/ConcurrentHashMap.java \
+java/util/concurrent/ScheduledExecutorService.java \
+java/util/concurrent/ThreadPoolExecutor.java \
+java/util/concurrent/BlockingQueue.java        \
+java/util/concurrent/ConcurrentSkipListMap.java        \
+java/util/concurrent/ConcurrentNavigableMap.java \
+java/util/concurrent/Future.java \
+java/util/concurrent/FutureTask.java \
+java/util/concurrent/CountDownLatch.java \
+java/util/concurrent/RunnableScheduledFuture.java \
+java/util/concurrent/Callable.java \
+java/util/concurrent/locks/ReentrantLock.java \
+java/util/concurrent/locks/Lock.java \
+java/util/concurrent/locks/Condition.java \
+java/util/concurrent/locks/AbstractQueuedSynchronizer.java \
+java/util/concurrent/locks/AbstractOwnableSynchronizer.java \
+java/util/concurrent/locks/LockSupport.java \
+java/util/concurrent/locks/AbstractQueuedLongSynchronizer.java \
+java/util/concurrent/locks/ReadWriteLock.java \
+java/util/concurrent/locks/ReentrantReadWriteLock.java \
+java/util/concurrent/Executors.java \
+java/util/concurrent/atomic/AtomicLongFieldUpdater.java        \
+java/util/concurrent/atomic/AtomicLongArray.java \
+java/util/concurrent/atomic/AtomicIntegerFieldUpdater.java \
+java/util/concurrent/atomic/AtomicReferenceFieldUpdater.java \
+java/util/concurrent/atomic/AtomicBoolean.java \
+java/util/concurrent/atomic/AtomicReferenceArray.java \
+java/util/concurrent/atomic/AtomicStampedReference.java        \
+java/util/concurrent/atomic/AtomicIntegerArray.java \
+java/util/concurrent/atomic/AtomicMarkableReference.java \
+java/util/concurrent/atomic/AtomicReference.java \
+java/util/concurrent/atomic/AtomicInteger.java \
+java/util/concurrent/atomic/AtomicLong.java \
+java/util/concurrent/ScheduledFuture.java \
+java/util/concurrent/Exchanger.java \
+java/util/Deque.java \
+java/util/NavigableMap.java \
+java/util/Queue.java \
+java/util/NavigableSet.java \
+java/util/ArrayDeque.java