[commit-cp] classpath ChangeLog lib/Makefile.am lib/gen-cla...

[Tom Tromey]

CVSROOT:        /cvsroot/classpath
Module name:    classpath
Changes by:     Tom Tromey <tromey>     06/06/09 21:30:44

Modified files:
        .              : ChangeLog 
        lib            : Makefile.am gen-classlist.sh.in 

Log message:
                * lib/Makefile.am (install-data-local): Copy 'sun' files.
                (uninstall-local): Delete 'sun' directory.
                (glibj.zip): Include 'sun' classes.
                (clean-local): Delete 'sun' directory.
                * lib/gen-classlist.sh.in: Search 'sun' subdirectories.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7747&r2=1.7748
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/Makefile.am?cvsroot=classpath&r1=1.117&r2=1.118
http://cvs.savannah.gnu.org/viewcvs/classpath/lib/gen-classlist.sh.in?cvsroot=classpath&r1=1.36&r2=1.37

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7747
retrieving revision 1.7748
diff -u -b -r1.7747 -r1.7748
--- ChangeLog   9 Jun 2006 20:49:50 -0000       1.7747
+++ ChangeLog   9 Jun 2006 21:30:43 -0000       1.7748
@@ -1,3 +1,11 @@
+2006-06-09  Tom Tromey  <address@hidden>
+
+       * lib/Makefile.am (install-data-local): Copy 'sun' files.
+       (uninstall-local): Delete 'sun' directory.
+       (glibj.zip): Include 'sun' classes.
+       (clean-local): Delete 'sun' directory.
+       * lib/gen-classlist.sh.in: Search 'sun' subdirectories.
+
 2006-06-09  Roman Kennke  <address@hidden>
 
        * gnu/java/awt/java2d/AbstractGraphics2D.java

Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -b -r1.117 -r1.118
--- lib/Makefile.am     5 Apr 2006 22:12:01 -0000       1.117
+++ lib/Makefile.am     9 Jun 2006 21:30:44 -0000       1.118
@@ -73,6 +73,7 @@
        cp -R java $(DESTDIR)$(pkgdatadir)
        cp -R javax $(DESTDIR)$(pkgdatadir)
        cp -R org $(DESTDIR)$(pkgdatadir)
+       cp -R sun $(DESTDIR)$(pkgdatadir)
        cp -R META-INF $(DESTDIR)$(pkgdatadir)
 
 # FIXME - should mimic doc/api/Makefile.am instead...
@@ -81,6 +82,7 @@
        rm -rf $(DESTDIR)$(pkgdatadir)/java
        rm -rf $(DESTDIR)$(pkgdatadir)/javax
        rm -rf $(DESTDIR)$(pkgdatadir)/org
+       rm -rf $(DESTDIR)$(pkgdatadir)/sun
        rm -rf $(DESTDIR)$(pkgdatadir)/META-INF
 
 endif # INSTALL_CLASS_FILES
@@ -95,8 +97,8 @@
 else
 
 glibj.zip: classes compile-classes resources
-       if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org 
META-INF > /dev/null; fi
-       if test "$(FASTJAR)" != ""; then $(FASTJAR) cf glibj.zip gnu java javax 
org META-INF; fi
+       if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org 
sun META-INF > /dev/null; fi
+       if test "$(FASTJAR)" != ""; then $(FASTJAR) cf glibj.zip gnu java javax 
org sun META-INF; fi
 
 endif # USE_PREBUILT_GLIBJ_ZIP
 
@@ -175,6 +177,7 @@
        -rm -rf javax
        -rm -rf org
        -rm -rf com
+       -rm -rf sun
        -rm -rf META-INF
        -rm -rf lists
        -rm -f Makefile.deps

Index: lib/gen-classlist.sh.in
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/gen-classlist.sh.in,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- lib/gen-classlist.sh.in     4 Apr 2006 17:16:50 -0000       1.36
+++ lib/gen-classlist.sh.in     9 Jun 2006 21:30:44 -0000       1.37
@@ -18,7 +18,7 @@
 # We do this because it makes splitting for the gcj build much
 # cheaper.
 (cd @top_srcdir@
- @FIND@ java javax gnu org -follow -name '*.java' -print |
+ @FIND@ java javax gnu org sun -follow -name '*.java' -print |
  sort -r | sed -e 's,/\([^/]*\)$, \1,' |
  while read pkg file; do
     echo $pkg @top_srcdir@ $pkg/$file
@@ -43,7 +43,7 @@
 echo "Adding java source files from VM directory $vm_dirlist"
 for dir in $vm_dirlist; do
    (cd $dir
-   for subdir in java javax gnu org com; do
+   for subdir in java javax gnu org com sun; do
       if test -d $subdir; then
         @FIND@ $subdir -name '*.java' -print
       fi