From e66e33afeea2bf4da9d6ada9d2c2b75ee7c1b7db Mon Sep 17 00:00:00 2001 From: Marcus Hoffmann Date: Wed, 13 Sep 2017 15:40:29 +0200 Subject: [PATCH] androdb: enable AUM, add 1.4.9 switch to working mirror of log4j The builds didn't change for quite a while so we can enable auto update. Switch to a github mirror by apache for the old log4j library because the git-svn takes years to clone. The contents are the same. --- metadata/com.fr3ts0n.ecu.gui.androbd.txt | 20 +++++++++++++++++++- srclibs/log4j.txt | 4 ++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/metadata/com.fr3ts0n.ecu.gui.androbd.txt b/metadata/com.fr3ts0n.ecu.gui.androbd.txt index 98ee4b00d5..1ff3dc2147 100644 --- a/metadata/com.fr3ts0n.ecu.gui.androbd.txt +++ b/metadata/com.fr3ts0n.ecu.gui.androbd.txt @@ -493,11 +493,29 @@ Build:V1.4.7,10407 cp $$log4j$$/target/log4j-1.2.18-SNAPSHOT.jar libs/ && \ cp $$AChartEngineFr3ts0n$$/target/achartengine-1.2.0.jar libs/ +Build:V1.4.9,10409 + commit=V1.4.9 + srclibs=android-logging-log4j@7cb1fee0ea87c3b01c68b2410dfc4b4eb1236e65,log4j@7be00eed88152dd011a619e8bae5a631235c3f4c,AChartEngineFr3ts0n@e2594a4a257cfeacba3595f1b16218a5541810c3,UsbSerial4Android@a213f06ad0b19fd6f1a6b4f8b2f74f986a00ea68 + rm=libs/*.jar,src/com/fr3ts0n/pvs/gui/,src/com/fr3ts0n/ecu/gui/application/,src/com/fr3ts0n/prot/gui/ + prebuild=pushd $$android-logging-log4j$$ && \ + $$MVN3$$ package && \ + popd && \ + pushd $$log4j$$ && \ + $$MVN3$$ package && \ + popd && \ + pushd $$AChartEngineFr3ts0n$$ && \ + $$MVN3$$ package && \ + popd && \ + cp -fR $$UsbSerial4Android$$/usbSerialForAndroid/src/main/java/com src/ && \ + cp $$android-logging-log4j$$/target/android-logging-log4j-1.0.4-SNAPSHOT.jar libs/ && \ + cp $$log4j$$/target/log4j-1.2.18-SNAPSHOT.jar libs/ && \ + cp $$AChartEngineFr3ts0n$$/target/achartengine-1.2.0.jar libs/ + Maintainer Notes: Very unstable and complex build, do not enable auto updates. . -Auto Update Mode:None +Auto Update Mode:Version %v Update Check Mode:Tags Current Version:V1.4.9 Current Version Code:10409 diff --git a/srclibs/log4j.txt b/srclibs/log4j.txt index cb2f9affc9..44113bf678 100644 --- a/srclibs/log4j.txt +++ b/srclibs/log4j.txt @@ -1,2 +1,2 @@ -Repo Type:git-svn -Repo:http://svn.apache.org/repos/asf/logging/log4j/trunk +Repo Type:git +Repo:https://github.com/apache/log4j.git