From 1b5087b6eb898af4df29dc163e9229b5f63c557b Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Sat, 17 Dec 2011 19:27:45 +0000
Subject: [PATCH] Move base.tests from sourceTest to source so that it becomes
part of cisd-base.jar. Remove ant task jar-test-complete as it duplicates
jar-test.
SVN: 24025
---
base/build/build.xml | 44 +------------------
.../tests/AbstractFileSystemTestCase.java | 0
2 files changed, 1 insertion(+), 43 deletions(-)
rename base/{sourceTest => source}/java/ch/systemsx/cisd/base/tests/AbstractFileSystemTestCase.java (100%)
diff --git a/base/build/build.xml b/base/build/build.xml
index cf36a1c0e2d..a029e57d89b 100644
--- a/base/build/build.xml
+++ b/base/build/build.xml
@@ -11,7 +11,6 @@
<property name="jar.file" value="${dist}/cisd-base.jar" />
<property name="dist.file" value="${dist}/cisd-base" />
<property name="jar.test.file" value="${dist}/cisd-base-test.jar" />
- <property name="jar.test.complete.file" value="${dist}/cisd-base-test-complete.jar" />
<property name="src.zip.file" value="${dist}/cisd-base-src.zip" />
<property name="javadoc.zip.file" value="${dist}/cisd-base-javadoc.zip" />
<property name="original.dist" value="../${ant.project.name}/dist" />
@@ -102,47 +101,6 @@
</recursive-jar>
</target>
- <target name="jar-test-complete" depends="compile-tests">
- <mkdir dir="${dist.common.lib}" />
- <build-info revision="revision.number" version="version.number" clean="clean.flag" />
- <echo file="${build.info.file}">${version.number}:${revision.number}:${clean.flag}</echo>
- <copy todir="${native}">
- <fileset dir="${nativesrc1}">
- <include name="**/libunix.so" />
- <include name="**/libunix.jnilib" />
- </fileset>
- </copy>
- <copy todir="${native}">
- <fileset dir="${nativesrc2}">
- <include name="**/libnativedata.so" />
- <include name="**/libnativedata.jnilib" />
- <include name="**/nativedata.dll" />
- </fileset>
- </copy>
- <recursive-jar destfile="${jar.test.complete.file}">
- <fileset dir="${classes}">
- <include name="**/*.class" />
- <include name="${build.info.filename}" />
- </fileset>
- <fileset dir="${nativeroot}">
- <include name="**/libunix.so" />
- <include name="**/libunix.jnilib" />
- <include name="**/libnativedata.so" />
- <include name="**/libnativedata.jnilib" />
- <include name="**/nativedata.dll" />
- </fileset>
- <zipfileset src="${lib}/testng/testng-jdk15.jar" />
- <zipfileset src="${lib}/commons-lang/commons-lang.jar" />
- <zipfileset src="${lib}/commons-io/commons-io.jar" />
- <manifest>
- <attribute name="Main-Class" value="ch.systemsx.cisd.base.AllTests" />
- <attribute name="Version" value="${version.number}" />
- <attribute name="Build-Number"
- value="${version.number} (r${revision.number},${clean.flag})" />
- </manifest>
- </recursive-jar>
- </target>
-
<target name="src-zip">
<build-info revision="revision.number" version="version.number" clean="clean.flag" />
<mkdir dir="${classes}" />
@@ -169,7 +127,7 @@
<delete dir="targets/doc" />
<javadoc sourcepath="source/java"
packagenames="ch.systemsx.cisd.base.*"
- classpath="../libraries/commons-lang/commons-lang.jar:../libraries/commons-io/commons-io.jar:../libraries/restrictionchecker/restrictions.jar"
+ classpath="../libraries/commons-lang/commons-lang.jar:../libraries/commons-io/commons-io.jar:../libraries/testng/testng-jdk15.jar:../libraries/restrictionchecker/restrictions.jar"
destdir="targets/doc"
access="public" />
</target>
diff --git a/base/sourceTest/java/ch/systemsx/cisd/base/tests/AbstractFileSystemTestCase.java b/base/source/java/ch/systemsx/cisd/base/tests/AbstractFileSystemTestCase.java
similarity index 100%
rename from base/sourceTest/java/ch/systemsx/cisd/base/tests/AbstractFileSystemTestCase.java
rename to base/source/java/ch/systemsx/cisd/base/tests/AbstractFileSystemTestCase.java
--
GitLab