* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-pkg-simple.eclass
@ 2015-03-19 9:57 James Le Cuirot (chewi)
0 siblings, 0 replies; 2+ messages in thread
From: James Le Cuirot (chewi) @ 2015-03-19 9:57 UTC (permalink / raw
To: gentoo-commits
chewi 15/03/19 09:57:43
Modified: ChangeLog java-pkg-simple.eclass
Log:
Allow jar to be named something other than ${PN}.jar.
Revision Changes Path
1.1568 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1568&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1568&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1567&r2=1.1568
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1567
retrieving revision 1.1568
diff -u -r1.1567 -r1.1568
--- ChangeLog 18 Mar 2015 13:04:35 -0000 1.1567
+++ ChangeLog 19 Mar 2015 09:57:43 -0000 1.1568
@@ -1,6 +1,9 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1567 2015/03/18 13:04:35 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1568 2015/03/19 09:57:43 chewi Exp $
+
+ 19 Mar 2015; <chewi@gentoo.org> java-pkg-simple.eclass:
+ Allow jar to be named something other than ${PN}.jar.
18 Mar 2015; Michael Palimaka <kensington@gentoo.org> kde5-functions.eclass,
kde5.eclass:
1.4 eclass/java-pkg-simple.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-simple.eclass?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-simple.eclass?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-simple.eclass?r1=1.3&r2=1.4
Index: java-pkg-simple.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-pkg-simple.eclass,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- java-pkg-simple.eclass 27 Dec 2011 17:55:12 -0000 1.3
+++ java-pkg-simple.eclass 19 Mar 2015 09:57:43 -0000 1.4
@@ -1,10 +1,10 @@
# Eclass for simple bare-source Java packages
#
-# Copyright (c) 2004-2011, Gentoo Foundation
+# Copyright (c) 2004-2015, Gentoo Foundation
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-simple.eclass,v 1.3 2011/12/27 17:55:12 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-simple.eclass,v 1.4 2015/03/19 09:57:43 chewi Exp $
inherit java-utils-2
@@ -86,13 +86,21 @@
# -----------------------------------------------------------------------------
# JAVADOC_ARGS
+# -----------------------------------------------------------------------------
+# @variable-external JAVA_JAR_FILENAME
+# @variable-default ${PN}.jar
+#
+# The name of the jar file to create and install
+# -----------------------------------------------------------------------------
+: ${JAVA_JAR_FILENAME:=${PN}.jar}
+
# ------------------------------------------------------------------------------
# @eclass-src_compile
#
# src_compile for simple bare source java packages. Finds all *.java
# sources in ${JAVA_SRC_DIR}, compiles them with the classpath
# calculated from ${JAVA_GENTOO_CLASSPATH}, and packages the resulting
-# classes to ${PN}.jar.
+# classes to ${JAVA_JAR_FILENAME}.
#
# variables:
# JAVA_GENTOO_CLASSPATH - list java packages to put on the classpath.
@@ -138,9 +146,9 @@
fi
# package
- local jar_args="cf ${PN}.jar"
+ local jar_args="cf ${JAVA_JAR_FILENAME}"
if [[ -e ${classes}/META-INF/MANIFEST.MF ]]; then
- jar_args="cfm ${PN}.jar ${classes}/META-INF/MANIFEST.MF"
+ jar_args="cfm ${JAVA_JAR_FILENAME} ${classes}/META-INF/MANIFEST.MF"
fi
java-pkg-simple_verbose-cmd \
jar ${jar_args} -C ${classes} . || die "jar failed"
@@ -150,16 +158,16 @@
# @eclass-src_install
#
# src_install for simple single jar java packages. Simply packages the
-# contents from the target directory and installs it as ${PN}.jar. If
-# the file target/META-INF/MANIFEST.MF exists, it is used as the
-# manifest of the created jar.
+# contents from the target directory and installs it as
+# ${JAVA_JAR_FILENAME}. If the file target/META-INF/MANIFEST.MF exists,
+# it is used as the manifest of the created jar.
# ------------------------------------------------------------------------------
java-pkg-simple_src_install() {
local sources=sources.lst classes=target/classes apidoc=target/api
# main jar
java-pkg-simple_verbose-cmd \
- java-pkg_dojar ${PN}.jar
+ java-pkg_dojar ${JAVA_JAR_FILENAME}
# javadoc
if has doc ${JAVA_PKG_IUSE} && use doc; then
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-pkg-simple.eclass
@ 2015-05-24 20:40 James Le Cuirot (chewi)
0 siblings, 0 replies; 2+ messages in thread
From: James Le Cuirot (chewi) @ 2015-05-24 20:40 UTC (permalink / raw
To: gentoo-commits
chewi 15/05/24 20:40:40
Modified: ChangeLog java-pkg-simple.eclass
Log:
Remove annoying java-pkg-simple build script check. Most people only
use java-pkg-simple as a last resort and a usable Maven eclass is
still some way off.
Revision Changes Path
1.1620 eclass/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1620&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?rev=1.1620&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/ChangeLog?r1=1.1619&r2=1.1620
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v
retrieving revision 1.1619
retrieving revision 1.1620
diff -u -r1.1619 -r1.1620
--- ChangeLog 24 May 2015 08:43:02 -0000 1.1619
+++ ChangeLog 24 May 2015 20:40:40 -0000 1.1620
@@ -1,6 +1,11 @@
# ChangeLog for eclass directory
# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1619 2015/05/24 08:43:02 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.1620 2015/05/24 20:40:40 chewi Exp $
+
+ 24 May 2015; James Le Cuirot <chewi@gentoo.org> java-pkg-simple.eclass:
+ Remove annoying java-pkg-simple build script check. Most people only use
+ java-pkg-simple as a last resort and a usable Maven eclass is still some way
+ off.
24 May 2015; Michał Górny <mgorny@gentoo.org> freebsd.eclass:
Support fetching upstream patches,
1.6 eclass/java-pkg-simple.eclass
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-simple.eclass?rev=1.6&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-simple.eclass?rev=1.6&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/java-pkg-simple.eclass?r1=1.5&r2=1.6
Index: java-pkg-simple.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/java-pkg-simple.eclass,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- java-pkg-simple.eclass 4 Apr 2015 21:04:49 -0000 1.5
+++ java-pkg-simple.eclass 24 May 2015 20:40:40 -0000 1.6
@@ -4,7 +4,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-simple.eclass,v 1.5 2015/04/04 21:04:49 chewi Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-pkg-simple.eclass,v 1.6 2015/05/24 20:40:40 chewi Exp $
inherit java-utils-2
@@ -112,10 +112,6 @@
java-pkg-simple_src_compile() {
local sources=sources.lst classes=target/classes apidoc=target/api
- # QA checks
- [[ "$(find . -name build.xml -o -name pom.xml)" ]] &&
- java-pkg_announce-qa-violation "Package ships with a build file, use that instead of java-pkg-simple!"
-
# gather sources
find ${JAVA_SRC_DIR:-*} -name \*.java > ${sources}
mkdir -p ${classes} || die "Could not create target directory"
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-05-24 20:40 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-05-24 20:40 [gentoo-commits] gentoo-x86 commit in eclass: ChangeLog java-pkg-simple.eclass James Le Cuirot (chewi)
-- strict thread matches above, loose matches on Subject: below --
2015-03-19 9:57 James Le Cuirot (chewi)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox