diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | examples/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/Makefile.am | 7 | ||||
| -rw-r--r-- | resource/META-INF/services/javax.xml.parsers.DocumentBuilderFactory | 1 | ||||
| -rw-r--r-- | resource/META-INF/services/javax.xml.parsers.SAXParserFactory | 1 | ||||
| -rw-r--r-- | resource/META-INF/services/javax.xml.parsers.TransformerFactory | 1 | ||||
| -rw-r--r-- | resource/META-INF/services/org.xml.sax.driver | 1 |
7 files changed, 23 insertions, 2 deletions
@@ -1,3 +1,15 @@ +2005-05-25 Andrew John Hughes <gnu_andrew@member.fsf.org> + + * examples/Makefile.am: + Fix command-line options for ecj. + * lib/Makefile.am: + Added a META-INF directory structure to glibj.zip. + * resource/META-INF/services/javax.xml.parsers.DocumentBuilderFactory, + resource/META-INF/services/javax.xml.parsers.SAXParserFactory, + resource/META-INF/services/javax.xml.parsers.TransformerFactory, + resource/META-INF/services/org.xml.sax.driver: + Properties for the XML facilities. + 2005-05-25 Thomas Fitzsimmons <fitzsim@redhat.com> * java/awt/Component.java (enableInputMethods): Implement. diff --git a/examples/Makefile.am b/examples/Makefile.am index 45e33f6b3..74abc11c0 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -11,7 +11,7 @@ if FOUND_GCJX JCOMPILER = $(GCJX) -bootclasspath '' -sourcepath '' -classpath $(top_builddir)/lib:. else if FOUND_ECJ -JCOMPILER = $(ECJ) --bootclasspath '$(top_builddir)/lib' --classpath . +JCOMPILER = $(ECJ) -bootclasspath '$(top_builddir)/lib' -classpath . else error dunno how to setup the JCOMPILER and compile endif diff --git a/lib/Makefile.am b/lib/Makefile.am index 786e95077..a36a65281 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -56,6 +56,7 @@ install-data-local: genclasses compile-classes cp -R java $(DESTDIR)$(pkgdatadir) cp -R javax $(DESTDIR)$(pkgdatadir) cp -R org $(DESTDIR)$(pkgdatadir) + cp -R META-INF $(DESTDIR)$(pkgdatadir) # FIXME - should mimic doc/api/Makefile.am instead... uninstall-local: @@ -63,13 +64,14 @@ uninstall-local: rm -rf $(DESTDIR)$(pkgdatadir)/java rm -rf $(DESTDIR)$(pkgdatadir)/javax rm -rf $(DESTDIR)$(pkgdatadir)/org + rm -rf $(DESTDIR)$(pkgdatadir)/META-INF endif # INSTALL_CLASS_FILES .PHONY: genclasses glibj.zip: classes compile-classes resources - if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org > /dev/null; fi + if test "$(ZIP)" != ""; then $(ZIP) -r -D glibj.zip gnu java javax org META-INF > /dev/null; fi resources: if ! [ -e gnu ]; then mkdir gnu; fi @@ -81,6 +83,8 @@ resources: @list='$(propertyfiles)'; for p in $$list; do \ cp $(top_srcdir)/resource/$$p $$p; \ done + if [ -e META-INF ]; then rm -rf META-INF; fi + cp -r $(top_srcdir)/resource/META-INF . touch resources classes: genclasses @@ -125,6 +129,7 @@ clean-local: -rm -rf java -rm -rf javax -rm -rf org + -rm -rf META-INF dist-hook: mkdir -p $(distdir) diff --git a/resource/META-INF/services/javax.xml.parsers.DocumentBuilderFactory b/resource/META-INF/services/javax.xml.parsers.DocumentBuilderFactory new file mode 100644 index 000000000..7a7c04c7b --- /dev/null +++ b/resource/META-INF/services/javax.xml.parsers.DocumentBuilderFactory @@ -0,0 +1 @@ +gnu.xml.dom.DomDocumentBuilderFactory diff --git a/resource/META-INF/services/javax.xml.parsers.SAXParserFactory b/resource/META-INF/services/javax.xml.parsers.SAXParserFactory new file mode 100644 index 000000000..a4d411615 --- /dev/null +++ b/resource/META-INF/services/javax.xml.parsers.SAXParserFactory @@ -0,0 +1 @@ +gnu.xml.aelfred2.JAXPFactory diff --git a/resource/META-INF/services/javax.xml.parsers.TransformerFactory b/resource/META-INF/services/javax.xml.parsers.TransformerFactory new file mode 100644 index 000000000..8dc85e0bf --- /dev/null +++ b/resource/META-INF/services/javax.xml.parsers.TransformerFactory @@ -0,0 +1 @@ +gnu.xml.transform.TransformerFactoryImpl diff --git a/resource/META-INF/services/org.xml.sax.driver b/resource/META-INF/services/org.xml.sax.driver new file mode 100644 index 000000000..97527e150 --- /dev/null +++ b/resource/META-INF/services/org.xml.sax.driver @@ -0,0 +1 @@ +gnu.xml.aelfred2.XmlReader |