From 4f2827215f8760f2815dd1be28be5dea2b964ce1 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Wed, 20 Dec 2017 10:01:18 +0000
Subject: [PATCH] SSDM-5994: download master and take version from setup.py
SVN: 39066
---
openbis_standard_technologies/build.gradle | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/openbis_standard_technologies/build.gradle b/openbis_standard_technologies/build.gradle
index dea678d2d24..7ef5658ea04 100644
--- a/openbis_standard_technologies/build.gradle
+++ b/openbis_standard_technologies/build.gradle
@@ -395,16 +395,18 @@ task zipDss(type: Zip, dependsOn: signWebStartJars) {
}
task clientsAndApis(type: Zip, dependsOn: [dssClientZip, queryApiZip, apiV3Zip, proteomicsApiZip, screeningApiZip]) {
- def pybisVersion = '1.4.1'
baseName 'openBIS-clients-and-APIs'
- downloadFile("https://sissource.ethz.ch/sispub/pybis/repository/release/${pybisVersion}/archive.zip", "pybis-${pybisVersion}.zip")
- from "targets/downloads/pybis-${pybisVersion}.zip"
+ downloadFile("https://sissource.ethz.ch/sispub/pybis/repository/master/archive.zip", "pybis.zip")
+ from "targets/downloads/pybis.zip"
from dssClientZip.archivePath
from queryApiZip.archivePath
from apiV3Zip.archivePath
from proteomicsApiZip.archivePath
from screeningApiZip.archivePath
from ('../openbis_all/dist/readme.txt')
+ def contentOfSetUpFile = zipTree('targets/downloads/pybis.zip').getFiles().findAll {it.path.endsWith('PyBis/setup.py') }.iterator().next().text
+ def pybisVersion = ( contentOfSetUpFile =~ /version.*=.*'(.*)'/)[0][1]
+ rename 'pybis.zip', "pybis-${pybisVersion}.zip"
}
task generateJavadoc(type: Javadoc) {
--
GitLab