From 16914ba978f1f66c03880ec33400635d78fd8fac Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Sun, 2 Oct 2016 20:05:18 +0200 Subject: [PATCH] Amaze: Prepare for 3.1.0 --- metadata/com.amaze.filemanager.txt | 19 +++++++------------ srclibs/ftplet.txt | 2 ++ 2 files changed, 9 insertions(+), 12 deletions(-) create mode 100644 srclibs/ftplet.txt diff --git a/metadata/com.amaze.filemanager.txt b/metadata/com.amaze.filemanager.txt index cba4a52a91..c9777e7585 100644 --- a/metadata/com.amaze.filemanager.txt +++ b/metadata/com.amaze.filemanager.txt @@ -135,20 +135,17 @@ Build:3.0.2 Beta 6,39 popd && \ cp $$7ZipJBindings$$/jbinding-java/sevenzipjbinding.jar libs/ -Build:3.1.0 Beta 1,42 - disable=jars - commit=v3.1.0-beta.1 +Build:3.1.0 Beta 2,43 + commit=2a1e2e67bc3d62e55bdb237c0ef179af613b7992 gradle=fdroid - srclibs=RootTools@3.4,7ZipJBindings@63009c - rm=libs/RootTools.jar,libs/sevenzipjbinding/*.jar + srclibs=RootTools@3.4,ftplet@f61ec18f98eee176ef4a4a13c5b776d9efc769e6 + rm=libs/RootTools.jar,libs/ftp*.jar prebuild=cp -fR $$RootTools$$/RootTools/src/main/java/com src/main/java/ && \ sed -i -e '/playCompile/d' -e '/Properties/,$d' build.gradle && \ - pushd $$7ZipJBindings$$ && \ - cmake . && \ - make && \ - make package && \ + pushd $$ftplet$$ && \ + $$MVN3$$ package -DskipTests=true && \ popd && \ - cp $$7ZipJBindings$$/jbinding-java/sevenzipjbinding.jar libs/ + cp $$ftplet$$/core/target/ftpserver-core-1.1.0-SNAPSHOT.jar $$ftplet$$/ftplet-api/target/ftplet-api-1.1.0-SNAPSHOT.jar libs/ Maintainer Notes: jcifs-1.3.18.jar has been verified to match upstream at @@ -158,5 +155,3 @@ we should build it from source. Auto Update Mode:None Update Check Mode:Tags -Current Version:3.1.0 Beta 1 -Current Version Code:42 diff --git a/srclibs/ftplet.txt b/srclibs/ftplet.txt new file mode 100644 index 0000000000..72f2af26bc --- /dev/null +++ b/srclibs/ftplet.txt @@ -0,0 +1,2 @@ +Repo Type:git +Repo:http://git-wip-us.apache.org/repos/asf/mina-ftpserver.git