diff options
| author | Mark Wielaard <mark@klomp.org> | 2006-07-04 07:25:44 +0000 |
|---|---|---|
| committer | Mark Wielaard <mark@klomp.org> | 2006-07-04 07:25:44 +0000 |
| commit | e8300a31ab3b898fb656e5be1956cd41d0d49bda (patch) | |
| tree | 18754a915a39fc8b52ec48e1af8b17914d8a7880 /lib | |
| parent | 9fcf2d2352094b519bf39c483e5b72206da76eed (diff) | |
| download | classpath-e8300a31ab3b898fb656e5be1956cd41d0d49bda.tar.gz | |
2006-07-04 Mario Torre <neugens@limasoftware.net>
* configure.ac: Added new option --enable-default-preferences-peer
to pass user specified default preference backend.
If the GConf peer is built, GConf become the default backend.
* resource/META-INF/services/java.util.prefs.PreferencesFactory.in:
new file.
* lib/Makefile.am: excludes files terminating in 'in' from
the metafiles list.
* lib/copy-vmresources.sh.in: excludes files terminating in 'in'
from copy into META-INF.
* java/util/prefs/Preferences.java: added two new import
classes gnu.classpath.ServiceFactory and java.util.Iterator.
(getFactory): Now try to check for
a system defined default preference backend before to fall back on
FileBasedPreference.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/copy-vmresources.sh.in | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 31dd36aeb..3ec14890e 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -7,7 +7,7 @@ sinclude $(JAVA_DEPEND) propertydirs := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax org META-INF -type d ! -name CVS -print) propertyfiles := $(shell cd $(top_srcdir)/resource && $(FIND) gnu java javax org -name \*\.properties -print) -metafiles := $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -type f -print) +metafiles := $(shell cd $(top_srcdir)/resource && $(FIND) META-INF -name CVS -prune -o -name \*\.in -prune -o -type f -print) iconfiles := $(shell cd $(top_srcdir) && $(FIND) gnu/javax/swing/plaf/gtk/icons -name *.png -type f -print) compile_classpath = $(vm_classes):$(top_srcdir):$(top_srcdir)/external/w3c_dom:$(top_srcdir)/external/sax:$(top_srcdir)/external/relaxngDatatype:.:$(USER_CLASSLIB):$(PATH_TO_ESCHER) diff --git a/lib/copy-vmresources.sh.in b/lib/copy-vmresources.sh.in index 39b3292e7..dbda9de20 100644 --- a/lib/copy-vmresources.sh.in +++ b/lib/copy-vmresources.sh.in @@ -13,7 +13,7 @@ for p in ${vmdirs}; do for u in ${dirs}; do mkdir -p ${destMetaDir}/${u}; done; - files=`find . -name "CVS" -prune -o -type f -print`; + files=`find . -name "CVS" -prune -o -name "*.in" -prune -o -type f -print`; for u in ${files}; do cp ${u} ${destMetaDir}/${u}; done |