From: Tim Orling <timothy.t.orling@linux.intel.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-java][master][pyro][PATCH 2/4] jaxen: unblacklist and update to v1.1.6
Date: Sun, 21 May 2017 16:25:53 -0700 [thread overview]
Message-ID: <20170521232555.30221-3-timothy.t.orling@linux.intel.com> (raw)
In-Reply-To: <20170521232555.30221-1-timothy.t.orling@linux.intel.com>
- Add SUMMARY and expand DESCRIPTION
- Upstream moved to github, use git not ephemeral archive tarball
- Fix path for 'find org ...'
- Move SRC_URI checksums to recommended location in recipe
- Add virtual/javac-native to DEPENDS for RSS
Signed-off-by: Tim Orling <timothy.t.orling@linux.intel.com>
---
recipes-core/xml-commons/jaxen_1.1.1.bb | 35 -----------------------------
recipes-core/xml-commons/jaxen_1.1.6.bb | 40 +++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 35 deletions(-)
delete mode 100644 recipes-core/xml-commons/jaxen_1.1.1.bb
create mode 100644 recipes-core/xml-commons/jaxen_1.1.6.bb
diff --git a/recipes-core/xml-commons/jaxen_1.1.1.bb b/recipes-core/xml-commons/jaxen_1.1.1.bb
deleted file mode 100644
index 4853683..0000000
--- a/recipes-core/xml-commons/jaxen_1.1.1.bb
+++ /dev/null
@@ -1,35 +0,0 @@
-DESCRIPTION = "XPath library written in Java"
-LICENSE = "BSD"
-
-HOMEPAGE = "http://jaxen.codehaus.org/"
-
-DEPENDS = "fastjar-native xerces-j xom"
-
-SRC_URI = "\
- http://dist.codehaus.org/jaxen/distributions/jaxen-${PV}-src.tar.gz;name=archive \
- http://www.jdom.org/dist/binary/archive/jdom-1.1.tar.gz;name=jdom \
- "
-
-PNBLACKLIST[jaxen] ?= "BROKEN: depends on broken 'xom'"
-
-inherit java-library
-
-do_compile() {
- mkdir -p build
-
- oe_makeclasspath cp -s xercesImpl xom
- scp="src/java/main:${WORKDIR}/jdom-1.1/src/java"
-
- javac -sourcepath $scp -cp $cp -d build `find src/java/main -name "*.java" -and -not -wholename "*dom4j*"`
- (cd src && find org -name "*.properties" -exec cp {} ../build/{} \;)
-
- rm -rf build/org/jdom
-
- fastjar -C build -c -f ${JARFILENAME} .
-}
-
-
-SRC_URI[archive.md5sum] = "b598ae6b7e765a92e13667b0a80392f4"
-SRC_URI[archive.sha256sum] = "f24ae604a20da87e3716bb1d441c483e56479eaef4e99888f41be06059790bca"
-SRC_URI[jdom.md5sum] = "22745cbaaddb12884ed8ee09083d8fe2"
-SRC_URI[jdom.sha256sum] = "a13549087141be24ad176b659afdc2c675f1ffa5288ff999a193d6d44a282056"
diff --git a/recipes-core/xml-commons/jaxen_1.1.6.bb b/recipes-core/xml-commons/jaxen_1.1.6.bb
new file mode 100644
index 0000000..2e313fa
--- /dev/null
+++ b/recipes-core/xml-commons/jaxen_1.1.6.bb
@@ -0,0 +1,40 @@
+SUMMARY = "XPath library written in Java"
+DESCRIPTION = "Adaptable to many different object models, including \
+DOM, XOM, dom4j, and JDOM. Is it also possible to write adapters that \
+treat non-XML trees such as compiled Java byte code or Java beans as XML, \
+thus enabling you to query these trees with XPath too.\
+"
+LICENSE = "BSD"
+LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a2e66c2e2482aa23c11342f1469fa3b6"
+
+HOMEPAGE = "http://jaxen.org/"
+
+DEPENDS = "fastjar-native xerces-j xom"
+
+# upstream has moved to github, do not rely on ephemeral tarball, use git
+SRCREV = "7d7755ac8b19daa2ff6f319f432b864cc72d89b6"
+
+SRC_URI = "\
+ git://github.com/codehaus/${BPN} \
+ http://www.jdom.org/dist/binary/archive/jdom-1.1.tar.gz;name=jdom \
+"
+SRC_URI[jdom.md5sum] = "22745cbaaddb12884ed8ee09083d8fe2"
+SRC_URI[jdom.sha256sum] = "a13549087141be24ad176b659afdc2c675f1ffa5288ff999a193d6d44a282056"
+
+S = "${WORKDIR}/git/jaxen"
+
+inherit java-library
+
+do_compile() {
+ mkdir -p build
+
+ oe_makeclasspath cp -s xercesImpl xom
+ scp="src/java/main:${WORKDIR}/jdom-1.1/src/java"
+
+ javac -sourcepath $scp -cp $cp -d build `find src/java/main -name "*.java" -and -not -wholename "*dom4j*"`
+ (cd src/java/main && find org -name "*.properties" -exec cp {} ../../../build/{} \;)
+
+ rm -rf build/org/jdom
+
+ fastjar -C build -c -f ${JARFILENAME} .
+}
--
2.9.4
next prev parent reply other threads:[~2017-05-21 23:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-21 23:25 [meta-java][master][pyro][PATCH 0/4] xml-commons: unblacklist Tim Orling
2017-05-21 23:25 ` [meta-java][master][pyro][PATCH 1/4] xom: unblacklist and update to v1.2.10 Tim Orling
2017-05-21 23:25 ` Tim Orling [this message]
2017-05-21 23:25 ` [meta-java][master][pyro][PATCH 3/4] dom4j: unblacklist and fix build Tim Orling
2017-05-21 23:25 ` [meta-java][master][pyro][PATCH 4/4] jdom: unblacklist and update to v1.1.3 Tim Orling
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=20170521232555.30221-3-timothy.t.orling@linux.intel.com \
--to=timothy.t.orling@linux.intel.com \
--cc=openembedded-devel@lists.openembedded.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.