[gentoo-commits] dev/xmw:master commit in: dev-java/grappa/

[gentoo-commits] dev/xmw:master commit in: dev-java/grappa/

[Michael Weber]

commit:     adf77712edd2fe827b5f22a7e6f7ec5aa0c9115b
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Wed Aug 26 12:06:40 2015 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 12:06:40 2015 +0000
URL:        https://gitweb.gentoo.org/dev/xmw.git/commit/?id=adf77712

dev-java/grappa: fix java

Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 0x927ADD0C62EEF090

 dev-java/grappa/grappa-1.2.ebuild | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/dev-java/grappa/grappa-1.2.ebuild b/dev-java/grappa/grappa-1.2.ebuild
index 7e49518..750d731 100644
--- a/dev-java/grappa/grappa-1.2.ebuild
+++ b/dev-java/grappa/grappa-1.2.ebuild
@@ -18,7 +18,7 @@ IUSE=""
 RDEPEND=""
 DEPEND="${RDEPEND}
 	dev-java/javacup:0
-	virtual/jdk:1.7"
+	>=virtual/jdk-0"
 
 S=${WORKDIR}/src/jdk1.2/att/grappa
 
@@ -38,7 +38,7 @@ src_compile() {
 	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 -jar javacup.jar -package att.grappa \
+	"${JAVA_HOME}"/bin/java -jar javacup.jar -package att.grappa \
 		-parser Parser -symbols Symbols -nonterms \
 		< Parser.cup || die
 	sed -e "/^public/i\\
@@ -46,8 +46,8 @@ $(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
+	einfo "${JAVAC} *.java"
+	"${JAVAC}" -source 5 -target 5 -classpath javacup.jar:javacup-runtime.jar -g -nowarn *.java || die
 }
 
 src_install() {

[gentoo-commits] dev/xmw:master commit in: dev-java/grappa/

[Michael Weber]

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() {

[gentoo-commits] dev/xmw:master commit in: dev-java/grappa/

[Michael Weber]

commit:     5538c5d3a3507270ad0229e7800b7a002c4efadc
Author:     Michael Weber <michael <AT> xmw <DOT> de>
AuthorDate: Wed Aug 26 15:12:00 2015 +0000
Commit:     Michael Weber <xmw <AT> gentoo <DOT> org>
CommitDate: Wed Aug 26 15:12:00 2015 +0000
URL:        https://gitweb.gentoo.org/dev/xmw.git/commit/?id=5538c5d3

dev-java/grappa: generate jar file

Package-Manager: portage-2.2.20.1
Manifest-Sign-Key: 0x927ADD0C62EEF090

 dev-java/grappa/grappa-1.2.ebuild | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/dev-java/grappa/grappa-1.2.ebuild b/dev-java/grappa/grappa-1.2.ebuild
index 928775c..6cc7b5d 100644
--- a/dev-java/grappa/grappa-1.2.ebuild
+++ b/dev-java/grappa/grappa-1.2.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="http://www2.research.att.com/~john/Grappa/"
 SRC_URI="http://www2.research.att.com/~john/${PN/g/G}/${PN}.tgz -> ${P}.tar.gz"
 
 LICENSE="CPL-1.0"
-SLOT="0"
+SLOT="${PV}"
 KEYWORDS="~amd64"
 IUSE=""
 
@@ -20,21 +20,21 @@ DEPEND="${RDEPEND}
 	dev-java/javacup:0
 	>=virtual/jdk-0"
 
-S=${WORKDIR}/src/jdk1.2/att/grappa
+S=${WORKDIR}
 
 src_prepare() {
-	cd "${WORKDIR}" || die
 	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() {
+	cd src/jdk1.2/att/grappa
 	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"
+	einfo "generating 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)" \
@@ -44,9 +44,12 @@ src_compile() {
 	einfo "${JAVAC} *.java"
 	"${JAVAC}" -source 5 -target 5 -classpath javacup.jar:javacup-runtime.jar \
 		-g -nowarn *.java || die
+
+	einfo "generate grappa.jar"
+	rm javacup.jar javacup-runtime.jar
+	"${JAVA_HOME}"/bin/jar cf ../../../../${PN}.jar -C ../.. att
 }
 
 src_install() {
-	insinto /usr/share/${PN}/att/grappa
-	doins *.class
+	java-pkg_dojar ${PN}.jar
 }