OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Tom Tromey 2007-03-09 22:10:49 +00:00 committed by Tom Tromey
parent f4072316a3
commit 99b12b201d
4 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libjava/ChangeLog
View File

@ -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.

8
libjava/Makefile.in
View File

@ -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 \

14
libjava/scripts/makemake.tcl
View File

@ -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

8
libjava/sources.am
View File

@ -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