source.am, [...]: Rebuilt.
* source.am, Makefile.in: Rebuilt. * Makefile.am (property_files): Removed. * scripts/makemake.tcl (properties_map): New global. (properties_files): Likewise. (emit_property_files): New proc. (scan_packages): Scan META-INF. Print property_files variable. Scan classpath/resource. From-SVN: r113891
This commit is contained in:
Tom Tromey
Tom Tromey
parent
e389defe26
commit
578fdcb215
5 changed files with 87 additions and 39 deletions
|
|
@ -1,3 +1,13 @@
|
|||
2006-05-18 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* source.am, Makefile.in: Rebuilt.
|
||||
* Makefile.am (property_files): Removed.
|
||||
* scripts/makemake.tcl (properties_map): New global.
|
||||
(properties_files): Likewise.
|
||||
(emit_property_files): New proc.
|
||||
(scan_packages): Scan META-INF.
|
||||
Print property_files variable. Scan classpath/resource.
|
||||
|
||||
2006-05-18 Tom Tromey <tromey@redhat.com>
|
||||
|
||||
* testsuite/libjava.special/special.exp (gcj_special_pr21115):
|
||||
|
|
|
|||
|
|
@ -304,19 +304,7 @@ lib_gnu_awt_xlib_la_LDFLAGS = ../libstdc++-v3/src/libstdc++.la \
|
|||
-version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
|
||||
lib_gnu_awt_xlib_la_LINK = $(LIBLINK)
|
||||
|
||||
## Build property files into the library.
|
||||
property_files = \
|
||||
classpath/resource/org/ietf/jgss/MessagesBundle.properties \
|
||||
classpath/resource/java/util/iso4217.properties \
|
||||
classpath/resource/gnu/java/awt/peer/gtk/font.properties \
|
||||
classpath/resource/gnu/regexp/MessagesBundle_it.properties \
|
||||
classpath/resource/gnu/regexp/MessagesBundle_fr.properties \
|
||||
classpath/resource/gnu/regexp/MessagesBundle.properties \
|
||||
classpath/resource/META-INF/services/org.xml.sax.driver \
|
||||
classpath/resource/META-INF/services/javax.xml.parsers.SAXParserFactory \
|
||||
classpath/resource/META-INF/services/javax.xml.parsers.DocumentBuilderFactory \
|
||||
classpath/resource/META-INF/services/javax.xml.parsers.TransformerFactory
|
||||
|
||||
## Note that property_files is defined in sources.am.
|
||||
propertyo_files = $(patsubst classpath/resource/%,%,$(addsuffix .lo,$(property_files)))
|
||||
|
||||
$(propertyo_files): %.lo: classpath/resource/%
|
||||
|
|
|
|||
|
|
@ -489,7 +489,6 @@ GCSPEC = @GCSPEC@
|
|||
GCTESTSPEC = @GCTESTSPEC@
|
||||
GLIB_CFLAGS = @GLIB_CFLAGS@
|
||||
GLIB_LIBS = @GLIB_LIBS@
|
||||
GREP = @GREP@
|
||||
GTK_AWT_FALSE = @GTK_AWT_FALSE@
|
||||
GTK_AWT_TRUE = @GTK_AWT_TRUE@
|
||||
GTK_CAIRO_FALSE = @GTK_CAIRO_FALSE@
|
||||
|
|
@ -591,7 +590,6 @@ USING_WIN32_THREADS_TRUE = @USING_WIN32_THREADS_TRUE@
|
|||
VERSION = @VERSION@
|
||||
XLIB_AWT_FALSE = @XLIB_AWT_FALSE@
|
||||
XLIB_AWT_TRUE = @XLIB_AWT_TRUE@
|
||||
XMKMF = @XMKMF@
|
||||
X_CFLAGS = @X_CFLAGS@
|
||||
X_EXTRA_LIBS = @X_EXTRA_LIBS@
|
||||
X_LIBS = @X_LIBS@
|
||||
|
|
@ -600,8 +598,14 @@ ZINCS = @ZINCS@
|
|||
ZLIBS = @ZLIBS@
|
||||
ZLIBSPEC = @ZLIBSPEC@
|
||||
ZLIBTESTSPEC = @ZLIBTESTSPEC@
|
||||
ac_ct_AR = @ac_ct_AR@
|
||||
ac_ct_AS = @ac_ct_AS@
|
||||
ac_ct_CC = @ac_ct_CC@
|
||||
ac_ct_CXX = @ac_ct_CXX@
|
||||
ac_ct_GCJ = @ac_ct_GCJ@
|
||||
ac_ct_LD = @ac_ct_LD@
|
||||
ac_ct_RANLIB = @ac_ct_RANLIB@
|
||||
ac_ct_STRIP = @ac_ct_STRIP@
|
||||
am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
|
||||
am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
|
||||
am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
|
||||
|
|
@ -621,10 +625,7 @@ build_os = @build_os@
|
|||
build_subdir = @build_subdir@
|
||||
build_vendor = @build_vendor@
|
||||
datadir = @datadir@
|
||||
datarootdir = @datarootdir@
|
||||
dbexecdir = @dbexecdir@
|
||||
docdir = @docdir@
|
||||
dvidir = @dvidir@
|
||||
exec_prefix = @exec_prefix@
|
||||
extra_ldflags_libjava = @extra_ldflags_libjava@
|
||||
gxx_include_dir = @gxx_include_dir@
|
||||
|
|
@ -635,7 +636,6 @@ host_cpu = @host_cpu@
|
|||
host_os = @host_os@
|
||||
host_subdir = @host_subdir@
|
||||
host_vendor = @host_vendor@
|
||||
htmldir = @htmldir@
|
||||
includedir = @includedir@
|
||||
infodir = @infodir@
|
||||
install_sh = @install_sh@
|
||||
|
|
@ -643,16 +643,13 @@ libdir = @libdir@
|
|||
libexecdir = @libexecdir@
|
||||
libgcj_basedir = @libgcj_basedir@
|
||||
libstdcxx_incdir = @libstdcxx_incdir@
|
||||
localedir = @localedir@
|
||||
localstatedir = @localstatedir@
|
||||
mandir = @mandir@
|
||||
mkdir_p = @mkdir_p@
|
||||
mkinstalldirs = @mkinstalldirs@
|
||||
oldincludedir = @oldincludedir@
|
||||
pdfdir = @pdfdir@
|
||||
prefix = @prefix@
|
||||
program_transform_name = @program_transform_name@
|
||||
psdir = @psdir@
|
||||
sbindir = @sbindir@
|
||||
sharedstatedir = @sharedstatedir@
|
||||
subdirs = @subdirs@
|
||||
|
|
@ -843,18 +840,6 @@ lib_gnu_awt_xlib_la_LDFLAGS = ../libstdc++-v3/src/libstdc++.la \
|
|||
-version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LIBGCJ_LD_SYMBOLIC)
|
||||
|
||||
lib_gnu_awt_xlib_la_LINK = $(LIBLINK)
|
||||
property_files = \
|
||||
classpath/resource/org/ietf/jgss/MessagesBundle.properties \
|
||||
classpath/resource/java/util/iso4217.properties \
|
||||
classpath/resource/gnu/java/awt/peer/gtk/font.properties \
|
||||
classpath/resource/gnu/regexp/MessagesBundle_it.properties \
|
||||
classpath/resource/gnu/regexp/MessagesBundle_fr.properties \
|
||||
classpath/resource/gnu/regexp/MessagesBundle.properties \
|
||||
classpath/resource/META-INF/services/org.xml.sax.driver \
|
||||
classpath/resource/META-INF/services/javax.xml.parsers.SAXParserFactory \
|
||||
classpath/resource/META-INF/services/javax.xml.parsers.DocumentBuilderFactory \
|
||||
classpath/resource/META-INF/services/javax.xml.parsers.TransformerFactory
|
||||
|
||||
propertyo_files = $(patsubst classpath/resource/%,%,$(addsuffix .lo,$(property_files)))
|
||||
CLEANFILES = libgcj-$(gcc_version).jar
|
||||
DISTCLEANFILES = native.dirs
|
||||
|
|
@ -6954,6 +6939,26 @@ bc_objects = \
|
|||
org-w3c.lo \
|
||||
org-xml.lo
|
||||
|
||||
property_files = \
|
||||
classpath/resource/gnu/classpath/tools/jarsigner/MessageBundle.properties \
|
||||
classpath/resource/gnu/classpath/tools/keytool/MessageBundle.properties \
|
||||
classpath/resource/gnu/java/awt/peer/gtk/font.properties \
|
||||
classpath/resource/gnu/javax/print/PrinterDialog.properties \
|
||||
classpath/resource/gnu/javax/print/PrinterDialog_de.properties \
|
||||
classpath/resource/gnu/javax/security/auth/callback/MessagesBundle.properties \
|
||||
classpath/resource/gnu/regexp/MessagesBundle.properties \
|
||||
classpath/resource/gnu/regexp/MessagesBundle_fr.properties \
|
||||
classpath/resource/gnu/regexp/MessagesBundle_it.properties \
|
||||
classpath/resource/java/util/iso4217.properties \
|
||||
classpath/resource/javax/imageio/plugins/jpeg/MessagesBundle.properties \
|
||||
classpath/resource/org/ietf/jgss/MessagesBundle.properties \
|
||||
classpath/resource/META-INF/services/javax.sound.midi.spi.MidiDeviceProvider \
|
||||
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.xml.sax.driver
|
||||
|
||||
omitted_headers = java/lang/ClassLoader.h java/lang/Thread.h \
|
||||
java/lang/String.h java/lang/reflect/Constructor.h \
|
||||
java/lang/reflect/Field.h java/lang/reflect/Method.h \
|
||||
|
|
|
|||
|
|
@ -88,6 +88,20 @@ makearray name_map
|
|||
global dir_map
|
||||
makearray dir_map
|
||||
|
||||
# An entry in this map means that all .properties files in the
|
||||
# corresponding directory should be ignored.
|
||||
global properties_map
|
||||
makearray properties_map
|
||||
|
||||
# logging.properties is installed and is editable.
|
||||
set properties_map(java/util/logging) _
|
||||
# We haven't merged locale resources yet.
|
||||
set properties_map(gnu/java/locale) _
|
||||
|
||||
|
||||
# List of all properties files.
|
||||
set properties_files {}
|
||||
|
||||
# List of all '@' files that we are going to compile.
|
||||
set package_files {}
|
||||
|
||||
|
|
@ -163,11 +177,11 @@ proc classify_source_file {basedir file} {
|
|||
error "can't happen"
|
||||
}
|
||||
|
||||
# Scan a directory and its subdirectories for .java source files.
|
||||
# Note that we keep basedir and subdir separate so we can properly
|
||||
# update our global data structures.
|
||||
# Scan a directory and its subdirectories for .java source files or
|
||||
# .properties files. Note that we keep basedir and subdir separate so
|
||||
# we can properly update our global data structures.
|
||||
proc scan_directory {basedir subdir} {
|
||||
global dir_map
|
||||
global dir_map properties_map properties_files
|
||||
|
||||
set subdirs {}
|
||||
set files {}
|
||||
|
|
@ -176,8 +190,16 @@ proc scan_directory {basedir subdir} {
|
|||
foreach file [lsort [glob -nocomplain *]] {
|
||||
if {[string match *.java $file]} {
|
||||
lappend files $subdir/$file
|
||||
} elseif {[string match *.properties $file]} {
|
||||
if {! [info exists properties_map($subdir)]} {
|
||||
# We assume there aren't any overrides.
|
||||
lappend properties_files $basedir/$subdir/$file
|
||||
}
|
||||
} 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
|
||||
}
|
||||
}
|
||||
cd $here
|
||||
|
|
@ -195,7 +217,7 @@ proc scan_directory {basedir subdir} {
|
|||
# Scan known packages beneath the base directory for .java source
|
||||
# files.
|
||||
proc scan_packages {basedir} {
|
||||
foreach subdir {gnu java javax org} {
|
||||
foreach subdir {gnu java javax org META-INF} {
|
||||
if {[file exists $basedir/$subdir]} {
|
||||
scan_directory $basedir $subdir
|
||||
}
|
||||
|
|
@ -340,6 +362,8 @@ scan_packages classpath
|
|||
scan_packages classpath/external/sax
|
||||
scan_packages classpath/external/w3c_dom
|
||||
scan_packages classpath/external/relaxngDatatype
|
||||
# Resource files.
|
||||
scan_packages classpath/resource
|
||||
# Now scan our own files; this will correctly override decisions made
|
||||
# when scanning classpath.
|
||||
scan_packages .
|
||||
|
|
@ -376,3 +400,4 @@ foreach package [lsort [array names package_map]] {
|
|||
pp_var all_packages_source_files $package_files
|
||||
pp_var ordinary_header_files $header_vars "\$(" ")"
|
||||
pp_var bc_objects $bc_objects
|
||||
pp_var property_files $properties_files
|
||||
|
|
|
|||
|
|
@ -8739,3 +8739,23 @@ bc_objects = \
|
|||
org-relaxng.lo \
|
||||
org-w3c.lo \
|
||||
org-xml.lo
|
||||
|
||||
property_files = \
|
||||
classpath/resource/gnu/classpath/tools/jarsigner/MessageBundle.properties \
|
||||
classpath/resource/gnu/classpath/tools/keytool/MessageBundle.properties \
|
||||
classpath/resource/gnu/java/awt/peer/gtk/font.properties \
|
||||
classpath/resource/gnu/javax/print/PrinterDialog.properties \
|
||||
classpath/resource/gnu/javax/print/PrinterDialog_de.properties \
|
||||
classpath/resource/gnu/javax/security/auth/callback/MessagesBundle.properties \
|
||||
classpath/resource/gnu/regexp/MessagesBundle.properties \
|
||||
classpath/resource/gnu/regexp/MessagesBundle_fr.properties \
|
||||
classpath/resource/gnu/regexp/MessagesBundle_it.properties \
|
||||
classpath/resource/java/util/iso4217.properties \
|
||||
classpath/resource/javax/imageio/plugins/jpeg/MessagesBundle.properties \
|
||||
classpath/resource/org/ietf/jgss/MessagesBundle.properties \
|
||||
classpath/resource/META-INF/services/javax.sound.midi.spi.MidiDeviceProvider \
|
||||
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.xml.sax.driver
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue