From bd14b2578e93f2557f60de2da6f7845934fdc7f5 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 26 Jan 2012 13:59:07 +0000
Subject: [PATCH] LMS-2760 refactoring of targets in build.xml related to DSS
SVN: 24291
---
datastore_server/build/build.xml | 9 ++++++++
rtd_phosphonetx/build/build.xml | 13 +++++++++---
screening/build/build.xml | 36 +++++++++++++++++++++-----------
3 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/datastore_server/build/build.xml b/datastore_server/build/build.xml
index b067bd456b9..6641ea8b806 100644
--- a/datastore_server/build/build.xml
+++ b/datastore_server/build/build.xml
@@ -45,6 +45,10 @@
<mkdir dir="${dist.datastore_server.lib}" />
<delete dir="tmp/test"/><!-- remove this directory in order to get a clean clean-flag -->
<build-info revision="revision.number" version="version.number" clean="clean.flag" />
+ <antcall target="make-dss-jar"/>
+ </target>
+
+ <target name="make-dss-jar">
<echo file="${dss-build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
<copy todir="${native}">
<fileset dir="${nativesrc}">
@@ -108,6 +112,11 @@
-->
<target name="prepare-dist-libs" depends="dss-jar, dist-client, dist-upload-gui">
<copy file="${dss-jar.file}" todir="${dist.datastore_server.lib}" />
+ <antcall target="add-dss-dist-libs"/>
+ </target>
+
+ <!-- Add libraries to DSS distribution. -->
+ <target name="add-dss-dist-libs">
<copy todir="${dist.datastore_server.lib}" flatten="true">
<fileset dir="${lib}/jetty7/lib">
<include name="common/*.jar" />
diff --git a/rtd_phosphonetx/build/build.xml b/rtd_phosphonetx/build/build.xml
index f1269251a12..934cd0a46f0 100644
--- a/rtd_phosphonetx/build/build.xml
+++ b/rtd_phosphonetx/build/build.xml
@@ -12,19 +12,26 @@
<property name="api.doc.zip" value="${dist}/doc.zip" />
<property name="api.src.zip" value="${dist}/src.zip" />
<property name="api.dist.file" value="${dist}/${api.prefix}.zip" />
+ <property name="proteomics-build.info.filename" value="BUILD-proteomics.INFO" />
+ <property name="proteomics.classes" value="../rtd_phosphonetx/${classes}"/>
+ <property name="proteomics-build.info.file" value="${proteomics.classes}/BUILD-proteomics.INFO" />
<target name="compile" depends="build-common.compile, clean" />
<target name="dss-plugin-jar" depends="compile">
<mkdir dir="${dist}" />
<build-info revision="revision.number" version="version.number" clean="clean.flag" />
- <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
+ <antcall target="make-dss-plugin-jar"/>
+ </target>
+
+ <target name="make-dss-plugin-jar">
+ <echo file="${proteomics-build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
<jar destfile="${plugin-jar.file}">
- <fileset dir="${classes}">
+ <fileset dir="${proteomics.classes}">
<include name="ch/systemsx/cisd/openbis/dss/**/*.class" />
<include name="ch/systemsx/cisd/openbis/etlserver/proteomics/**/*.class" />
<include name="ch/systemsx/cisd/openbis/plugin/proteomics/shared/**/*.class" />
- <include name="${build.info.filename}" />
+ <include name="${proteomics-build.info.filename}" />
</fileset>
<manifest>
<attribute name="Version" value="${version.number}" />
diff --git a/screening/build/build.xml b/screening/build/build.xml
index e2316b9423d..6670a2673fe 100644
--- a/screening/build/build.xml
+++ b/screening/build/build.xml
@@ -20,6 +20,9 @@
<property name="classes.openbis" value="../openbis/targets/ant/classes" />
<property name="classes.common-server" value="../server-common/targets/ant/classes" />
<property name="classes.common" value="../common/targets/ant/classes" />
+ <property name="screening-build.info.filename" value="BUILD-screening.INFO" />
+ <property name="screening-build.info.file" value="${classes.screening}/BUILD-screening.INFO" />
+
<target name="compile" depends="build-common.compile, clean" />
@@ -38,14 +41,18 @@
<target name="dss-plugin-jar" depends="compile">
<build-info revision="revision.number" version="version.number" clean="clean.flag" />
- <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
+ <antcall target="make-dss-plugin-jar"/>
+ </target>
+
+ <target name="make-dss-plugin-jar">
+ <echo file="${screening-build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
<jar destfile="${plugin-jar.file}">
- <fileset dir="${classes}">
+ <fileset dir="${classes.screening}">
<include name="ch/systemsx/cisd/openbis/dss/**/*.class" />
<include name="ch/systemsx/cisd/openbis/plugin/screening/shared/**/*.class" />
<include name="ch/systemsx/cisd/utils/**/*.class" />
<include name="*.class" />
- <include name="${build.info.filename}" />
+ <include name="${screening-build.info.filename}" />
</fileset>
<fileset dir="${lib}/nativedata">
<include name="native/**/*"/>
@@ -69,15 +76,7 @@
<target name="make-full-dss-dist" depends="datastore_server.prepare-dist-libs, compute-dss-checksum">
<copy file="${plugin-jar.file}" tofile="${dist.datastore_server.lib}/datastore_server_plugin${variant}.jar" />
- <copy file="${lib}/sybit-image-viewer/image-viewer.jar" todir="${dist.datastore_server.lib}" />
- <copy todir="${dist.datastore_server}/data">
- <fileset dir="../screening/dist/data" />
- </copy>
- <copy todir="${dist.datastore_server}/etc">
- <fileset dir="../screening/dist/etc">
- <include name="tabular-data-graph.properties" />
- </fileset>
- </copy>
+ <antcall target="add-stuff-to-dss-dist"/>
<antcall target="datastore_server.create-distribution" />
<mkdir dir="${dist}/data" />
<mkdir dir="${dist}/etc" />
@@ -91,6 +90,19 @@
</copy>
</target>
+ <!-- Add libraries and other stuff to DSS distribution. -->
+ <target name="add-stuff-to-dss-dist">
+ <copy file="${lib}/sybit-image-viewer/image-viewer.jar" todir="${dist.datastore_server.lib}" />
+ <copy todir="${dist.datastore_server}/data">
+ <fileset dir="../screening/dist/data" />
+ </copy>
+ <copy todir="${dist.datastore_server}/etc">
+ <fileset dir="../screening/dist/etc">
+ <include name="tabular-data-graph.properties" />
+ </fileset>
+ </copy>
+ </target>
+
<!--
Build the checksum file.
-->
--
GitLab