* [gentoo-commits] proj/java-ebuilder:master commit in: scripts/
@ 2019-10-30 17:35 Michał Górny
0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2019-10-30 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 0e037f385db26b5ce17ee796ecf2e8a7af0d18b3
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 6 03:29:26 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct 6 03:29:26 2016 +0000
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=0e037f38
tree.sh: use dirs from conf file.
scripts/tree.sh | 36 ++++++++++++++++++++----------------
1 file changed, 20 insertions(+), 16 deletions(-)
diff --git a/scripts/tree.sh b/scripts/tree.sh
index acabb0a..3e7b828 100755
--- a/scripts/tree.sh
+++ b/scripts/tree.sh
@@ -2,7 +2,9 @@
# start from the root of a maven artifact and recursively resolve its
# dependencies.
-mkdir -p ../poms
+source /etc/java-ebuilder.conf
+
+mkdir -p "${POMDIR}"
gebd() {
case ${MA} in
@@ -45,8 +47,8 @@ gebd() {
local M=${MA}-${MV}
local SRC_URI="http://central.maven.org/maven2/${WORKDIR}/${MV}/${M}-sources.jar"
- if [[ ! -f ../poms/${M}.pom ]]; then
- pushd ../poms
+ if [[ ! -f "${POMDIR}"/${M}.pom ]]; then
+ pushd "${POMDIR}"
wget ${SRC_URI/-sources.jar/.pom}
# 3rd party plugin not needed here
@@ -66,40 +68,42 @@ gebd() {
PA=${PA}-bin
fi
local P=${PA}-${PV}
- local ebd=app-maven/${PA}/${P}.ebuild
+ local ebd="${MAVEN_OVERLAY_DIR}"/app-maven/${PA}/${P}.ebuild
- if [[ ! -f app-maven/${PA}/${P}.ebuild ]]; then
- mkdir -p app-maven/${PA}
- java-ebuilder -p ../poms/${M}.pom -e ${ebd} -g --workdir . \
- -u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64
+ if [[ ! -f "${ebd}" ]]; then
+ mkdir -p $(dirname ${ebd})
+ java-ebuilder -p "${POMDIR}"/${M}.pom -e "${ebd}" -g --workdir . \
+ -u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64 \
+ --cache-file "${CACHEDIR}"/cache
# empty parent artifacts
# FIXME, this should be removed in poms
sed -e '/app-maven\/jsch-agentproxy-bin/d' \
-e '/JAVA_GENTOO_CLASSPATH/s|jsch-agentproxy-bin,||' \
- -i ${ebd}
+ -i "${ebd}"
fi
line=app-maven:${PA}:${PV}:${SLOT:-0}::${MID}
- if ! grep -q ${line} ${HOME}/.java-ebuilder/maven-cache ; then
- pushd ${HOME}/.java-ebuilder > /dev/null
+ 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 ../poms/${M}.pom -e ${ebd} -g --workdir . \
- -u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64
+ 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 \
+ --cache-file "${CACHEDIR}"/cache
# empty parent artifacts
# FIXME, this should be removed in poms
sed -e '/app-maven\/jsch-agentproxy-bin-[0-9]/d' \
-e '/JAVA_GENTOO_CLASSPATH/s|jsch-agentproxy-bin,||' \
- -i ${ebd}
+ -i "${ebd}"
fi
- [[ ${SRC_URI} = *-sources.jar ]] || sed -i "/inherit/s/java-pkg-simple/java-pkg-binjar/" ${ebd}
+ [[ ${SRC_URI} = *-sources.jar ]] || sed -i "/inherit/s/java-pkg-simple/java-pkg-binjar/" "${ebd}"
}
mfill() {
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/java-ebuilder:master commit in: scripts/
@ 2019-10-30 17:35 Michał Górny
0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2019-10-30 17:35 UTC (permalink / raw
To: gentoo-commits
commit: df9639000ca69afc2be4f03a3bb41f5f1ea73f92
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 6 01:51:14 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct 6 01:51:14 2016 +0000
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=df963900
meta.sh: add more jmock, hamcrest, tec.
tree.sh: restructure to reuse code.
scripts/meta.sh | 15 ++++++++++++---
scripts/tree.sh | 37 ++++++++++++++++++++++++++-----------
2 files changed, 38 insertions(+), 14 deletions(-)
diff --git a/scripts/meta.sh b/scripts/meta.sh
index 0a142c8..4917098 100755
--- a/scripts/meta.sh
+++ b/scripts/meta.sh
@@ -14,8 +14,12 @@ case ${spkg} in
echo $1:com.google.guava:${spkg}:${sver%%-*}
exit 0
;;
- json)
- echo $1:org.json:${spkg}:${sver%%-*}
+ json|jmock)
+ echo $1:org.${spkg}:${spkg}:${sver%%-*}
+ exit 0
+ ;;
+ hamcrest-*)
+ echo $1:org.${spkg%%-*}:${spkg}:${sver%%-*}
exit 0
;;
xerces)
@@ -24,7 +28,12 @@ case ${spkg} in
echo $1:xerces:xmlParserAPIs:${sver%%-*}
exit 0
;;
- commons-*|classworlds|jdom)
+ commons-*|classworlds|jdom|xalan*)
+ echo $1:${spkg}:${spkg}:${sver%%-*}
+ exit 0
+ ;;
+ javax-inject)
+ spkg=${spkg/-/.}
echo $1:${spkg}:${spkg}:${sver%%-*}
exit 0
;;
diff --git a/scripts/tree.sh b/scripts/tree.sh
index 5482a0b..acabb0a 100755
--- a/scripts/tree.sh
+++ b/scripts/tree.sh
@@ -30,20 +30,20 @@ gebd() {
PV=${PV/-beta-/_beta}
# aopalliance-repackaged 2.5.0-b16
PV=${PV/-b/_beta}
+ # cdi-api 1.0-SP4
+ PV=${PV/-SP/_p}
# javax.xml.stream:stax-api:1.0-2
PV=${PV//-/.}
- local M=${MA}-${MV}
- local SRC_URI="http://central.maven.org/maven2/${WORKDIR}/${MV}/${M}-sources.jar"
-
# spark-launcher_2.11 for scala 2.11
eval $(sed -nr 's,([^_]*)(_(.*))?,PA=\1 SLOT=\3,p' <<< ${MA})
[[ -z "${SLOT}" ]] && eval $(sed -nr 's,(.*)-(([0-9]+\.)?[0-9]+),PA=\1 SLOT=\2,p' <<< ${MA})
[[ -z "${SLOT}" ]] && PA=${MA}
PA=${PA//./-}
PA=${PA//_/-}
- local P=${PA}-${PV}
- local ebd=app-maven/${PA}/${P}.ebuild
+
+ local M=${MA}-${MV}
+ local SRC_URI="http://central.maven.org/maven2/${WORKDIR}/${MV}/${M}-sources.jar"
if [[ ! -f ../poms/${M}.pom ]]; then
pushd ../poms
@@ -61,7 +61,12 @@ gebd() {
popd
fi
- wget -q --spider ${SRC_URI} || SRC_URI=${SRC_URI/-sources.jar/.jar}
+ if ! wget -q --spider ${SRC_URI}; then
+ SRC_URI=${SRC_URI/-sources.jar/.jar}
+ PA=${PA}-bin
+ fi
+ local P=${PA}-${PV}
+ local ebd=app-maven/${PA}/${P}.ebuild
if [[ ! -f app-maven/${PA}/${P}.ebuild ]]; then
mkdir -p app-maven/${PA}
@@ -70,7 +75,9 @@ gebd() {
# empty parent artifacts
# FIXME, this should be removed in poms
- sed -i '/app-maven\/jsch-agentproxy-[0-9]/d' ${ebd}
+ sed -e '/app-maven\/jsch-agentproxy-bin/d' \
+ -e '/JAVA_GENTOO_CLASSPATH/s|jsch-agentproxy-bin,||' \
+ -i ${ebd}
fi
line=app-maven:${PA}:${PV}:${SLOT:-0}::${MID}
@@ -81,9 +88,15 @@ gebd() {
popd > /dev/null
fi
- if [[ -z "${MAVEN_NODEP}" ]] && mfill app-maven/${PA}/${P}.ebuild; then
+ if [[ -z "${MAVEN_NODEP}" ]] && mfill ${ebd}; then
java-ebuilder -p ../poms/${M}.pom -e ${ebd} -g --workdir . \
-u ${SRC_URI} --slot ${SLOT:-0} --keywords ~amd64
+
+ # empty parent artifacts
+ # FIXME, this should be removed in poms
+ sed -e '/app-maven\/jsch-agentproxy-bin-[0-9]/d' \
+ -e '/JAVA_GENTOO_CLASSPATH/s|jsch-agentproxy-bin,||' \
+ -i ${ebd}
fi
[[ ${SRC_URI} = *-sources.jar ]] || sed -i "/inherit/s/java-pkg-simple/java-pkg-binjar/" ${ebd}
@@ -104,8 +117,10 @@ mfill() {
}
if [[ $1 == *.ebuild ]]; then
- mfill $1
+ eval $(grep MAVEN_ID $1)
+ rm -f $1
else
- eval $(awk -F":" '{print "PG="$1, "MA="$2, "MV="$3}' <<< $1)
- gebd
+ MAVEN_ID=$1
fi
+eval $(awk -F":" '{print "PG="$1, "MA="$2, "MV="$3}' <<< ${MAVEN_ID})
+gebd
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/java-ebuilder:master commit in: scripts/
@ 2019-10-30 17:35 Michał Górny
0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2019-10-30 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 0195ce4168ad8cc4560cdb1a5b64f022a2703c10
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 9 04:08:21 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 9 04:08:21 2017 +0000
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=0195ce41
tree.sh: more maven version compatibility tricks.
scripts/meta.sh | 5 +++++
scripts/tree.sh | 31 ++++++++++++++++++++++++++-----
2 files changed, 31 insertions(+), 5 deletions(-)
diff --git a/scripts/meta.sh b/scripts/meta.sh
index 42a45a2..82d3dc1 100755
--- a/scripts/meta.sh
+++ b/scripts/meta.sh
@@ -69,6 +69,11 @@ case ${spkg} in
echo $1:org.ow2.asm:${spkg}-all:${sver%%-*}
echo $1:org.ow2.asm:${spkg}-debug-all:${sver%%-*}
exit 0
+ ;;
+ cofoja)
+ echo $1:org.huoc:${spkg}:${sver%%-*}
+ exit 0
+ ;;
esac
touch bebd bpom
diff --git a/scripts/tree.sh b/scripts/tree.sh
index 8de9045..3b44481 100755
--- a/scripts/tree.sh
+++ b/scripts/tree.sh
@@ -16,8 +16,7 @@ gebd() {
local WORKDIR=${PG//./\/}/${MA} MID
local MID=${PG}:${MA}:${MV}
- # .Final .GA .v20121024 means nothing
- local PV=${MV%.[a-zA-Z]*} PA SLOT
+ local PV=${MV} PA SLOT
case ${MA} in
opengl-api)
@@ -25,17 +24,39 @@ gebd() {
;;
esac
+ # com.github.lindenb:jbwa:1.0.0_ppc64
+ PV=${PV/_/.}
# plexus-container-default 1.0-alpha-9-stable-1
- PV=${PV/-stable-*/}
- PV=${PV/-alpha-/_alpha}
+ PV=${PV/-stable-/.}
+ PV=$(sed -r 's/[.-]?alpha[-.]?/_alpha/' <<< ${PV})
# wagon-provider-api 1.0-beta-7
- PV=${PV/-beta-/_beta}
+ # com.google.cloud.datastore:datastore-v1beta3-proto-client:1.0.0-beta.2
+ # com.google.cloud.datastore:datastore-v1beta3-protos:1.0.0-beta
+ PV=$(sed -r 's/[.-]?beta[-.]?/_beta/' <<< ${PV})
# aopalliance-repackaged 2.5.0-b16
PV=${PV/-b/_beta}
+ # com.google.auto.service:auto-service:1.0-rc2
+ PV=${PV/-rc/_rc}
# cdi-api 1.0-SP4
PV=${PV/-SP/_p}
+ # org.seqdoop:cofoja:1.1-r150
+ PV=${PV/-rev/_p}
+ PV=${PV/-r/_p}
+ PV=${PV/.v/_p}
# javax.xml.stream:stax-api:1.0-2
PV=${PV//-/.}
+ # .Final .GA -incubating means nothing
+ PV=${PV%.[a-zA-Z]*}
+ # com.google.cloud.genomics:google-genomics-dataflow:v1beta2-0.15 -> 1.2.0.15
+ # plexus-container-default 1.0-alpha-9-stable-1 -> 1.0.9.1
+ PV=$(sed -r 's/_(rc|beta|alpha|p)(.*\..*)/.\2/' <<< ${PV})
+ # remove all non-numeric charactors before _
+ # org.scalamacros:quasiquotes_2.10:2.0.0-M8
+ if [[ ${PV} = *_* ]]; then
+ PV=$(sed 's/[^.0-9]//g' <<< ${PV/_*/})_${PV/*_/}
+ else
+ PV=$(sed 's/[^.0-9]//g' <<< ${PV})
+ fi
# spark-launcher_2.11 for scala 2.11
eval $(sed -nr 's,([^_]*)(_(.*))?,PA=\1 SLOT=\3,p' <<< ${MA})
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/java-ebuilder:master commit in: scripts/
@ 2019-10-30 17:35 Michał Górny
0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2019-10-30 17:35 UTC (permalink / raw
To: gentoo-commits
commit: a09d6abdc71554d3678a05fc1052fca5bb266730
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 8 01:22:02 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Sat Oct 8 01:22:02 2016 +0000
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=a09d6abd
tree.sh: silent pushd notice.
scripts/tree.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/tree.sh b/scripts/tree.sh
index 8fef39d..8de9045 100755
--- a/scripts/tree.sh
+++ b/scripts/tree.sh
@@ -48,7 +48,7 @@ gebd() {
local SRC_URI="http://central.maven.org/maven2/${WORKDIR}/${MV}/${M}-sources.jar"
if [[ ! -f "${POMDIR}"/${M}.pom ]]; then
- pushd "${POMDIR}"
+ pushd "${POMDIR}" > /dev/null
wget ${SRC_URI/-sources.jar/.pom}
# 3rd party plugin not needed here
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/java-ebuilder:master commit in: scripts/
@ 2019-10-30 17:35 Michał Górny
0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2019-10-30 17:35 UTC (permalink / raw
To: gentoo-commits
commit: be327f018fba69ae853729d309c62fe3adc9b94e
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 6 10:19:28 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct 6 10:19:28 2016 +0000
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=be327f01
change script shebangs to /bin/bash.
Because /usr/bin/env gets prefixified anyway.
scripts/meta.sh | 2 +-
scripts/movl | 2 +-
scripts/tree.sh | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/scripts/meta.sh b/scripts/meta.sh
index 935330f..42a45a2 100755
--- a/scripts/meta.sh
+++ b/scripts/meta.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
# read in cache from java-ebuilder and find out the groupId,
# artifactId and version.
diff --git a/scripts/movl b/scripts/movl
index a4d1bac..231ab5d 100755
--- a/scripts/movl
+++ b/scripts/movl
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
source /etc/java-ebuilder.conf
clean-maven() {
diff --git a/scripts/tree.sh b/scripts/tree.sh
index bf387a8..7df27dc 100755
--- a/scripts/tree.sh
+++ b/scripts/tree.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
# start from the root of a maven artifact and recursively resolve its
# dependencies.
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/java-ebuilder:master commit in: scripts/
@ 2019-10-30 17:35 Michał Górny
0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2019-10-30 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 5c141afa3b1f12e06d3851bf87fbe435506d82bd
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 6 05:35:16 2016 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Oct 6 05:35:16 2016 +0000
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=5c141afa
movl: add digest. tree.sh: generate cache before ebuild generation.
scripts/movl | 2 ++
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 \
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/java-ebuilder:master commit in: scripts/
@ 2019-10-30 17:35 Michał Górny
0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2019-10-30 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 147f237a57b7eea135c53f842d53c51a120d4d8c
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 9 11:21:27 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 9 12:43:29 2017 +0000
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=147f237a
tree.sh: remove both beta and p in _beta1_p1.2.0.
scripts/tree.sh | 48 +++++++++++++++++++++++++++---------------------
1 file changed, 27 insertions(+), 21 deletions(-)
diff --git a/scripts/tree.sh b/scripts/tree.sh
index 3b44481..c44c127 100755
--- a/scripts/tree.sh
+++ b/scripts/tree.sh
@@ -6,24 +6,8 @@ source /etc/java-ebuilder.conf
mkdir -p "${POMDIR}"
-gebd() {
- case ${MA} in
- weld-osgi-bundle)
- # 1.1.0.Final no longer exist
- [[ ${MV} = 1.1.0.Final ]] && MV=1.1.33.Final
- ;;
- esac
-
- local WORKDIR=${PG//./\/}/${MA} MID
- local MID=${PG}:${MA}:${MV}
- local PV=${MV} PA SLOT
-
- case ${MA} in
- opengl-api)
- [[ ${MV} = 2.1.1 ]] && MV=gl1.1-android-2.1_r1
- ;;
- esac
-
+sver() {
+ PV=$1
# com.github.lindenb:jbwa:1.0.0_ppc64
PV=${PV/_/.}
# plexus-container-default 1.0-alpha-9-stable-1
@@ -49,14 +33,36 @@ gebd() {
PV=${PV%.[a-zA-Z]*}
# com.google.cloud.genomics:google-genomics-dataflow:v1beta2-0.15 -> 1.2.0.15
# plexus-container-default 1.0-alpha-9-stable-1 -> 1.0.9.1
- PV=$(sed -r 's/_(rc|beta|alpha|p)(.*\..*)/.\2/' <<< ${PV})
+ while [[ ${PV} != ${PV0} ]]; do
+ PV0=${PV}
+ PV=$(sed -r 's/_(rc|beta|alpha|p)(.*\..*)/.\2/' <<< ${PV0})
+ done
# remove all non-numeric charactors before _
# org.scalamacros:quasiquotes_2.10:2.0.0-M8
if [[ ${PV} = *_* ]]; then
- PV=$(sed 's/[^.0-9]//g' <<< ${PV/_*/})_${PV/*_/}
+ echo $(sed 's/[^.0-9]//g' <<< ${PV/_*/})_${PV/*_/}
else
- PV=$(sed 's/[^.0-9]//g' <<< ${PV})
+ sed 's/[^.0-9]//g' <<< ${PV}
fi
+}
+
+gebd() {
+ case ${MA} in
+ weld-osgi-bundle)
+ # 1.1.0.Final no longer exist
+ [[ ${MV} = 1.1.0.Final ]] && MV=1.1.33.Final
+ ;;
+ esac
+
+ local WORKDIR=${PG//./\/}/${MA} MID
+ local MID=${PG}:${MA}:${MV}
+ local PV=$(sver ${MV}) PA SLOT
+
+ case ${MA} in
+ opengl-api)
+ [[ ${MV} = 2.1.1 ]] && MV=gl1.1-android-2.1_r1
+ ;;
+ esac
# spark-launcher_2.11 for scala 2.11
eval $(sed -nr 's,([^_]*)(_(.*))?,PA=\1 SLOT=\3,p' <<< ${MA})
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/java-ebuilder:master commit in: scripts/
@ 2019-10-30 17:35 Michał Górny
0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2019-10-30 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 61bb1d8c568187e0393bc32d78d5972f8245cae9
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 9 11:19:16 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 9 12:43:29 2017 +0000
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=61bb1d8c
movl: refresh ebuilds and only digest 1 ebuild.
scripts/movl | 34 +++++++++++++++++++++++++++++-----
1 file changed, 29 insertions(+), 5 deletions(-)
diff --git a/scripts/movl b/scripts/movl
index 231ab5d..efc31c7 100755
--- a/scripts/movl
+++ b/scripts/movl
@@ -1,5 +1,6 @@
#!/bin/bash
-source /etc/java-ebuilder.conf
+source "/etc/java-ebuilder.conf"
+tsh="/usr/lib/java-ebuilder/tree.sh"
clean-maven() {
rm -f "${CACHEDIR}"/maven-cache
@@ -21,6 +22,27 @@ clean() {
clean-maven
}
+rrdep() {
+ # regenerate reverse dependencies
+ for rdep in $(egrep -l "$1.*->" -r "${MAVEN_OVERLAY_DIR}"/app-maven); do
+ [[ ${rdep} = *.ebuild ]] && "${tsh}" ${rdep}
+ done
+}
+
+refresh() {
+ if [[ $1=*:* ]]; then
+ rrdep $1
+ else
+ # input: package name
+ for ebd in "${MAVEN_OVERLAY_DIR}"/app-maven/$1/*.ebuild; do
+ mid=$(sed -nr 's,^MAVEN_ID="(.*)",\1,p' "${ebd}")
+ rm "${ebd}"; "${tsh}" ${mid}
+ sed "/${mid}/d" -i "${CACHEDIR}"/maven-cache
+ rrdep ${mid}
+ done
+ fi
+}
+
build() {
: ${PORTDIR:=$(portageq get_repo_path $(portageq envvar EROOT) gentoo)}
: ${PORTAGE_TMPDIR:=$(portageq envvar PORTAGE_TMPDIR)}
@@ -51,18 +73,20 @@ build() {
fi
for M in ${MAVEN_ARTS}; do
- /usr/lib/java-ebuilder/tree.sh ${M}
+ "${tsh}" ${M}
done
- ls -1 "${MAVEN_OVERLAY_DIR}"/app-maven/*/*.ebuild | parallel ebuild {} digest
+ cd "${MAVEN_OVERLAY_DIR}"/app-maven
+ parallel ebuild '$(echo {}/*.ebuild | cut -d\ -f1)' digest ::: *
}
if [[ $# -gt 0 ]]; then
- funcs=$@
+ funcs=$1
+ shift 1
else
funcs=build
fi
for func in ${funcs}; do
- ${func}
+ ${func} $@
done
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/java-ebuilder:master commit in: scripts/
@ 2019-10-30 17:35 Michał Górny
0 siblings, 0 replies; 10+ messages in thread
From: Michał Górny @ 2019-10-30 17:35 UTC (permalink / raw
To: gentoo-commits
commit: 9a02fdacc7449eb3a4f541c7ad8730648ff752a8
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 9 12:50:41 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Mon Jan 9 12:50:41 2017 +0000
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=9a02fdac
meta.sh: add scala.
scripts/meta.sh | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/scripts/meta.sh b/scripts/meta.sh
index 82d3dc1..4bd16ba 100755
--- a/scripts/meta.sh
+++ b/scripts/meta.sh
@@ -74,6 +74,10 @@ case ${spkg} in
echo $1:org.huoc:${spkg}:${sver%%-*}
exit 0
;;
+ scala)
+ echo $1:org.scala-lang:${spkg}-compiler:${sver%%-*}
+ exit 0
+ ;;
esac
touch bebd bpom
^ permalink raw reply related [flat|nested] 10+ messages in thread
* [gentoo-commits] proj/java-ebuilder:master commit in: scripts/
@ 2020-07-06 10:56 Miroslav Šulc
0 siblings, 0 replies; 10+ messages in thread
From: Miroslav Šulc @ 2020-07-06 10:56 UTC (permalink / raw
To: gentoo-commits
commit: c64e847510fe9f6f3bcd10a6bc4525505d20e9a1
Author: zongyu <zzy2529420793 <AT> gmail <DOT> com>
AuthorDate: Mon Jun 15 01:35:23 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jul 6 09:48:25 2020 +0000
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=c64e8475
replace SRC_URI in tree.sh with the new domain of maven-central
Signed-off-by: zongyu <zzy2529420793 <AT> gmail.com>
scripts/tree.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/scripts/tree.sh b/scripts/tree.sh
index c44c127..6bb7cc5 100755
--- a/scripts/tree.sh
+++ b/scripts/tree.sh
@@ -72,7 +72,7 @@ gebd() {
PA=${PA//_/-}
local M=${MA}-${MV}
- local SRC_URI="http://central.maven.org/maven2/${WORKDIR}/${MV}/${M}-sources.jar"
+ local SRC_URI="https://repo.maven.apache.org/maven2/${WORKDIR}/${MV}/${M}-sources.jar"
if [[ ! -f "${POMDIR}"/${M}.pom ]]; then
pushd "${POMDIR}" > /dev/null
^ permalink raw reply related [flat|nested] 10+ messages in thread
end of thread, other threads:[~2020-07-06 10:56 UTC | newest]
Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-10-30 17:35 [gentoo-commits] proj/java-ebuilder:master commit in: scripts/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2020-07-06 10:56 Miroslav Šulc
2019-10-30 17:35 Michał Górny
2019-10-30 17:35 Michał Górny
2019-10-30 17:35 Michał Górny
2019-10-30 17:35 Michał Górny
2019-10-30 17:35 Michał Górny
2019-10-30 17:35 Michał Górny
2019-10-30 17:35 Michał Górny
2019-10-30 17:35 Michał Górny
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox