| 1 |
commit: 0195ce4168ad8cc4560cdb1a5b64f022a2703c10 |
| 2 |
Author: Benda Xu <heroxbd <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 9 04:08:21 2017 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 9 04:08:21 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=0195ce41 |
| 7 |
|
| 8 |
tree.sh: more maven version compatibility tricks. |
| 9 |
|
| 10 |
scripts/meta.sh | 5 +++++ |
| 11 |
scripts/tree.sh | 31 ++++++++++++++++++++++++++----- |
| 12 |
2 files changed, 31 insertions(+), 5 deletions(-) |
| 13 |
|
| 14 |
diff --git a/scripts/meta.sh b/scripts/meta.sh |
| 15 |
index 42a45a2..82d3dc1 100755 |
| 16 |
--- a/scripts/meta.sh |
| 17 |
+++ b/scripts/meta.sh |
| 18 |
@@ -69,6 +69,11 @@ case ${spkg} in |
| 19 |
echo $1:org.ow2.asm:${spkg}-all:${sver%%-*} |
| 20 |
echo $1:org.ow2.asm:${spkg}-debug-all:${sver%%-*} |
| 21 |
exit 0 |
| 22 |
+ ;; |
| 23 |
+ cofoja) |
| 24 |
+ echo $1:org.huoc:${spkg}:${sver%%-*} |
| 25 |
+ exit 0 |
| 26 |
+ ;; |
| 27 |
esac |
| 28 |
|
| 29 |
touch bebd bpom |
| 30 |
|
| 31 |
diff --git a/scripts/tree.sh b/scripts/tree.sh |
| 32 |
index 8de9045..3b44481 100755 |
| 33 |
--- a/scripts/tree.sh |
| 34 |
+++ b/scripts/tree.sh |
| 35 |
@@ -16,8 +16,7 @@ gebd() { |
| 36 |
|
| 37 |
local WORKDIR=${PG//./\/}/${MA} MID |
| 38 |
local MID=${PG}:${MA}:${MV} |
| 39 |
- # .Final .GA .v20121024 means nothing |
| 40 |
- local PV=${MV%.[a-zA-Z]*} PA SLOT |
| 41 |
+ local PV=${MV} PA SLOT |
| 42 |
|
| 43 |
case ${MA} in |
| 44 |
opengl-api) |
| 45 |
@@ -25,17 +24,39 @@ gebd() { |
| 46 |
;; |
| 47 |
esac |
| 48 |
|
| 49 |
+ # com.github.lindenb:jbwa:1.0.0_ppc64 |
| 50 |
+ PV=${PV/_/.} |
| 51 |
# plexus-container-default 1.0-alpha-9-stable-1 |
| 52 |
- PV=${PV/-stable-*/} |
| 53 |
- PV=${PV/-alpha-/_alpha} |
| 54 |
+ PV=${PV/-stable-/.} |
| 55 |
+ PV=$(sed -r 's/[.-]?alpha[-.]?/_alpha/' <<< ${PV}) |
| 56 |
# wagon-provider-api 1.0-beta-7 |
| 57 |
- PV=${PV/-beta-/_beta} |
| 58 |
+ # com.google.cloud.datastore:datastore-v1beta3-proto-client:1.0.0-beta.2 |
| 59 |
+ # com.google.cloud.datastore:datastore-v1beta3-protos:1.0.0-beta |
| 60 |
+ PV=$(sed -r 's/[.-]?beta[-.]?/_beta/' <<< ${PV}) |
| 61 |
# aopalliance-repackaged 2.5.0-b16 |
| 62 |
PV=${PV/-b/_beta} |
| 63 |
+ # com.google.auto.service:auto-service:1.0-rc2 |
| 64 |
+ PV=${PV/-rc/_rc} |
| 65 |
# cdi-api 1.0-SP4 |
| 66 |
PV=${PV/-SP/_p} |
| 67 |
+ # org.seqdoop:cofoja:1.1-r150 |
| 68 |
+ PV=${PV/-rev/_p} |
| 69 |
+ PV=${PV/-r/_p} |
| 70 |
+ PV=${PV/.v/_p} |
| 71 |
# javax.xml.stream:stax-api:1.0-2 |
| 72 |
PV=${PV//-/.} |
| 73 |
+ # .Final .GA -incubating means nothing |
| 74 |
+ PV=${PV%.[a-zA-Z]*} |
| 75 |
+ # com.google.cloud.genomics:google-genomics-dataflow:v1beta2-0.15 -> 1.2.0.15 |
| 76 |
+ # plexus-container-default 1.0-alpha-9-stable-1 -> 1.0.9.1 |
| 77 |
+ PV=$(sed -r 's/_(rc|beta|alpha|p)(.*\..*)/.\2/' <<< ${PV}) |
| 78 |
+ # remove all non-numeric charactors before _ |
| 79 |
+ # org.scalamacros:quasiquotes_2.10:2.0.0-M8 |
| 80 |
+ if [[ ${PV} = *_* ]]; then |
| 81 |
+ PV=$(sed 's/[^.0-9]//g' <<< ${PV/_*/})_${PV/*_/} |
| 82 |
+ else |
| 83 |
+ PV=$(sed 's/[^.0-9]//g' <<< ${PV}) |
| 84 |
+ fi |
| 85 |
|
| 86 |
# spark-launcher_2.11 for scala 2.11 |
| 87 |
eval $(sed -nr 's,([^_]*)(_(.*))?,PA=\1 SLOT=\3,p' <<< ${MA}) |
Archives