+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.
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 \
# 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 {}
} 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
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