diff options
author | Benda Xu <heroxbd@gentoo.org> | 2016-10-06 14:35:16 +0900 |
---|---|---|
committer | Benda Xu <heroxbd@gentoo.org> | 2016-10-06 14:35:16 +0900 |
commit | 5c141afa3b1f12e06d3851bf87fbe435506d82bd (patch) | |
tree | 0aa634ad6e1f06f7391d4677e9841ed5fc3796fd | |
parent | meta.sh also use configuration file, create movl wrapper script. (diff) | |
download | java-ebuilder-5c141afa3b1f12e06d3851bf87fbe435506d82bd.tar.gz java-ebuilder-5c141afa3b1f12e06d3851bf87fbe435506d82bd.tar.bz2 java-ebuilder-5c141afa3b1f12e06d3851bf87fbe435506d82bd.zip |
movl: add digest. tree.sh: generate cache before ebuild generation.
-rwxr-xr-x | scripts/movl | 2 | ||||
-rwxr-xr-x | scripts/tree.sh | 18 |
2 files changed, 11 insertions, 9 deletions
diff --git a/scripts/movl b/scripts/movl index c2f7c0d..10ecfcc 100755 --- a/scripts/movl +++ b/scripts/movl @@ -49,6 +49,8 @@ build() { for M in ${MAVEN_ARTS}; do /usr/lib/java-ebuilder/tree.sh ${M} done + + ls -1 "${MAVEN_OVERLAY_DIR}"/app-maven/*/*.ebuild | parallel ebuild {} digest } if [[ $# -gt 0 ]]; then diff --git a/scripts/tree.sh b/scripts/tree.sh index 3e7b828..bf387a8 100755 --- a/scripts/tree.sh +++ b/scripts/tree.sh @@ -70,9 +70,17 @@ gebd() { local P=${PA}-${PV} local ebd="${MAVEN_OVERLAY_DIR}"/app-maven/${PA}/${P}.ebuild + line=app-maven:${PA}:${PV}:${SLOT:-0}::${MID} + if ! grep -q ${line} "${CACHEDIR}"/maven-cache 2>/dev/null ; then + pushd "${CACHEDIR}" > /dev/null + echo ${line} >> maven-cache + cat cache.{0,1} maven-cache > cache + popd > /dev/null + fi + if [[ ! -f "${ebd}" ]]; then mkdir -p $(dirname ${ebd}) - java-ebuilder -p "${POMDIR}"/${M}.pom -e "${ebd}" -g --workdir . \ + java-ebuilder -p "${POMDIR}"/${M}.pom -e "${ebd}" -g --workdir . \ -u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64 \ --cache-file "${CACHEDIR}"/cache @@ -83,14 +91,6 @@ gebd() { -i "${ebd}" fi - line=app-maven:${PA}:${PV}:${SLOT:-0}::${MID} - if ! grep -q ${line} "${CACHEDIR}"/maven-cache ; then - pushd "${CACHEDIR}" > /dev/null - echo ${line} >> maven-cache - cat cache.{0,1} maven-cache > cache - popd > /dev/null - fi - if [[ -z "${MAVEN_NODEP}" ]] && mfill "${ebd}"; then java-ebuilder -p "${POMDIR}"/${M}.pom -e "${ebd}" -g --workdir . \ -u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64 \ |