From: "Michael Weber" <xmw@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] dev/xmw:master commit in: dev-java/grappa/
Date: Wed, 26 Aug 2015 12:16:24 +0000 (UTC) [thread overview]
Message-ID: <1440591382.79f31022d501fa483bbaa362e4736f9ffe37f229.xmw@gentoo> (raw)
commit: 79f31022d501fa483bbaa362e4736f9ffe37f229
Author: Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Wed Aug 26 12:16:22 2015 +0000
Commit: Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 12:16:22 2015 +0000
URL: https://gitweb.gentoo.org/dev/xmw.git/commit/?id=79f31022
dev-java/grappa: cleanup ebuild
Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 62EEF090
dev-java/grappa/grappa-1.2.ebuild | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/dev-java/grappa/grappa-1.2.ebuild b/dev-java/grappa/grappa-1.2.ebuild
index 750d731..928775c 100644
--- a/dev-java/grappa/grappa-1.2.ebuild
+++ b/dev-java/grappa/grappa-1.2.ebuild
@@ -24,30 +24,26 @@ S=${WORKDIR}/src/jdk1.2/att/grappa
src_prepare() {
cd "${WORKDIR}" || die
-
- #unbundle old and system files
rm -rf archives src/jdk1.0 src/jdk1.1 src/jdk1.2/java_cup || die
-
epatch "${FILESDIR}"/${P}-Parser.cup.patch
-
java-pkg_ensure-no-bundled-jars
}
src_compile() {
java-pkg_jar-from --build-only javacup javacup.jar
java-pkg_jar-from --build-only javacup javacup-runtime.jar
+
#JDK=jdk1.2 ./mkParser || die
einfo "genrating Parser.java and Symbols.java from Parser.cup"
"${JAVA_HOME}"/bin/java -jar javacup.jar -package att.grappa \
- -parser Parser -symbols Symbols -nonterms \
- < Parser.cup || die
- sed -e "/^public/i\\
-$(sed -n '/^.[*]/s/$/\\/p' Parser.cup)
-" -i Parser.java || die
+ -parser Parser -symbols Symbols -nonterms < Parser.cup || die
+ sed -e "/^public/i$(sed -n '/^.[*]/s/$/\\/p' Parser.cup)" \
+ -i Parser.java || die
#JDK=jdk1.2 ./mk || die
einfo "${JAVAC} *.java"
- "${JAVAC}" -source 5 -target 5 -classpath javacup.jar:javacup-runtime.jar -g -nowarn *.java || die
+ "${JAVAC}" -source 5 -target 5 -classpath javacup.jar:javacup-runtime.jar \
+ -g -nowarn *.java || die
}
src_install() {
next reply other threads:[~2015-08-26 12:16 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-26 12:16 Michael Weber [this message]
-- strict thread matches above, loose matches on Subject: below --
2015-08-26 15:17 [gentoo-commits] dev/xmw:master commit in: dev-java/grappa/ Michael Weber
2015-08-26 12:07 Michael Weber
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=1440591382.79f31022d501fa483bbaa362e4736f9ffe37f229.xmw@gentoo \
--to=xmw@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.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: link
Be 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