| 1 |
commit: 5c141afa3b1f12e06d3851bf87fbe435506d82bd |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Oct 6 05:35:16 2016 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Oct 6 05:35:16 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=5c141afa |
| 7 |
|
| 8 |
movl: add digest. tree.sh: generate cache before ebuild generation. |
| 9 |
|
| 10 |
scripts/movl | 2 ++ |
| 11 |
scripts/tree.sh | 18 +++++++++--------- |
| 12 |
2 files changed, 11 insertions(+), 9 deletions(-) |
| 13 |
|
| 14 |
diff --git a/scripts/movl b/scripts/movl |
| 15 |
index c2f7c0d..10ecfcc 100755 |
| 16 |
--- a/scripts/movl |
| 17 |
+++ b/scripts/movl |
| 18 |
@@ -49,6 +49,8 @@ build() { |
| 19 |
for M in ${MAVEN_ARTS}; do |
| 20 |
/usr/lib/java-ebuilder/tree.sh ${M} |
| 21 |
done |
| 22 |
+ |
| 23 |
+ ls -1 "${MAVEN_OVERLAY_DIR}"/app-maven/*/*.ebuild | parallel ebuild {} digest |
| 24 |
} |
| 25 |
|
| 26 |
if [[ $# -gt 0 ]]; then |
| 27 |
|
| 28 |
diff --git a/scripts/tree.sh b/scripts/tree.sh |
| 29 |
index 3e7b828..bf387a8 100755 |
| 30 |
--- a/scripts/tree.sh |
| 31 |
+++ b/scripts/tree.sh |
| 32 |
@@ -70,9 +70,17 @@ gebd() { |
| 33 |
local P=${PA}-${PV} |
| 34 |
local ebd="${MAVEN_OVERLAY_DIR}"/app-maven/${PA}/${P}.ebuild |
| 35 |
|
| 36 |
+ line=app-maven:${PA}:${PV}:${SLOT:-0}::${MID} |
| 37 |
+ if ! grep -q ${line} "${CACHEDIR}"/maven-cache 2>/dev/null ; then |
| 38 |
+ pushd "${CACHEDIR}" > /dev/null |
| 39 |
+ echo ${line} >> maven-cache |
| 40 |
+ cat cache.{0,1} maven-cache > cache |
| 41 |
+ popd > /dev/null |
| 42 |
+ fi |
| 43 |
+ |
| 44 |
if [[ ! -f "${ebd}" ]]; then |
| 45 |
mkdir -p $(dirname ${ebd}) |
| 46 |
- java-ebuilder -p "${POMDIR}"/${M}.pom -e "${ebd}" -g --workdir . \ |
| 47 |
+ java-ebuilder -p "${POMDIR}"/${M}.pom -e "${ebd}" -g --workdir . \ |
| 48 |
-u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64 \ |
| 49 |
--cache-file "${CACHEDIR}"/cache |
| 50 |
|
| 51 |
@@ -83,14 +91,6 @@ gebd() { |
| 52 |
-i "${ebd}" |
| 53 |
fi |
| 54 |
|
| 55 |
- line=app-maven:${PA}:${PV}:${SLOT:-0}::${MID} |
| 56 |
- if ! grep -q ${line} "${CACHEDIR}"/maven-cache ; then |
| 57 |
- pushd "${CACHEDIR}" > /dev/null |
| 58 |
- echo ${line} >> maven-cache |
| 59 |
- cat cache.{0,1} maven-cache > cache |
| 60 |
- popd > /dev/null |
| 61 |
- fi |
| 62 |
- |
| 63 |
if [[ -z "${MAVEN_NODEP}" ]] && mfill "${ebd}"; then |
| 64 |
java-ebuilder -p "${POMDIR}"/${M}.pom -e "${ebd}" -g --workdir . \ |
| 65 |
-u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64 \ |
Archives