From 80c089c82b6d518b3252bb76b97ade29bbf8886e Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Tue, 9 Jun 2009 07:10:03 +0000
Subject: [PATCH] LMS-916 refactor datastore_server build.xml in order to be
usable by RTD projects
SVN: 11286
---
datastore_server/.classpath | 8 ++++----
datastore_server/build/build.xml | 25 +++++++++++++------------
2 files changed, 17 insertions(+), 16 deletions(-)
diff --git a/datastore_server/.classpath b/datastore_server/.classpath
index 21c4e2e5e16..5690297cf29 100644
--- a/datastore_server/.classpath
+++ b/datastore_server/.classpath
@@ -3,21 +3,21 @@
<classpathentry kind="src" path="source/java"/>
<classpathentry kind="src" path="sourceTest/java"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src" path="/common"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/common"/>
<classpathentry kind="lib" path="/libraries/log4j/log4j.jar" sourcepath="/libraries/log4j/src.zip"/>
<classpathentry kind="lib" path="/libraries/commons-lang/commons-lang.jar" sourcepath="/libraries/commons-lang/src.zip"/>
<classpathentry kind="lib" path="/libraries/commons-io/commons-io.jar" sourcepath="/libraries/commons-io/src.zip"/>
<classpathentry kind="lib" path="/libraries/testng/testng-jdk15.jar" sourcepath="/libraries/testng/src.zip"/>
<classpathentry kind="lib" path="/libraries/mail/mail.jar"/>
<classpathentry kind="lib" path="/libraries/jmock/jmock.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/bds"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/bds"/>
<classpathentry kind="lib" path="/libraries/restrictionchecker/restrictions.jar"/>
<classpathentry kind="lib" path="/libraries/cglib/cglib-nodep.jar"/>
<classpathentry kind="lib" path="/libraries/jmock/hamcrest/hamcrest-core.jar"/>
<classpathentry kind="lib" path="/libraries/jmock/hamcrest/hamcrest-library.jar"/>
<classpathentry kind="lib" path="/libraries/jmock/objenesis/objenesis-1.0.jar"/>
- <classpathentry combineaccessrules="false" kind="src" path="/openbis"/>
- <classpathentry combineaccessrules="false" kind="src" path="/server-common"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/openbis"/>
+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/server-common"/>
<classpathentry kind="lib" path="/libraries/jetty/jetty.jar" sourcepath="/libraries/jetty/src/jetty.zip"/>
<classpathentry kind="lib" path="/libraries/jetty/jetty-util.jar" sourcepath="/libraries/jetty/src/jetty-util.zip"/>
<classpathentry kind="lib" path="/libraries/jetty/servlet-api-2.5.jar" sourcepath="/libraries/jetty/src/servlet-api-2.5.zip"/>
diff --git a/datastore_server/build/build.xml b/datastore_server/build/build.xml
index 0ea876e405b..a498d0ce991 100644
--- a/datastore_server/build/build.xml
+++ b/datastore_server/build/build.xml
@@ -2,11 +2,11 @@
<import file="../../build_resources/ant/build-common.xml" />
<project-classpath name="ecp" classes="${classes}" />
- <property name="original.dist" value="dist" />
- <property name="mainfolder" value="datastore_server" />
- <property name="dist.datastore_server" value="${dist}/${mainfolder}" />
+ <property name="dss.original.dist" value="../datastore_server/dist" />
+ <property name="dss" value="datastore_server" />
+ <property name="dist.datastore_server" value="${dist}/${dss}" />
<property name="dist.datastore_server.lib" value="${dist.datastore_server}/lib" />
- <property name="jar.file" value="${dist.datastore_server.lib}/datastore_server.jar" />
+ <property name="dss-jar.file" value="${dist.datastore_server.lib}/datastore_server.jar" />
<property name="dist.file.prefix" value="${dist}/datastore_server" />
<property name="nativesrc" value="${lib}/unix/native" />
<property name="nativeroot" value="${targets}/ant" />
@@ -24,7 +24,7 @@
</antcall>
</target>
- <target name="jar" depends="compile">
+ <target name="dss-jar" depends="compile">
<mkdir dir="${dist.datastore_server.lib}" />
<build-info revision="revision.number" version="version.number" clean="clean.flag" />
<echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
@@ -33,7 +33,7 @@
<include name="**/unix.so" />
</fileset>
</copy>
- <recursive-jar destfile="${jar.file}">
+ <recursive-jar destfile="${dss-jar.file}">
<fileset dir="${classes}">
<include name="**/*.class" />
<include name="${build.info.filename}" />
@@ -53,7 +53,7 @@
value="${version.number} (r${revision.number},${clean.flag})" />
</manifest>
</recursive-jar>
- <jar update="true" destfile="${jar.file}">
+ <jar update="true" destfile="${dss-jar.file}">
<fileset dir="${sources}">
<include name="**/*.xml" />
</fileset>
@@ -62,7 +62,8 @@
</jar>
</target>
- <target name="dist" depends="jar">
+ <target name="dist" depends="dss-jar">
+ <copy file="${dss-jar.file}" todir="${dist.datastore_server.lib}" />
<copy file="${lib}/cisd-base/cisd-base.jar" todir="${dist.datastore_server.lib}" />
<copy file="${lib}/cisd-args4j/cisd-args4j.jar" todir="${dist.datastore_server.lib}" />
<copy file="${lib}/cifex/cifex.jar" todir="${dist.datastore_server.lib}" />
@@ -86,11 +87,11 @@
<copy file="${lib}/fast-md5/fast-md5.jar" todir="${dist.datastore_server.lib}" />
<property name="dist.file"
value="${dist.file.prefix}-${version.number}-r${revision.number}.zip" />
- <zip basedir="${dist}" destfile="${dist.file}">
- <zipfileset dir="${original.dist}" excludes="**/datastore_server.sh" prefix="${mainfolder}" />
- <zipfileset file="${original.dist}/datastore_server.sh"
+ <zip basedir="${dist}" destfile="${dist.file}" excludes="*.zip *.jar">
+ <zipfileset dir="${dss.original.dist}" excludes="**/datastore_server.sh" prefix="${dss}" />
+ <zipfileset file="${dss.original.dist}/datastore_server.sh"
filemode="755"
- prefix="${mainfolder}" />
+ prefix="${dss}" />
</zip>
<delete dir="${dist.datastore_server}" />
</target>
--
GitLab