From 5f88d1fa8585cff1ec3eccb0fdf16df9b9a063f1 Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 13 Sep 2011 13:49:21 +0000
Subject: [PATCH] bug fixed concerning wrong datastore_server-screening-*.zip
structure
SVN: 22919
---
screening/build/build.xml | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/screening/build/build.xml b/screening/build/build.xml
index d12a726a954..af6c87b13ac 100644
--- a/screening/build/build.xml
+++ b/screening/build/build.xml
@@ -37,8 +37,6 @@
</target>
<target name="dss-plugin-jar" depends="compile">
- <mkdir dir="${dist}/data" />
- <mkdir dir="${dist}/etc" />
<build-info revision="revision.number" version="version.number" clean="clean.flag" />
<echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
<jar destfile="${plugin-jar.file}">
@@ -67,14 +65,6 @@
value="${version.number} (r${revision.number},${clean.flag})" />
</manifest>
</jar>
- <copy todir="${dist}/data">
- <fileset dir="dist/data" />
- </copy>
- <copy todir="${dist}/etc">
- <fileset dir="dist/etc">
- <include name="tabular-data-graph.properties" />
- </fileset>
- </copy>
</target>
<target name="make-full-dss-dist" depends="datastore_server.prepare-dist-libs, compute-dss-checksum, dss-plugin-jar">
@@ -100,6 +90,16 @@
</fileset>
</copy>
<antcall target="datastore_server.create-distribution" />
+ <mkdir dir="${dist}/data" />
+ <mkdir dir="${dist}/etc" />
+ <copy todir="${dist}/data">
+ <fileset dir="dist/data" />
+ </copy>
+ <copy todir="${dist}/etc">
+ <fileset dir="dist/etc">
+ <include name="tabular-data-graph.properties" />
+ </fileset>
+ </copy>
</target>
<!--
--
GitLab