From a341e310eb411b5020b84b028f4b2e46b1e2a49f Mon Sep 17 00:00:00 2001
From: Fredrik Fornwall <fredrik@fornwall.net>
Date: Sun, 26 May 2019 22:10:42 +0200
Subject: [PATCH] ecj: Replace ecj with ecj4.6 as single package

---
 packages/ecj/build.sh    | 15 ++++----
 packages/ecj4.6/build.sh | 75 ----------------------------------------
 packages/ecj4.6/ecj      | 11 ------
 packages/ecj4.6/ecj-21   | 11 ------
 4 files changed, 8 insertions(+), 104 deletions(-)
 delete mode 100644 packages/ecj4.6/build.sh
 delete mode 100755 packages/ecj4.6/ecj
 delete mode 100755 packages/ecj4.6/ecj-21

diff --git a/packages/ecj/build.sh b/packages/ecj/build.sh
index b9a0cc5e6..6ff1449db 100644
--- a/packages/ecj/build.sh
+++ b/packages/ecj/build.sh
@@ -1,20 +1,21 @@
 TERMUX_PKG_HOMEPAGE=http://www.eclipse.org/jdt/core/
 TERMUX_PKG_DESCRIPTION="Eclipse Compiler for Java"
 TERMUX_PKG_LICENSE="EPL-2.0"
-TERMUX_PKG_VERSION=4.7.2
-local _date=201711300510
-TERMUX_PKG_REVISION=2
-TERMUX_PKG_SHA256=43c2f45d1fd9afb8b04e547a253041957f19b2f21d8780cdb3a8706ce9b9b9ee
-TERMUX_PKG_SRCURL=http://archive.eclipse.org/eclipse/downloads/drops${TERMUX_PKG_VERSION:0:1}/R-$TERMUX_PKG_VERSION-$_date/ecj-$TERMUX_PKG_VERSION.jar
+_PKG_VERSION=4.6.2
+TERMUX_PKG_VERSION=1:$_PKG_VERSION
+local _date=201611241400
+TERMUX_PKG_SHA256=9953dc2be829732e1b939106a71de018f660891220dbca559a5c7bff84883e51
+TERMUX_PKG_SRCURL=http://archive.eclipse.org/eclipse/downloads/drops${_PKG_VERSION:0:1}/R-$_PKG_VERSION-$_date/ecj-$_PKG_VERSION.jar
 TERMUX_PKG_PLATFORM_INDEPENDENT=true
-TERMUX_PKG_CONFLICTS="ecj4.6"
+TERMUX_PKG_BREAKS="ecj4.6"
+TERMUX_PKG_REPLACES="ecj4.6"
 
 termux_step_extract_package() {
 	mkdir $TERMUX_PKG_SRCDIR
 }
 
 termux_step_make() {
-	local RAW_JAR=$TERMUX_PKG_CACHEDIR/ecj-${TERMUX_PKG_VERSION}.jar
+	local RAW_JAR=$TERMUX_PKG_CACHEDIR/ecj-${_PKG_VERSION}.jar
 	termux_download $TERMUX_PKG_SRCURL \
 		$RAW_JAR \
 		$TERMUX_PKG_SHA256
diff --git a/packages/ecj4.6/build.sh b/packages/ecj4.6/build.sh
deleted file mode 100644
index c547e9526..000000000
--- a/packages/ecj4.6/build.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-TERMUX_PKG_HOMEPAGE=http://www.eclipse.org/jdt/core/
-TERMUX_PKG_DESCRIPTION="Eclipse Compiler for Java, for android 5 and 6"
-TERMUX_PKG_LICENSE="EPL-2.0"
-TERMUX_PKG_VERSION=4.6.2
-local _date=201611241400
-TERMUX_PKG_REVISION=1
-TERMUX_PKG_SHA256=9953dc2be829732e1b939106a71de018f660891220dbca559a5c7bff84883e51
-TERMUX_PKG_SRCURL=http://archive.eclipse.org/eclipse/downloads/drops${TERMUX_PKG_VERSION:0:1}/R-$TERMUX_PKG_VERSION-$_date/ecj-$TERMUX_PKG_VERSION.jar
-TERMUX_PKG_PLATFORM_INDEPENDENT=true
-TERMUX_PKG_CONFLICTS="ecj"
-
-termux_step_extract_package() {
-	mkdir $TERMUX_PKG_SRCDIR
-}
-
-termux_step_make() {
-	local RAW_JAR=$TERMUX_PKG_CACHEDIR/ecj-${TERMUX_PKG_VERSION}.jar
-	termux_download $TERMUX_PKG_SRCURL \
-		$RAW_JAR \
-		$TERMUX_PKG_SHA256
-
-	mkdir -p $TERMUX_PREFIX/share/{dex,java}
-	$TERMUX_D8 \
-		--classpath $ANDROID_HOME/platforms/android-$TERMUX_PKG_API_LEVEL/android.jar \
-		--release \
-		--min-api 21 \
-		--output $TERMUX_PKG_TMPDIR \
-		$RAW_JAR
-
-	# Package classes.dex into jar:
-	cd $TERMUX_PKG_TMPDIR
-	jar cf ecj.jar classes.dex
-	# Add needed properties file to jar file:
-	jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/batch/messages.properties
-	jar uf ecj.jar	org/eclipse/jdt/internal/compiler/batch/messages.properties
-	jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/problem/messages.properties
-	jar uf ecj.jar	org/eclipse/jdt/internal/compiler/problem/messages.properties
-	jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/messages.properties
-	jar uf ecj.jar	org/eclipse/jdt/internal/compiler/messages.properties
-	jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/parser/readableNames.props
-	jar uf ecj.jar	org/eclipse/jdt/internal/compiler/parser/readableNames.props
-	for i in $(seq 1 24); do
-		jar xf $RAW_JAR org/eclipse/jdt/internal/compiler/parser/parser$i.rsc
-		jar uf ecj.jar	org/eclipse/jdt/internal/compiler/parser/parser$i.rsc
-	done
-	# Move into place:
-	mv ecj.jar $TERMUX_PREFIX/share/dex/ecj.jar
-
-	rm -rf android-jar
-	mkdir android-jar
-	cd android-jar
-
-	# We need the android classes for JDT to compile against.
-	cp $ANDROID_HOME/platforms/android-28/android.jar .
-	unzip -q android.jar
-	rm -Rf android.jar resources.arsc res assets
-	jar cfM android.jar .
-
-	cp $TERMUX_PKG_TMPDIR/android-jar/android.jar $TERMUX_PREFIX/share/java/android.jar
-
-	# Bundle in an android.jar from an older API also, for those who want to
-	# build apps that run on older Android versions.
-	rm -Rf ./*
-	cp $ANDROID_HOME/platforms/android-21/android.jar android.jar
-	unzip -q android.jar
-	rm -Rf android.jar resources.arsc res assets
-	jar cfM android-21.jar .
-	cp $TERMUX_PKG_TMPDIR/android-jar/android-21.jar $TERMUX_PREFIX/share/java/
-
-	rm -Rf $TERMUX_PREFIX/bin/javac
-	install $TERMUX_PKG_BUILDER_DIR/ecj $TERMUX_PREFIX/bin/ecj
-	perl -p -i -e "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/ecj
-	install $TERMUX_PKG_BUILDER_DIR/ecj-21 $TERMUX_PREFIX/bin/ecj-21
-	perl -p -i -e "s%\@TERMUX_PREFIX\@%${TERMUX_PREFIX}%g" $TERMUX_PREFIX/bin/ecj-21
-}
diff --git a/packages/ecj4.6/ecj b/packages/ecj4.6/ecj
deleted file mode 100755
index c0144acce..000000000
--- a/packages/ecj4.6/ecj
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# -proc:none to disable annotation processing.
-# -7 for java 1.7 compatibility.
-dalvikvm -Xmx256m \
-         -cp @TERMUX_PREFIX@/share/dex/ecj.jar \
-         org.eclipse.jdt.internal.compiler.batch.Main \
-         -proc:none \
-         -7 \
-         -cp @TERMUX_PREFIX@/share/java/android.jar \
-         "$@"
diff --git a/packages/ecj4.6/ecj-21 b/packages/ecj4.6/ecj-21
deleted file mode 100755
index c28bbdb26..000000000
--- a/packages/ecj4.6/ecj-21
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-# -proc:none to disable annotation processing.
-# -7 for java 1.7 compatibility.
-dalvikvm -Xmx256m \
-         -cp @TERMUX_PREFIX@/share/dex/ecj.jar \
-         org.eclipse.jdt.internal.compiler.batch.Main \
-         -proc:none \
-         -7 \
-         -cp @TERMUX_PREFIX@/share/java/android-21.jar \
-         "$@"