I'm checking this in.
This updates our build code to search for classes in the sun package.
This is only needed if you're building using make; the eclipse-based
build is already ok.
Tom
Index: ChangeLog
from Tom Tromey <[EMAIL PROTECTED]>
* 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.
Index: lib/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/Makefile.am,v
retrieving revision 1.117
diff -u -r1.117 Makefile.am
--- lib/Makefile.am 5 Apr 2006 22:12:01 -0000 1.117
+++ lib/Makefile.am 9 Jun 2006 21:23:51 -0000
@@ -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
diff -u -r1.36 gen-classlist.sh.in
--- lib/gen-classlist.sh.in 4 Apr 2006 17:16:50 -0000 1.36
+++ lib/gen-classlist.sh.in 9 Jun 2006 21:23:51 -0000
@@ -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
