Skip to content

Commit 6e98ebc

Browse files
authored
ant: use openjdk instead of dalvikvm (#7628)
1 parent 871d28c commit 6e98ebc

File tree

2 files changed

+9
-95
lines changed

2 files changed

+9
-95
lines changed

packages/ant/ant

Lines changed: 0 additions & 81 deletions
This file was deleted.

packages/ant/build.sh

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,21 @@
11
TERMUX_PKG_HOMEPAGE=http://ant.apache.org/
22
TERMUX_PKG_DESCRIPTION="Java based build tool like make"
33
TERMUX_PKG_VERSION=1.10.11
4+
TERMUX_PKG_REVISION=1
45
TERMUX_PKG_SRCURL=http://apache.mirrors.spacedump.net//ant/binaries/apache-ant-${TERMUX_PKG_VERSION}-bin.tar.bz2
56
TERMUX_PKG_SHA256=ffc6c9eb2d153db76e18df70fa145744ddd0d754339df5a797a47603cfeaa8a6
67
TERMUX_PKG_LICENSE="Apache-2.0"
78
TERMUX_PKG_MAINTAINER="@termux"
8-
TERMUX_PKG_RECOMMENDS="openjdk-17"
9+
TERMUX_PKG_DEPENDS="openjdk-17"
910
TERMUX_PKG_PLATFORM_INDEPENDENT=true
1011
TERMUX_PKG_BUILD_IN_SRC=true
1112

1213
termux_step_make_install() {
13-
mkdir -p $TERMUX_PREFIX/share/ant/lib
14-
15-
for jar in ant ant-launcher; do
16-
$TERMUX_D8 \
17-
--classpath $ANDROID_HOME/platforms/android-$TERMUX_PKG_API_LEVEL/android.jar \
18-
--release \
19-
--min-api $TERMUX_PKG_API_LEVEL \
20-
--output $TERMUX_PREFIX/share/ant/lib/${jar}.jar \
21-
lib/${jar}.jar
22-
done
23-
24-
install $TERMUX_PKG_BUILDER_DIR/ant $TERMUX_PREFIX/bin/ant
25-
perl -p -i -e "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/ant
14+
mv ./bin/ant .
15+
rm -f ./bin/*
16+
mv ./ant ./bin/
17+
rm -rf $TERMUX_PREFIX/opt/ant
18+
mkdir -p $TERMUX_PREFIX/opt/ant
19+
cp -r ./* $TERMUX_PREFIX/opt/ant
20+
ln -sfr $TERMUX_PREFIX/opt/ant/bin/ant $PREFIX/bin/ant
2621
}

0 commit comments

Comments
 (0)