I just figured that the right thing to do is to put the properties file
into resource/.
2006-07-18 Roman Kennke <[EMAIL PROTECTED]>
* lib/copy-vmresources.sh.in: Reverted.
* gnu/java/awt/peer/x/fonts.properties: Moved to resource/
* resource/gnu/java/awt/peer/x/fonts.properties: New file.
/Roman
Roman Kennke schrieb:
There is one properties file needed for the X peers, which have to be
included in the glibj.zip. I hacked the copy-vmresources.sh.in file to
include it.
2006-07-18 Roman Kennke <[EMAIL PROTECTED]>
* lib/copy-vmresources.sh.in: Include properties from X peers.
/Roman
Index: lib/copy-vmresources.sh.in
===================================================================
RCS file: /cvsroot/classpath/classpath/lib/copy-vmresources.sh.in,v
retrieving revision 1.6
diff -u -1 -2 -r1.6 copy-vmresources.sh.in
--- lib/copy-vmresources.sh.in 18 Jul 2006 12:58:36 -0000 1.6
+++ lib/copy-vmresources.sh.in 18 Jul 2006 13:39:11 -0000
@@ -1,17 +1,17 @@
#! @SHELL@
# @configure_input@
[EMAIL PROTECTED]@
-vmdirs=`echo "@vm_classes@ ${top_srcdir}/gnu/java/awt/peer/x" | sed 's%:% %g'`
+vmdirs=`echo "@vm_classes@" | sed 's%:% %g'`
destMetaDir=`pwd`/META-INF
destResDir=`pwd`
for p in ${vmdirs}; do
if test -d $p/META-INF; then
(cd $p/META-INF;
dirs=`find . -name "CVS" -prune -o -type d -print`;
for u in ${dirs}; do
mkdir -p ${destMetaDir}/${u};
done;
files=`find . -name "CVS" -prune -o -name "*.in" -prune -o -type f -print`;
for u in ${files}; do
Index: gnu/java/awt/peer/x/fonts.properties
===================================================================
RCS file: gnu/java/awt/peer/x/fonts.properties
diff -N gnu/java/awt/peer/x/fonts.properties
--- gnu/java/awt/peer/x/fonts.properties 29 Jun 2006 15:15:56 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,25 +0,0 @@
-
-serif.plain=-adobe-times-medium-r-normal--%d-*-*-*-p-*-iso8859-1
-serif.bold=-adobe-times-bold-r-normal--%d-*-*-*-p-*-iso8859-1
-serif.italic=-adobe-times-medium-o-normal--%d-*-*-*-p-*-iso8859-1
-serif.bolditalic=-adobe-times-bold-o-normal--%d-*-*-*-p-*-iso8859-1
-
-sansserif.plain=-adobe-helvetica-medium-r-normal--%d-*-*-*-p-*-iso8859-1
-sansserif.bold=-adobe-helvetica-bold-r-normal--%d-*-*-*-p-*-iso8859-1
-sansserif.italic=-adobe-helvetica-medium-o-normal--%d-*-*-*-p-*-iso8859-1
-sansserif.bolditalic=-adobe-helvetica-bold-o-normal--%d-*-*-*-p-*-iso8859-1
-
-monospaced.plain=-adobe-courier-medium-r-normal--%d-*-*-*-p-*-iso8859-1
-monospaced.bold=-adobe-courier-bold-r-normal--%d-*-*-*-p-*-iso8859-1
-monospaced.italic=-adobe-courier-medium-o-normal--%d-*-*-*-p-*-iso8859-1
-monospaced.bolditalic=-adobe-courier-bold-o-normal--%d-*-*-*-p-*-iso8859-1
-
-dialog.plain=-adobe-helvetica-medium-r-normal--%d-*-*-*-p-*-iso8859-1
-dialog.bold=-adobe-helvetica-bold-r-normal--%d-*-*-*-p-*-iso8859-1
-dialog.italic=-adobe-helvetica-medium-o-normal--%d-*-*-*-p-*-iso8859-1
-dialog.bolditalic=-adobe-helvetica-bold-o-normal--%d-*-*-*-p-*-iso8859-1
-
-dialoginput.plain=-adobe-helvetica-medium-r-normal--%d-*-*-*-p-*-iso8859-1
-dialoginput.bold=-adobe-helvetica-bold-r-normal--%d-*-*-*-p-*-iso8859-1
-dialoginput.italic=-adobe-helvetica-medium-o-normal--%d-*-*-*-p-*-iso8859-1
-dialoginput.bolditalic=-adobe-helvetica-bold-o-normal--%d-*-*-*-p-*-iso8859-1
Index: resource/gnu/java/awt/peer/x/fonts.properties
===================================================================
RCS file: resource/gnu/java/awt/peer/x/fonts.properties
diff -N resource/gnu/java/awt/peer/x/fonts.properties
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ resource/gnu/java/awt/peer/x/fonts.properties 18 Jul 2006 13:39:11 -0000
@@ -0,0 +1,25 @@
+
+serif.plain=-adobe-times-medium-r-normal--%d-*-*-*-p-*-iso8859-1
+serif.bold=-adobe-times-bold-r-normal--%d-*-*-*-p-*-iso8859-1
+serif.italic=-adobe-times-medium-o-normal--%d-*-*-*-p-*-iso8859-1
+serif.bolditalic=-adobe-times-bold-o-normal--%d-*-*-*-p-*-iso8859-1
+
+sansserif.plain=-adobe-helvetica-medium-r-normal--%d-*-*-*-p-*-iso8859-1
+sansserif.bold=-adobe-helvetica-bold-r-normal--%d-*-*-*-p-*-iso8859-1
+sansserif.italic=-adobe-helvetica-medium-o-normal--%d-*-*-*-p-*-iso8859-1
+sansserif.bolditalic=-adobe-helvetica-bold-o-normal--%d-*-*-*-p-*-iso8859-1
+
+monospaced.plain=-adobe-courier-medium-r-normal--%d-*-*-*-p-*-iso8859-1
+monospaced.bold=-adobe-courier-bold-r-normal--%d-*-*-*-p-*-iso8859-1
+monospaced.italic=-adobe-courier-medium-o-normal--%d-*-*-*-p-*-iso8859-1
+monospaced.bolditalic=-adobe-courier-bold-o-normal--%d-*-*-*-p-*-iso8859-1
+
+dialog.plain=-adobe-helvetica-medium-r-normal--%d-*-*-*-p-*-iso8859-1
+dialog.bold=-adobe-helvetica-bold-r-normal--%d-*-*-*-p-*-iso8859-1
+dialog.italic=-adobe-helvetica-medium-o-normal--%d-*-*-*-p-*-iso8859-1
+dialog.bolditalic=-adobe-helvetica-bold-o-normal--%d-*-*-*-p-*-iso8859-1
+
+dialoginput.plain=-adobe-helvetica-medium-r-normal--%d-*-*-*-p-*-iso8859-1
+dialoginput.bold=-adobe-helvetica-bold-r-normal--%d-*-*-*-p-*-iso8859-1
+dialoginput.italic=-adobe-helvetica-medium-o-normal--%d-*-*-*-p-*-iso8859-1
+dialoginput.bolditalic=-adobe-helvetica-bold-o-normal--%d-*-*-*-p-*-iso8859-1
