This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
Re: [patch] Include rmic template files in the tools.jar
- From: Matthias Klose <doko at ubuntu dot com>
- To: Tom Tromey <tromey at redhat dot com>
- Cc: GCJ-patches <java-patches at gcc dot gnu dot org>
- Date: Wed, 06 Feb 2008 20:23:54 +0100
- Subject: Re: [patch] Include rmic template files in the tools.jar
- References: <47A89F46.1060206@ubuntu.com> <m3prvaytkl.fsf@fleche.redhat.com>
Tom Tromey schrieb:
>>>>>> "Matthias" == Matthias Klose <doko@ubuntu.com> writes:
>
> Matthias> 2008-02-05 Matthias Klose <doko@ubuntu.com>
> Matthias> * tools/Makefile.am ($(TOOLS_ZIP)): Copy over rmic template files.
> Matthias> * tools/Makefile.in: Regenerate.
>
> This is ok. This should go in Classpath as well.
This is found in a GCJ LOCAL section; classpath maybe could move those files to
the resources directory as well (as done with all the *.properties files), which
would make it easier to compile these resource files into libgcj.so as well.
Currently the *.properties files are compiled into libgcj.so instead of
libgcj-tools.so.
Currently we are copying the resource files in JAVA_MAINTAINER_MODE only, so you
won't see any errors during development about missing resource files. Now moved
the copy outside the JAVA_MAINTAINER_MODE conditional.
Committed in r132156.
Matthias
2008-02-06 Matthias Klose <doko@ubuntu.com>
* tools/Makefile.am ($(TOOLS_ZIP)): Copy over rmic template files.
Copy resource files independent of JAVA_MAINTAINER_MODE.
* tools/Makefile.in: Regenerate.
Index: libjava/classpath/tools/Makefile.am
===================================================================
--- libjava/classpath/tools/Makefile.am (revision 132131)
+++ libjava/classpath/tools/Makefile.am (working copy)
@@ -186,6 +186,7 @@
AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \
$$AC -g -w -d $(srcdir)/asm @asm.lst
$(JCOMPILER) -g -w -d $(srcdir)/classes @classes.lst @vm-tools.lst
+endif
## Copy over tools resource files.
@list=`cd $(top_srcdir)/resource && find gnu/classpath/tools \
com/sun/javadoc com/sun/tools/doclets com/sun/tools/javac \
@@ -196,7 +197,14 @@
echo " cp $(top_srcdir)/resource/$$p classes/$$p"; \
cp $(top_srcdir)/resource/$$p classes/$$p; \
done
-endif
+## Copy over rmic template files.
+ @list=`cd $(srcdir) && find gnu/classpath/tools -name \*.jav -print`; \
+ for p in $$list; do \
+ dirname=classes/`dirname $$p`; \
+ if ! test -d "$$dirname"; then mkdir -p "$$dirname"; fi; \
+ echo " cp $(srcdir)/$$p classes/$$p"; \
+ cp $(srcdir)/$$p classes/$$p; \
+ done
cp -pR $(srcdir)/asm .
cp -pR $(srcdir)/classes .
## END GCJ LOCAL