diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | LICENSE | 29 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | doc/api/Makefile.am | 6 | ||||
| -rw-r--r-- | external/README | 18 | ||||
| -rw-r--r-- | lib/Makefile.am | 9 | ||||
| -rwxr-xr-x | lib/gen-classlist.sh.in | 4 |
7 files changed, 75 insertions, 8 deletions
@@ -1,3 +1,15 @@ +2003-02-01 C. Brian Jones <cbj@gnu.org> + + * external/README: new file + * external/jaxp: import Classpathx JAXP from January 31, 2003 CVS + * LICENSE: new file + * Makefile.am: distribute LICENSE, external/jaxp/source + * lib/Makefile.am: add external/jaxp/source to classpath; removed + -target 1.1 from jikes invocation + * lib/gen-classlist.sh.in: add external/jaxp/source to directories + to search + * doc/api/Makefile.am: add external/jaxp/source to source path + 2003-01-31 Tom Tromey <tromey@redhat.com> * gnu/java/awt/peer/gtk/GtkToolkit.java (static): Use diff --git a/LICENSE b/LICENSE new file mode 100644 index 000000000..7d243f10b --- /dev/null +++ b/LICENSE @@ -0,0 +1,29 @@ +The software in this package is distributed under the GNU General Public +License (with "Library Exception" described below). + +A copy of GNU General Public License (GPL) is included in this distribution, +in the file COPYING. If you do not have the source code, it is available at: + + http://www.gnu.org/software/classpath/ + +In addition, the files distributed under GPL include the following +special exception. + + As a special exception, if you link this library with + other files to produce an executable, this library does + not by itself cause the resulting executable to be covered + by the GNU General Public License. This exception does + not however invalidate any other reasons why the executable + file might be covered by the GNU General Public License. + +As such, this software can be used to run Free as well as proprietary +applications and applets: static linking is permitted, so this can +even be used in embedded configurations. + +External libraries included with GNU Classpath may be distributed under +different licensing terms. Refer to the documentation for each package +located in the external directory. + +Parts of the native library fdlibm in native/fdlibm are copyright of +Sun Microsystems, Inc. or AT&T. + diff --git a/Makefile.am b/Makefile.am index a28aaf80f..908858611 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,7 +5,7 @@ SUBDIRS = lib doc gnu java javax native resource vm native: lib -EXTRA_DIST = HACKING BUGS THANKYOU mauve-classpath +EXTRA_DIST = HACKING BUGS THANKYOU mauve-classpath LICENSE DISTCHECK_CONFIGURE_FLAGS = --enable-gjdoc @@ -13,6 +13,9 @@ dist-hook: -$(mkinstalldirs) $(distdir)/include -cp -f $(top_srcdir)/include/*.in $(distdir)/include -cp -f $(top_srcdir)/include/*.h $(distdir)/include + -$(mkinstalldirs) $(distdir)/external/jaxp + -cp -f $(top_srcdir)/external/README $(distdir)/external + -cp -f --parents $(top_srcdir)/external/jaxp $(distdir)/external/jaxp ChangeLog: cvs2cl.pl -b --gmt --log-opts "-d'1998-06-30< now'" --window 7200 --usermap ChangeLog.usermap --ignore ChangeLog --fsf diff --git a/doc/api/Makefile.am b/doc/api/Makefile.am index 5db7b1027..eeae88045 100644 --- a/doc/api/Makefile.am +++ b/doc/api/Makefile.am @@ -42,7 +42,9 @@ uninstall-local: html: create_xml create_catalog create_html -packages := $(shell cd $(top_srcdir) && $(FIND) java javax -type d ! -regex .*CVS | tr '/' '.' ) +core := $(shell cd $(top_srcdir) && $(FIND) java javax -type d ! -regex .*CVS | tr '/' '.' ) +jaxp := $(shell cd $(top_srcdir)/external/jaxp/source && $(FIND) gnu javax org -type d ! -regex .*CVS | tr '/' '.') +packages = $(core) $(jaxp) #| grep -v "^java\$" ) date := $(shell $(DATE)) @@ -55,7 +57,7 @@ clean: create_xml: -$(MKDIR) xml > /dev/null 2>&1 $(GJDOC) -sourcepath \ - "$(top_srcdir):$(top_srcdir)/vm/reference" \ + "$(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_srcdir)/vm/reference" \ -doclet gnu.classpath.tools.doclets.xmldoclet.Driver \ -d xml $(packages) -touch create_xml diff --git a/external/README b/external/README new file mode 100644 index 000000000..4488be16d --- /dev/null +++ b/external/README @@ -0,0 +1,18 @@ +This directory contains libraries maintained externally to GNU Classpath. + +jaxp - http://www.gnu.org/software/classpathx/jaxp/ + + GNU JAXP, a part of the GNU Classpath Extensions project + (hosted at savannah.gnu.org) is a free implementation of the + standard XML processing APIs for Java: + + * SAX Parser API + * DOM Level 2 generic XML data structures + * Sun's JAXP v1.1 interfaces + + Import method: + + cvs -d :ext:cbj@subversions.gnu.org:/cvsroot/classpath \ + import -m "import classpathx jaxp 20030123" \ + classpath/external/jaxp Classpathx JAXP_CVS_20030123 + diff --git a/lib/Makefile.am b/lib/Makefile.am index b134d1f37..7ce44d8c4 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -45,10 +45,10 @@ endif # handling javac definition including programs like jikes here #----------------------------------------------------------------- if FOUND_JIKES -JAVAC = $(JIKES) -target 1.1 +F -bootclasspath '' -extdirs '' -sourcepath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . @classes +JAVAC = $(JIKES) +F -bootclasspath '' -extdirs '' -sourcepath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -d . @classes else if FOUND_GCJ -JAVAC = $(GCJ) --bootclasspath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -C -d . @classes +JAVAC = $(GCJ) --bootclasspath '' $(ARG_CLASSPATH_JAVAC) $(top_srcdir):$(top_srcdir)/external/jaxp/source:$(top_builddir)/vm/current:.:$(USER_CLASSLIB) -C -d . @classes else if FOUND_KJC JAVAC = $(USER_JABBA) $(ARG_CLASSPATH_VM) $(KJC_CLASSPATH):$(USER_CLASSLIB) $(KJC_MAIN) $(ARG_CLASSPATH_JAVAC) .:$(USER_CLASSLIB) -d . @classes @@ -88,17 +88,19 @@ install-data-local : if ! [ -e glibj.zip ]; then cp -R gnu $(DESTDIR)$(pkgdatadir); fi if ! [ -e glibj.zip ]; then cp -R java $(DESTDIR)$(pkgdatadir); fi if ! [ -e glibj.zip ]; then cp -R javax $(DESTDIR)$(pkgdatadir); fi + if ! [ -e glibj.zip ]; then cp -R org $(DESTDIR)$(pkgdatadir); fi # FIXME - should mimic doc/api/Makefile.am instead... uninstall-local: rm -rf $(DESTDIR)$(pkgdatadir)/gnu rm -rf $(DESTDIR)$(pkgdatadir)/java rm -rf $(DESTDIR)$(pkgdatadir)/javax + rm -rf $(DESTDIR)$(pkgdatadir)/org .PHONY: genclasses glibj.zip: classes compile-classes resources - if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax > /dev/null; fi + if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org > /dev/null; fi resources: if ! [ -e gnu ]; then mkdir gnu; fi @@ -131,3 +133,4 @@ maintainer-clean-local: -rm -rf gnu -rm -rf java -rm -rf javax + -rm -rf org diff --git a/lib/gen-classlist.sh.in b/lib/gen-classlist.sh.in index 43635fee7..fef1c9416 100755 --- a/lib/gen-classlist.sh.in +++ b/lib/gen-classlist.sh.in @@ -1,9 +1,9 @@ #! @SH@ # @configure_input@ if test "@top_srcdir@" = "${top_builddir}"; then - @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu ${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 + @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/external/jaxp/source ${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 else - @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu ${top_builddir}/java ${top_builddir}/javax ${top_builddir}/gnu ${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 + @FIND@ @top_srcdir@/java @top_srcdir@/javax @top_srcdir@/gnu @top_srcdir@/external/jaxp/source ${top_builddir}/java ${top_builddir}/javax ${top_builddir}/gnu ${top_builddir}/vm/current -follow -type f -print | grep '\.java$' > ${top_builddir}/lib/classes.1 fi for filexp in `cat @top_srcdir@/lib/$1.omit` ; do { grep -v ${filexp} < ${top_builddir}/lib/classes.1 > ${top_builddir}/lib/classes.2 ; mv ${top_builddir}/lib/classes.2 ${top_builddir}/lib/classes.1 ; } ; done |