[cp-patches] [generics] Patch: FYI: update make build for jsr166

Tom Tromey tromey at redhat.com
Fri Jun 16 18:00:34 UTC 2006


I'm checking this in on the generics branch.

This updates the makefiles and whatnot for the new jsr 166 code.

Tom

Index: ChangeLog
from  Tom Tromey  <tromey at redhat.com>
	* 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.

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.43.2.36
diff -u -r1.43.2.36 configure.ac
--- configure.ac 11 Jun 2006 18:23:17 -0000 1.43.2.36
+++ configure.ac 16 Jun 2006 18:02:33 -0000
@@ -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
diff -u -r1.2.2.3 Makefile.am
--- external/Makefile.am 2 Mar 2006 09:33:44 -0000 1.2.2.3
+++ external/Makefile.am 16 Jun 2006 18:02:33 -0000
@@ -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: 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:02:33 -0000
@@ -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
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.63.2.25
diff -u -r1.63.2.25 Makefile.am
--- lib/Makefile.am 11 Jun 2006 18:23:28 -0000 1.63.2.25
+++ lib/Makefile.am 16 Jun 2006 18:02:35 -0000
@@ -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
diff -u -r1.12.2.14 gen-classlist.sh.in
--- 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:02:35 -0000
@@ -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,' |



More information about the Classpath-patches mailing list