| 1 |
hi, |
| 2 |
|
| 3 |
i just committed the changes to the eclass: |
| 4 |
|
| 5 |
commit f14e39de0e2eaa3d3011918e9febd89bfe98f7ee (HEAD -> master, |
| 6 |
origin/master, origin/HEAD) |
| 7 |
Author: Miroslav ©ulc <fordfrog@g.o> |
| 8 |
Date: Mon Jan 21 09:45:29 2019 +0100 |
| 9 |
|
| 10 |
ant-tasks.eclass: cleanup and improvement |
| 11 |
|
| 12 |
1) removed obsolete code |
| 13 |
2) increased default jdk/jre version to the lowest available |
| 14 |
version 1.8 |
| 15 |
3) added support for patching build.xml along with the original |
| 16 |
build.xml replacement |
| 17 |
|
| 18 |
Signed-off-by: Miroslav ©ulc <fordfrog@g.o> |
| 19 |
|
| 20 |
i did one minor change that was not in the patch. after chat with chewi |
| 21 |
i increased default jdk/jre to 1.8 instead of 1.6. this change does not |
| 22 |
affect any ebuild as all ebuilds have these values defined. |
| 23 |
|
| 24 |
regards |
| 25 |
|
| 26 |
miroslav |
| 27 |
|
| 28 |
|
| 29 |
Dne 18. 01. 19 v 18:25 Miroslav ©ulc napsal(a): |
| 30 |
> thank you for the comments. i added eapi check at the beginning |
| 31 |
> supporting eapi 5|6|7 (5 is needed for current ebuilds). i also |
| 32 |
> changed epatch to eapply and disabled patching build.xml for eapi5 |
| 33 |
> just to make the code more robust, build.xml patching is not used in |
| 34 |
> current ebuilds and those will be soon gone. once they are gone, this |
| 35 |
> check and support for eapi5 can both be removed. attached is the |
| 36 |
> updated patch. |
| 37 |
> |
| 38 |
> miroslav |
| 39 |
> |
| 40 |
> Dne 18. 01. 19 v 17:23 Brian Evans napsal(a): |
| 41 |
>> On 1/18/2019 11:11 AM, Miroslav ©ulc wrote: |
| 42 |
>>> @@ -130,7 +112,11 @@ ant-tasks_src_unpack() { |
| 43 |
>>> cd "${S}" |
| 44 |
>>> # replace build.xml with our modified for split |
| 45 |
>>> building |
| 46 |
>>> - mv -f "${WORKDIR}"/build.xml . |
| 47 |
>>> + if [ -e "${WORKDIR}"/${PV}-build.patch ] ; then |
| 48 |
>>> + epatch "${WORKDIR}"/${PV}-build.patch |
| 49 |
>> Adding epatch without 'inherit epatch'? Sounds like gambling on faith. |
| 50 |
>> Also limits to EAPI=6. |
| 51 |
>> |
| 52 |
>> Brian |
| 53 |
>> |
| 54 |
>>> + else |
| 55 |
>>> + mv -f "${WORKDIR}"/build.xml . |
| 56 |
>>> + fi |
| 57 |
>>> cd lib |
| 58 |
>>> # remove bundled xerces |
Archives