public inbox for frysk-cvs@sourceware.org help / color / mirror / Atom feed
From: cagney@sourceware.org To: frysk-cvs@sourceware.org Subject: [SCM] master: Add --enable-jar-compile config option; work-in-progress. Date: Mon, 26 Nov 2007 16:25:00 -0000 [thread overview] Message-ID: <20071126162502.2471.qmail@sourceware.org> (raw) The branch, master has been updated via df8582eb828ed33a9263be3cdd69cbbd767af4ff (commit) from f68aa034c04d450d803e963eac9bb7bc4c70a019 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email. - Log ----------------------------------------------------------------- commit df8582eb828ed33a9263be3cdd69cbbd767af4ff Author: Andrew Cagney <cagney@redhat.com> Date: Mon Nov 26 11:26:43 2007 -0500 Add --enable-jar-compile config option; work-in-progress. frysk-common/ChangeLog 2007-11-26 Andrew Cagney <cagney@redhat.com> * Makefile.gen.sh (sources): When JAR_COMPILE, add .jar, instead of .java files, to ${sources}. * frysk-common.ac (--enable-jar-compile): New option. (JAR_COMPILE): New AM_CONDITIONAL variable. ----------------------------------------------------------------------- Summary of changes: frysk-common/ChangeLog | 5 +++++ frysk-common/Makefile.gen.sh | 14 ++++++++++++++ frysk-common/frysk-common.ac | 11 ++++++++++- 3 files changed, 29 insertions(+), 1 deletions(-) First 500 lines of diff: diff --git a/frysk-common/ChangeLog b/frysk-common/ChangeLog index 5e68b5c..4753032 100644 --- a/frysk-common/ChangeLog +++ b/frysk-common/ChangeLog @@ -1,5 +1,10 @@ 2007-11-26 Andrew Cagney <cagney@redhat.com> + * Makefile.gen.sh (sources): When JAR_COMPILE, add .jar, instead + of .java files, to ${sources}. + * frysk-common.ac (--enable-jar-compile): New option. + (JAR_COMPILE): New AM_CONDITIONAL variable. + * Makefile.rules (JAVAROOT): Rename GEN_CLASSDIR. * Makefile.gen.sh (--jni): New option. diff --git a/frysk-common/Makefile.gen.sh b/frysk-common/Makefile.gen.sh index 6d30fcb..5a70d3e 100755 --- a/frysk-common/Makefile.gen.sh +++ b/frysk-common/Makefile.gen.sh @@ -408,7 +408,11 @@ cat <<EOF # the relevant files. noinst_LIBRARIES += lib${GEN_DIRNAME}.a +if JAR_COMPILE +${sources} = ${GEN_DIRNAME}.jar +else ${sources} = +endif GEN_GCJ_LDADD_LIST += lib${GEN_DIRNAME}.a # Compile the .a into a .so; Makefile.rules contains the rule and does @@ -443,7 +447,9 @@ EOF cat <<EOF TestRunner_SOURCES = TestRunner.java CLEANFILES += TestRunner.java +if !JAR_COMPILE ${sources} += ${GEN_SOURCENAME}/JUnitTests.java +endif BUILT_SOURCES += ${GEN_SOURCENAME}/JUnitTests.java SCRIPT_BUILT += ${GEN_SOURCENAME}/JUnitTests.java TestRunner_LDADD = \${LIBJUNIT} \${GEN_GCJ_LDADD_LIST} @@ -473,7 +479,9 @@ for suffix in .java .java-sh .mkenum .shenum .java-in ; do test "${b}" = JUnitTests && continue # hack test -r "${d}/${b}.g" && continue test -r "${d}/${b}.sed" && continue + echo "if !JAR_COMPILE" echo "${sources} += ${file}" + echo "endif" ;; esac echo "${GEN_DIRNAME}.jar: ${name}.java" @@ -501,7 +509,9 @@ for suffix in .java-in .java-sh .mkenum .shenum ; do d=`dirname ${file}` b=`basename ${file} ${suffix}` name="${d}/${b}${s}" + echo "if !JAR_COMPILE" echo "${sources} += ${file}" + echo "endif" echo "BUILT_SOURCES += ${name}" echo "SCRIPT_BUILT += ${name}" case "${suffix}" in @@ -531,7 +541,9 @@ for suffix in .cxx .c .hxx .s .S .c-sh .c-in .cxx-sh .cxx-in; do # Generate the rules for arch32 test echo_arch32_PROGRAMS ${name} ${name}${s} else + echo "if !JAR_COMPILE" echo "${sources} += ${file}" + echo "endif" fi case "${suffix}" in *-in | *-sh) @@ -691,7 +703,9 @@ BEGIN { FS = "=" } echo "$d/$c: $d/$b.antlred" echo "BUILT_SOURCES += $d/$c" echo "ANTLR_BUILT += $d/$c" + echo "if !JAR_COMPILE" echo "${sources} += $d/$c" + echo "endif" done done diff --git a/frysk-common/frysk-common.ac b/frysk-common/frysk-common.ac index d430f08..3897b0b 100644 --- a/frysk-common/frysk-common.ac +++ b/frysk-common/frysk-common.ac @@ -1,7 +1,7 @@ # This file is part of the program FRYSK. # -# Copyright 2007 Oracle Corporation. # Copyright 2005, 2006, 2007, Red Hat Inc. +# Copyright 2007 Oracle Corporation. # # FRYSK is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -266,3 +266,12 @@ AC_ARG_WITH(libopcodes, [AC_DEFINE(WITH_LIBOPCODES) LIBS="$LIBS -lopcodes"] []) + +AC_ARG_ENABLE([jar-compile], + [ --enable-jar-compile Enable compilation of jars], + [case "${enableval}" in + yes) jar_compile=true ;; + no) jar_compile=false;; + *) AC_MSG_ERROR([bad value ${enableval} for --enable-jar-compile]) ;; + esac],[jar_compile=false]) +AM_CONDITIONAL([JAR_COMPILE], [test x$jar_compile = xtrue]) hooks/post-receive -- frysk system monitor/debugger
reply other threads:[~2007-11-26 16:25 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20071126162502.2471.qmail@sourceware.org \ --to=cagney@sourceware.org \ --cc=frysk-cvs@sourceware.org \ --cc=frysk@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).