sources.am, [...]: Rebuilt.

	* sources.am, Makefile.in: Rebuilt.
	* scripts/makemake.tcl (scan_directory): Allow service files to be
	omitted.
	Omit all XML-related service files.

From-SVN: r122764

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 20f0c379c61b5bcbee4b438049a407eaa4dc65df..57485ef8ebf27ef1a05fd08d472719bd511641cd 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,10 @@
+2007-03-09  Tom Tromey  <tromey@redhat.com>
+
+       * sources.am, Makefile.in: Rebuilt.
+       * scripts/makemake.tcl (scan_directory): Allow service files to be
+       omitted.
+       Omit all XML-related service files.
+
 2007-03-07  Tom Tromey  <tromey@redhat.com>
 
        * configure: Rebuilt.

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index b8475a24a669eea7de6aece1838f5abc003d50b0..ea5695b03f98c39c60859ddeba8697f6cf210e12 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -7767,13 +7767,7 @@ property_files = \
   classpath/resource/META-INF/services/javax.sound.midi.spi.MidiDeviceProvider \
   classpath/resource/META-INF/services/javax.sound.midi.spi.MidiFileReader \
   classpath/resource/META-INF/services/javax.sound.midi.spi.MidiFileWriter \
-  classpath/resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader \
-  classpath/resource/META-INF/services/javax.xml.parsers.DocumentBuilderFactory \
-  classpath/resource/META-INF/services/javax.xml.parsers.SAXParserFactory \
-  classpath/resource/META-INF/services/javax.xml.parsers.TransformerFactory \
-  classpath/resource/META-INF/services/org.relaxng.datatype.DatatypeLibraryFactory \
-  classpath/resource/META-INF/services/org.w3c.dom.DOMImplementationSourceList \
-  classpath/resource/META-INF/services/org.xml.sax.driver
+  classpath/resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader
 
 omitted_headers = java/lang/ClassLoader.h java/lang/Thread.h \
        java/lang/String.h java/lang/reflect/Constructor.h \

diff --git a/libjava/scripts/makemake.tcl b/libjava/scripts/makemake.tcl
index 4ac29a5fa30b9beeff544c00439aa63ee974e301..47c460a7c7aeabfbcc06ccc563bb8ecca47b1686 100755 (executable)
--- a/libjava/scripts/makemake.tcl
+++ b/libjava/scripts/makemake.tcl
@@ -123,6 +123,14 @@ set properties_map(java/util/logging) _
 # We haven't merged locale resources yet.
 set properties_map(gnu/java/locale) _
 
+# We want to be able to load xerces if it is on the class path.  So,
+# we have to avoid compiling in the XML-related service files.
+set properties_map(META-INF/services/javax.xml.parsers.DocumentBuilderFactory) _
+set properties_map(META-INF/services/javax.xml.parsers.SAXParserFactory) _
+set properties_map(META-INF/services/javax.xml.parsers.TransformerFactory) _
+set properties_map(META-INF/services/org.relaxng.datatype.DatatypeLibraryFactory) _
+set properties_map(META-INF/services/org.w3c.dom.DOMImplementationSourceList) _
+set properties_map(META-INF/services/org.xml.sax.driver) _
 
 # List of all properties files.
 set properties_files {}
@@ -223,8 +231,10 @@ proc scan_directory {basedir subdir} {
     } elseif {[file isdirectory $file]} {
       lappend subdirs $subdir/$file
     } elseif {$subdir == "META-INF/services"} {
-      # All service files are included as properties.
-      lappend properties_files $basedir/$subdir/$file
+      # Service files are generally included as properties.
+      if {! [info exists properties_map($subdir/$file)]} {
+       lappend properties_files $basedir/$subdir/$file
+      }
     }
   }
   cd $here

diff --git a/libjava/sources.am b/libjava/sources.am
index 188e3118b5b361a31708d2cb4a87df9275a34091..d228ef720cd808ab9a291bb0ee8d0d42c6a2b288 100644 (file)
--- a/libjava/sources.am
+++ b/libjava/sources.am
@@ -8979,10 +8979,4 @@ property_files = \
   classpath/resource/META-INF/services/javax.sound.midi.spi.MidiDeviceProvider \
   classpath/resource/META-INF/services/javax.sound.midi.spi.MidiFileReader \
   classpath/resource/META-INF/services/javax.sound.midi.spi.MidiFileWriter \
-  classpath/resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader \
-  classpath/resource/META-INF/services/javax.xml.parsers.DocumentBuilderFactory \
-  classpath/resource/META-INF/services/javax.xml.parsers.SAXParserFactory \
-  classpath/resource/META-INF/services/javax.xml.parsers.TransformerFactory \
-  classpath/resource/META-INF/services/org.relaxng.datatype.DatatypeLibraryFactory \
-  classpath/resource/META-INF/services/org.w3c.dom.DOMImplementationSourceList \
-  classpath/resource/META-INF/services/org.xml.sax.driver
+  classpath/resource/META-INF/services/javax.sound.sampled.spi.AudioFileReader