From 888b5b9c8bf6bc952c5fdf62e62123d344eeee86 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Thu, 23 Feb 2012 13:35:13 +0000
Subject: [PATCH] LMS-2612 DSS plugin distributions changed: Folder
'datastore_server' introduced, DSS core-plugins added.
SVN: 24538
---
datastore_server/build/build.xml | 15 +++++++++++----
openbis_all/source/bash/sprint_install.sh | 2 +-
rtd_yeastx/build/build.xml | 2 +-
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/datastore_server/build/build.xml b/datastore_server/build/build.xml
index 6641ea8b806..29444cdb6f3 100644
--- a/datastore_server/build/build.xml
+++ b/datastore_server/build/build.xml
@@ -8,7 +8,9 @@
<property name="dist.datastore_server.lib" value="${dist.datastore_server}/lib" />
<property name="dss-jar.file" value="${dist.datastore_server.lib}/datastore_server.jar" />
<property name="dist.file.prefix" value="${dist}/datastore_server" />
- <property name="dist.lib" value="${dist}/lib"/>
+ <property name="dist.plugin" value="${dist}/plugin"/>
+ <property name="dist.plugin.lib" value="${dist.plugin}/datastore_server/lib"/>
+ <property name="core-plugins.folder" value="dist/core-plugins"/>
<property name="plugin-jar.file" value="${dist}/datastore_server-plugin.jar" />
<property name="dss-build.info.filename" value="BUILD-datastore_server.INFO"/>
<property name="dss-build.info.file" value="${classes}/${dss-build.info.filename}"/>
@@ -95,11 +97,16 @@
</target>
<target name="make-plugin-dist">
- <move file="${plugin-jar.file}" tofile="${dist.lib}/datastore_server_plugin${variant}.jar" />
+ <move file="${plugin-jar.file}" tofile="${dist.plugin.lib}/datastore_server_plugin${variant}.jar" />
+ <copy todir="${dist.plugin}/core-plugins">
+ <fileset dir="${core-plugins.folder}">
+ <include name="*/*/dss/**/*"/>
+ </fileset>
+ </copy>
<property name="dist.file"
value="${dist}/datastore_server_plugin${variant}-${version.number}-r${revision.number}.zip" />
- <zip basedir="${dist}" destfile="${dist.file}" excludes="*.zip *.jar"/>
- <delete dir="${dist.lib}"/>
+ <zip basedir="${dist.plugin}" destfile="${dist.file}" excludes="*.zip *.jar"/>
+ <delete dir="${dist.plugin}"/>
</target>
<target name="dist">
diff --git a/openbis_all/source/bash/sprint_install.sh b/openbis_all/source/bash/sprint_install.sh
index a9790c91ba7..ba546095700 100755
--- a/openbis_all/source/bash/sprint_install.sh
+++ b/openbis_all/source/bash/sprint_install.sh
@@ -70,7 +70,7 @@ cd ..
unzip -q ../datastore_server-*$VER*
for file in ../datastore_server_plugin-*$VER*; do
if [ -f $file ]; then
- unzip -q -d datastore_server $file;
+ unzip -q $file;
fi
done
cd datastore_server
diff --git a/rtd_yeastx/build/build.xml b/rtd_yeastx/build/build.xml
index da1243b9b65..ba9ca51227d 100644
--- a/rtd_yeastx/build/build.xml
+++ b/rtd_yeastx/build/build.xml
@@ -10,7 +10,7 @@
<target name="compile" depends="build-common.compile, clean" />
<target name="dist" depends="jar" >
- <copy todir="${dist.lib}">
+ <copy todir="${dist.plugin.lib}">
<fileset dir="${lib}/jfreechart" >
<include name="*.jar"/>
</fileset>
--
GitLab