From 9645eca641fb03bb994f7c731f23632ee6ba3d31 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 2 Sep 2013 13:16:47 +0000
Subject: [PATCH] SP-859, BIS-512: Take the version number of openbis standard
technologies distribution as the version number of the installer.
SVN: 29699
---
installation/build/build.xml | 17 +++++++++++++++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git a/installation/build/build.xml b/installation/build/build.xml
index a43a8f21386..5f83b1e9379 100644
--- a/installation/build/build.xml
+++ b/installation/build/build.xml
@@ -34,7 +34,7 @@
<param name="test.suite" value="tests.xml" />
</antcall>
</target>
-
+
<target name="dist" depends="dist-standard-technologies">
</target>
@@ -52,7 +52,20 @@
</target>
<target name="create-installation-tarball">
- <property name="tarball.basename" value="openBIS-installation${variant}-${version.number}-r${revision.number}" />
+ <pathconvert property="extracted.version">
+ <path>
+ <fileset dir="${openbis.server.zip.folder}">
+ <include name="openBIS-server${variant}-*.zip"/>
+ </fileset>
+ </path>
+ <chainedmapper>
+ <flattenmapper/>
+ <filtermapper>
+ <replaceregex pattern="openBIS-server${variant}-(.*)\.zip" replace="\1"/>
+ </filtermapper>
+ </chainedmapper>
+ </pathconvert>
+ <property name="tarball.basename" value="openBIS-installation${variant}-${extracted.version}" />
<antcall target="create-installer"/>
--
GitLab