From e1578c8ffd59d56992b5bb89b3767ee6350fda7b Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Sun, 29 Mar 2009 06:45:41 +0000
Subject: [PATCH] add: output of platform add: target for test-jar file
SVN: 10397
---
base/build/build.xml | 138 +++++++++++-------
.../ch/systemsx/cisd/base/unix/UnixTests.java | 3 +
2 files changed, 89 insertions(+), 52 deletions(-)
diff --git a/base/build/build.xml b/base/build/build.xml
index 2d71d420de2..55f7dcd841a 100644
--- a/base/build/build.xml
+++ b/base/build/build.xml
@@ -1,56 +1,90 @@
-<project name="base" default="jar" basedir="..">
- <target name="clean">
- <delete dir="${dist}" />
- </target>
-
- <import file="../../build_resources/ant/build-common.xml" />
-
- <project-classpath name="ecp" classes="${classes}" />
- <property name="mainfolder" value="base" />
- <property name="jar.file" value="${dist}/cisd-base.jar" />
- <property name="nativesrc" value="${lib}/unix/native" />
- <property name="nativeroot" value="${targets}/ant" />
- <property name="native" value="${nativeroot}/native" />
-
- <property name="dist.common" value="${dist}/${mainfolder}" />
- <property name="dist.common.lib" value="${dist.common}/lib" />
-
-
- <target name="ci" depends="build-common.ci, check-dependencies" />
-
- <target name="jar" 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="${nativesrc}">
- <include name="**/unix.so" />
- </fileset>
- </copy>
- <recursive-jar destfile="${jar.file}">
- <fileset dir="${classes}">
- <include name="**/*.class" />
- <include name="${build.info.filename}" />
- </fileset>
- <fileset dir="${nativeroot}">
- <include name="**/unix.so" />
- </fileset>
- <manifest>
- <attribute name="Main-Class" value="ch.systemsx.cisd.base.utilities.BuildAndEnvironmentInfo" />
- <attribute name="Version" value="${version.number}" />
- <attribute name="Build-Number"
- value="${version.number} (r${revision.number},${clean.flag})" />
- </manifest>
- </recursive-jar>
- </target>
-
- <!--
+<project name="base" default="dist" basedir="..">
+ <target name="clean">
+ <delete dir="${dist}" />
+ </target>
+
+ <import file="../../build_resources/ant/build-common.xml" />
+
+ <project-classpath name="ecp" classes="${classes}" />
+ <property name="mainfolder" value="base" />
+ <property name="jar.file" value="${dist}/cisd-base.jar" />
+ <property name="jar.test.file" value="${dist}/cisd-base-test.jar" />
+ <property name="nativesrc" value="${lib}/unix/native" />
+ <property name="nativeroot" value="${targets}/ant" />
+ <property name="native" value="${nativeroot}/native" />
+
+ <property name="dist.common" value="${dist}/${mainfolder}" />
+ <property name="dist.common.lib" value="${dist.common}/lib" />
+
+
+ <target name="ci" depends="build-common.ci, check-dependencies" />
+
+ <target name="dist" depends="clean, jar" />
+
+ <target name="jar" depends="compile">
+ <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="${nativesrc}">
+ <include name="**/unix.so" />
+ </fileset>
+ </copy>
+ <recursive-jar destfile="${jar.file}">
+ <fileset dir="${classes}">
+ <include name="**/*.class" />
+ <include name="${build.info.filename}" />
+ </fileset>
+ <fileset dir="${nativeroot}">
+ <include name="**/unix.so" />
+ </fileset>
+ <manifest>
+ <attribute name="Main-Class"
+ value="ch.systemsx.cisd.base.utilities.BuildAndEnvironmentInfo" />
+ <attribute name="Version" value="${version.number}" />
+ <attribute name="Build-Number"
+ value="${version.number} (r${revision.number},${clean.flag})" />
+ </manifest>
+ </recursive-jar>
+ </target>
+
+ <target name="jar-test" 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="${nativesrc}">
+ <include name="**/unix.so" />
+ </fileset>
+ </copy>
+ <recursive-jar destfile="${jar.test.file}">
+ <fileset dir="${classes}">
+ <include name="**/*.class" />
+ <include name="${build.info.filename}" />
+ </fileset>
+ <fileset dir="${nativeroot}">
+ <include name="**/unix.so" />
+ </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.unix.UnixTests" />
+ <attribute name="Version" value="${version.number}" />
+ <attribute name="Build-Number"
+ value="${version.number} (r${revision.number},${clean.flag})" />
+ </manifest>
+ </recursive-jar>
+ </target>
+
+ <!--
// Runs the test suite 'tests.xml'.
-->
- <target name="run-tests" description="Runs the test suite 'tests.xml'.">
- <antcall target="build-common.run-tests">
- <param name="test.suite" value="tests.xml" />
- </antcall>
- </target>
+ <target name="run-tests" description="Runs the test suite 'tests.xml'.">
+ <antcall target="build-common.run-tests">
+ <param name="test.suite" value="tests.xml" />
+ </antcall>
+ </target>
</project>
\ No newline at end of file
diff --git a/base/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java b/base/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
index bd69d2db785..db064daf1ff 100644
--- a/base/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
+++ b/base/sourceTest/java/ch/systemsx/cisd/base/unix/UnixTests.java
@@ -35,6 +35,7 @@ import ch.systemsx.cisd.base.tests.AbstractFileSystemTestCase;
import ch.systemsx.cisd.base.unix.Unix.Group;
import ch.systemsx.cisd.base.unix.Unix.Password;
import ch.systemsx.cisd.base.unix.Unix.Stat;
+import ch.systemsx.cisd.base.utilities.BuildAndEnvironmentInfo;
/**
* Test cases for the {@link Unix} system calls.
@@ -276,6 +277,8 @@ public class UnixTests extends AbstractFileSystemTestCase
public static void main(String[] args) throws Throwable
{
+ System.out.println(BuildAndEnvironmentInfo.INSTANCE);
+ System.out.println();
final UnixTests test = new UnixTests();
try
{
--
GitLab