Hash :
01dede44
Author :
Date :
2011-04-23T13:52:40
java: allow both JAVA and nobase_JAVA in the same Makefile.am * automake.in (handle_java): Also strip `nobase_' from the given prefix, when needed. * tests/java-clean.test: Update and extend. * tests/java-compile-install.test: Likewise. * tests/java-no-duplicate.test: Likewise. * tests/java-sources.test: Likewise. * tests/java-noinst.test: Likewise. * tests/java-mix-dist-nodist.test: Renamed to ... * tests/java-mix.test: ... this, and extended. * tests/java-nobase.test: New test, still xfailing due to unrelated issues. * tests/Makefile.am (TESTS, XFAIL_TESTS): Update.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68
#! /bin/sh
# Copyright (C) 2011 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Check that the JAVA primary can be used freely in the same Makefile.am
# with proper combinations of the `dist_', `nodist_' and `nobase_'
# modifiers .
. ./defs || Exit 1
cat >> configure.in << 'END'
AC_OUTPUT
END
cat > Makefile.am << 'END'
# This test does not require compilation of *.java files.
JAVAC = false
javadir = $(prefix)
java_JAVA = Class.java
dist_java_JAVA = ClassDist.java
nodist_java_JAVA = ClassNodist.java
nobase_java_JAVA = ClassNobase.java
nobase_dist_java_JAVA = ClassNobaseDist.java
nobase_nodist_java_JAVA = ClassNobaseNodist.java
Class3.java Class6.java:
@echo '$@ should not be generated!' >&2; exit 1
END
: > Class.java
: > ClassDist.java
: > ClassNobase.java
: > ClassNobaseDist.java
$ACLOCAL
$AUTOCONF
# Automake used to display non-fatal warnings with this test,
# but those must be seen as a failure by us.
$AUTOMAKE 2>stderr || { cat stderr >&2; Exit 1; }
cat stderr >&2
test ! -s stderr
./configure
$MAKE distdir
ls -l $distdir # For debugging.
test -f $distdir/Class.java
test -f $distdir/ClassDist.java
test -f $distdir/NobaseClass.java
test -f $distdir/NobaseClassDist.java
test ! -f $distdir/ClassNodist.java
test ! -f $distdir/NobaseClassNodist.java
: