This is the mail archive of the
java-patches@gcc.gnu.org
mailing list for the Java project.
[cp-0.98, patch] move around generated gjdoc files
- From: Matthias Klose <doko at cs dot tu-berlin dot de>
- To: java-patches at gcc dot gnu dot org
- Date: Tue, 21 Oct 2008 17:20:40 +0200
- Subject: [cp-0.98, patch] move around generated gjdoc files
put on the branch.
Matthias
libjava/ChangeLog:
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* sources.am, Makfile.in: Regenerate.
libjava/classpath/ChangeLog:
2008-10-20 Andrew John Hughes <gnu_andrew@member.fsf.org>
* m4/ac_prog_antlr.m4:
Remove redundant checks.
* tools/Makefile.am:
Use gjdoc_gendir when calling antlr.
2008-10-15 Andrew John Hughes <gnu_andrew@member.fsf.org>
* configure.ac:
Remove superfluous AC_PROG_JAVA call.
libjava/classpath/ChangeLog.gcj:
2008-10-21 Matthias Klose <doko@ubuntu.com>
* classpath/tools/gnu/classpath/tools/gjdoc/expr/Java*: Move from ...
* classpath/tools/generated/gnu/classpath/tools/gjdoc/expr/ ... here.
* Update .class files.
2008-10-21 Andrew John Hughes <gnu_andrew@member.fsf.org>
* tools/Makefile.am:
Always generate parser in the srcdir.
Index: classpath/tools/Makefile.am
===================================================================
--- classpath/tools/Makefile.am (revision 141259)
+++ classpath/tools/Makefile.am (working copy)
@@ -13,11 +13,13 @@
endif
if CREATE_GJDOC
-if CREATE_GJDOC_PARSER
-gjdoc_gendir = ${top_builddir}/tools/generated
-else
+## GCJ LOCAL: always put source files in srcdir
+## if CREATE_GJDOC_PARSER
+## gjdoc_gendir = ${top_builddir}/tools/generated
+## else
gjdoc_gendir = ${top_srcdir}/tools/generated
-endif
+## endif
+## END GCJ LOCAL
ANTLR_CLASSPATH = $(ANTLR_JAR):$(gjdoc_gendir)
endif
@@ -342,8 +344,8 @@
if CREATE_GJDOC
if CREATE_GJDOC_PARSER
## Generate antlr sources.
- @mkdir_p@ $(srcdir)/gnu/classpath/tools/gjdoc/expr
- $(ANTLR) -o $(srcdir)/gnu/classpath/tools/gjdoc/expr \
+ @mkdir_p@ $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr
+ $(ANTLR) -o $(gjdoc_gendir)/gnu/classpath/tools/gjdoc/expr \
$(srcdir)/gnu/classpath/tools/gjdoc/expr/java-expression.g
endif
endif
Index: classpath/configure.ac
===================================================================
--- classpath/configure.ac (revision 141259)
+++ classpath/configure.ac (working copy)
@@ -387,7 +387,7 @@
no) REGENERATE_GJDOC_PARSER=no ;;
*) REGENERATE_GJDOC_PARSER=yes ;;
esac],
- [if test -e ${srcdir}/tools/gnu/classpath/tools/gjdoc/expr/JavaLexer.java; then
+ [if test -e ${srcdir}/tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.java; then
REGENERATE_GJDOC_PARSER=no ;
else
REGENERATE_GJDOC_PARSER=yes ;
@@ -1015,18 +1015,18 @@
AC_SUBST(PATH_TO_GLIBJ_ZIP)
if test "x${TOOLSDIR}" != x; then
- dnl GCJ LOCAL
if test "x${COMPILE_WRAPPERS}" = xno && test "x${enable_java_maintainer_mode}" = xyes; then
AC_PROG_JAVA
fi
if test "x${COMPILE_GJDOC}" = xyes; then
- if test "$enable_java_maintainer_mode" = yes; then
- AC_PROG_JAVA
- fi
- dnl END GCJ LOCAL
AC_LIB_ANTLR
if test "x${REGENERATE_GJDOC_PARSER}" = xyes; then
+dnl GCJ LOCAL
+ if test "x${enable_java_maintainer_mode}" = xyes; then
+ AC_PROG_JAVA
AC_PROG_ANTLR(2,7,1)
+ fi
+dnl END GCJ LOCAL
fi
fi
fi
Index: classpath/m4/ac_prog_antlr.m4
===================================================================
--- classpath/m4/ac_prog_antlr.m4 (revision 141259)
+++ classpath/m4/ac_prog_antlr.m4 (working copy)
@@ -35,19 +35,12 @@
antlr_version_major=`echo $antlr_version_str | sed "$antlr_version_regex\\1/"`
antlr_version_minor=`echo $antlr_version_str | sed "$antlr_version_regex\\2/"`
antlr_version_micro=`echo $antlr_version_str | sed "$antlr_version_regex\\3/"`
- (test $antlr_version_major -gt $1 ||
+ (test $antlr_version_major -gt $1 || \
(test $antlr_version_major -eq $1 && \
test $antlr_version_minor -gt $2) || \
(test $antlr_version_major -eq $1 && \
test $antlr_version_minor -eq $2 && \
- test $antlr_version_micro -ge $3)) && \
- (test -z $ANTLR_JAR || \
- (test $antlr_version_major -gt $antlr_use_major ||
- (test $antlr_version_major -eq $antlr_use_major && \
- test $antlr_version_minor -gt $antlr_use_minor) || \
- (test $antlr_version_major -eq $antlr_use_major && \
- test $antlr_version_minor -eq $antlr_use_minor && \
- test $antlr_version_micro -ge $antlr_use_micro)))
- fi
- AC_MSG_RESULT($antlr_use_major.$antlr_use_minor.$antlr_use_micro)
+ test $antlr_version_micro -ge $3))
+ fi
+ AC_MSG_RESULT($antlr_version_major.$antlr_version_minor.$antlr_version_micro)
])
Index: sources.am
===================================================================
--- sources.am (revision 141259)
+++ sources.am (working copy)
@@ -4699,6 +4699,7 @@
classpath/java/lang/ThreadDeath.java \
classpath/java/lang/ThreadGroup.java \
java/lang/ThreadLocal.java \
+classpath/java/lang/ThreadLocalMap.java \
classpath/java/lang/Throwable.java \
classpath/java/lang/TypeNotPresentException.java \
classpath/java/lang/UnknownError.java \