From c3efd4b98e75cfe9fcd79c919e4c800c9e478db3 Mon Sep 17 00:00:00 2001 From: Boris Kraut Date: Sun, 5 Apr 2015 18:45:13 +0200 Subject: [PATCH] Web Opac: Fix build --- metadata/de.geeksfactory.opacclient.txt | 35 ++++++++++++++++--------- 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/metadata/de.geeksfactory.opacclient.txt b/metadata/de.geeksfactory.opacclient.txt index 0fb6553f8a..0b83bd4b55 100644 --- a/metadata/de.geeksfactory.opacclient.txt +++ b/metadata/de.geeksfactory.opacclient.txt @@ -402,18 +402,29 @@ Build:4.0.3,109 Build:4.0.4,110 commit=4.0.4 submodules=yes - srclibs=ACRA@acra-4.5.0,JSoup@jsoup-1.6.3,Endless@v1.2.3,CWACAdapter@v1.0.1 - rm=libs/jsoup-*,libs/acra-*,libs/endless-*,libs/adapter-*,libs/cwac-* - prebuild=pushd $$JSoup$$ && \ - $$MVN3$$ package && \ - popd && \ - cp $$JSoup$$/target/jsoup-1.6.3.jar libs/ && \ - pushd $$ACRA$$ && \ - $$MVN3$$ package && \ - popd && \ - cp $$ACRA$$/target/acra-4.5.0.jar libs/ && \ - cp -fR $$Endless$$/src/com src/ && \ - cp -fR $$CWACAdapter$$/src/com src/ + gradle=yes + subdir=opacclient/opacapp + srclibs=JSoup@jsoup-1.6.3,Endless@v1.2.3,CWACAdapter@v1.0.1 + rm=opacclient/opacapp/libs/*,opacclient/meaningdetector/libs/* + prebuild=\ + cp -fR $$Endless$$/src/com src/main/java/ && \ + cp -fR $$CWACAdapter$$/src/com src/main/java/ && \ + sed -i -e '/sonatype/d' ../build.gradle && \ + sed -i -e '/endless/d' -e '/adapter/d' build.gradle && \ + sed -i -e '/fileTree/acompile "org.bouncycastle:bcprov-jdk15on:1.51"' \ + -e '/fileTree/acompile "org.apache.directory.studio:org.apache.commons.codec:1.6"' \ + -e '/fileTree/acompile "commons-logging:commons-logging:1.1.3"' \ + -e '/fileTree/acompile "org.apache.httpcomponents:fluent-hc:4.3.3"' \ + -e '/fileTree/acompile "org.apache.httpcomponents:httpclient:4.3.3"' \ + -e '/fileTree/acompile "org.apache.httpcomponents:httpclient-cache:4.3.3"' \ + -e '/fileTree/acompile "org.apache.httpcomponents:httpcore:4.3.2"' \ + -e '/fileTree/acompile "org.apache.httpcomponents:httpmime:4.3.3"' \ + -e '/fileTree/acompile "org.json:json:20141113"' ../meaningdetector/build.gradle + +Maintainer Notes: +4.0.4+ shouldn't need gradle changes for meaningdetector, see +https://github.com/raphaelm/opacclient/issues/296 . +. Auto Update Mode:Version %v Update Check Mode:Tags