This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[ecj] Patch: FYI: check in tools .class files
- From: Tom Tromey <tromey at redhat dot com>
- To: Java Patch List <java-patches at gcc dot gnu dot org>
- Date: 18 Dec 2006 13:06:51 -0700
- Subject: [ecj] Patch: FYI: check in tools .class files
- Reply-to: tromey at redhat dot com
I'm checking this in on the gcj-eclipse-merge-branch.
This checks in the .class files for the tools.
Gary discovered that this was the sole remaining place where ecj was
needed during a build.
Tom
Index: ChangeLog.gcj
from Tom Tromey <tromey@redhat.com>
* tools/Makefile.in: Rebuilt.
* tools/Makefile.am ($(TOOLS_ZIP)): Put classes in srcdir.
* tools/asm, tools/classes: Check in .class files.
Index: tools/Makefile.am
===================================================================
--- tools/Makefile.am (revision 120009)
+++ tools/Makefile.am (working copy)
@@ -147,15 +147,17 @@
# immediately. And copy the template files we use to the classes dir
# so they get also included.
$(TOOLS_ZIP): $(TOOLS_JAVA_FILES)
- @rm -rf classes asm
- mkdir classes asm
-## Compile ASM separately as it is latin-1 encoded.
+## GCJ LOCAL: put classes in srcdir
+## @rm -rf classes asm
+## mkdir classes asm
find $(srcdir)/external/asm -name '*.java' -print > asm.lst
- AC=`echo $(JCOMPILER) | sed -e 's/UTF-8/ISO-8859-1/g'`; \
- $$AC -g -w -d asm @asm.lst
find $(srcdir)/gnu/classpath/tools -name '*.java' -print > classes.lst
- $(JCOMPILER) -g -w -d classes @classes.lst
cat classes.lst asm.lst > all-classes.lst
+if JAVA_MAINTAINER_MODE
+## Compile ASM separately as it is latin-1 encoded.
+ 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
## Copy over tools resource files.
@list=`cd $(top_srcdir)/resource && find gnu/classpath/tools -name \*.properties -print`; \
for p in $$list; do \
@@ -164,6 +166,10 @@
echo " cp $(top_srcdir)/resource/$$p classes/$$p"; \
cp $(top_srcdir)/resource/$$p classes/$$p; \
done
+endif
+ cp -a $(srcdir)/asm .
+ cp -a $(srcdir)/classes .
+## END GCJ LOCAL
## First add classpath tools stuff.
(cd classes; \
if test "$(ZIP)" != ""; then $(ZIP) -r ../$(TOOLS_ZIP) .; fi; \
@@ -174,7 +180,7 @@
if test "$(ZIP)" != ""; then $(ZIP) -u -r ../$(TOOLS_ZIP) .; fi; \
if test "$(FASTJAR)" != ""; then $(FASTJAR) uf ../$(TOOLS_ZIP) .; fi; \
cd ..)
- rm -rf classes classes.lst asm.lst
+ rm -rf asm classes classes.lst asm.lst
# Zip file be gone! (and make sure the classes are gone too)
clean-local: