Author: rjung
Date: Sun Oct 4 11:44:25 2009
New Revision: 821515
URL: http://svn.apache.org/viewvc?rev=821515&view=rev
Log:
Remove examples and test related build target
from TC 5.5 jni build.xml, because those
need the native sources, and the tc 5.5 part of
jni only contains the Java parts.
Modified:
tomcat/tc5.5.x/trunk/connectors/jni/build.xml
Modified: tomcat/tc5.5.x/trunk/connectors/jni/build.xml
URL:
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/connectors/jni/build.xml?rev=821515&r1=821514&r2=821515&view=diff
==============================================================================
--- tomcat/tc5.5.x/trunk/connectors/jni/build.xml (original)
+++ tomcat/tc5.5.x/trunk/connectors/jni/build.xml Sun Oct 4 11:44:25 2009
@@ -20,10 +20,12 @@
<!-- Give user a chance to override without editing this file
(and without typing -D each time it compiles it
-->
- <property file="${user.home}/.ant.properties" />
<property file="${user.home}/build.properties" />
- <property file=".ant.properties" />
+ <property file="../../build/build.properties" />
+ <property file="../build.properties" />
<property file="build.properties" />
+ <property file="../../build/build.properties.default"/>
+ <property file="../build.properties.default"/>
<property file="build.properties.default"/>
<!-- Initialization properties -->
@@ -37,10 +39,6 @@
<property name="version.patch" value="0" />
<property name="version.suffix" value="-dev" />
- <property name="junit.home" value="/usr/local/junit3.8"/>
- <property name="junit.jar" value="${junit.home}/junit.jar"/>
- <property name="test.runner" value="junit.textui.TestRunner"/>
-
<property name="version"
value="${version.major}.${version.minor}.${version.build}${version.suffix}" />
<property name="version.number"
value="${version.major}.${version.minor}.${version.build}.${version.patch}" />
<property name="version.major.minor"
value="${version.major}.${version.minor}" />
@@ -50,9 +48,9 @@
<property name="build.dir" value="./dist"/>
<property name="build.src" value="${build.dir}/src"/>
<property name="build.dest" value="${build.dir}/classes"/>
- <property name="src.dir" value="."/>
<property name="dist.root" value="./dist"/>
- <property name="ant.home" value="."/>
+
+ <property name="src.dir" value="."/>
<property name="debug" value="off"/>
<property name="optimize" value="on"/>
@@ -61,10 +59,6 @@
<property name="docs.src" value="./xdocs"/>
<property name="docs.dest" value="${dist.root}/doc"/>
<property name="docs.dest.print" value="${dist.root}/doc/printable"/>
- <property name="test.dir" value="${build.dest}/test"/>
- <property name="examples.dir" value="${build.dest}/examples"/>
-
- <property name="tc.library.path" value="${basedir}/native/.libs"/>
<!-- The base directory for component sources -->
<property name="source.home" value="java"/>
@@ -74,36 +68,12 @@
<pathelement location="${build.dest}/java"/>
</path>
- <!-- Test classpath -->
- <path id="test.classpath">
- <pathelement location="${build.dest}/java"/>
- <pathelement location="${build.dest}/test"/>
- <pathelement location="${junit.jar}"/>
- </path>
-
- <!-- Examples classpath -->
- <path id="examples.classpath">
- <pathelement location="${build.dest}/java"/>
- <pathelement location="${build.dest}/examples"/>
- </path>
-
<!-- ===================================================================
-->
<!-- prints the environment
-->
<!-- ===================================================================
-->
- <target name="env">
- <echo message="java.home = ${java.home}"/>
- <echo message="user.home = ${user.home}"/>
- <!--
- <echo message="java.class.path = ${java.class.path}"/>
- -->
- <echo message="tc.library.path = ${tc.library.path}"/>
- <echo message=""/>
- </target>
-
- <target name="prepare" depends="env">
+ <target name="prepare">
<mkdir dir="${build.dir}"/>
</target>
-
<!-- ===================================================================
-->
<!-- Creates the API documentation
-->
<!-- ===================================================================
-->
@@ -181,7 +151,6 @@
</fileset>
</copy>
</target>
-
<target name="compile-only"
description="Compile shareable components">
@@ -198,46 +167,6 @@
</copy>
</target>
- <!-- ===================================================================
-->
- <!-- Compiles the examples directory
-->
- <!-- ===================================================================
-->
- <target name="examples" depends="compile">
- <mkdir dir="${build.dest}"/>
- <mkdir dir="${build.dest}/examples"/>
- <mkdir dir="${build.src}"/>
- <mkdir dir="${build.src}/examples"/>
- <tstamp>
- <format property="TODAY" pattern="MMM d yyyy" locale="en"/>
- <format property="TSTAMP" pattern="hh:mm:ss"/>
- </tstamp>
- <!-- Copy static resource files -->
- <filter token="VERSION" value="${version}"/>
- <filter token="VERSION_NUMBER" value="${version.number}"/>
- <filter token="VERSION_BUILT" value="${TODAY} ${TSTAMP}"/>
- <copy todir="${build.src}/examples" filtering="yes"
encoding="ISO-8859-1">
- <fileset dir="${src.dir}/examples">
- <include name="**/*.java"/>
- <include name="**/*.xml"/>
- <include name="**/*.properties"/>
- </fileset>
- </copy>
-
- <javac srcdir="${build.src}/examples"
- destdir="${build.dest}/examples"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- encoding="ISO-8859-1">
- <classpath refid="examples.classpath"/>
- </javac>
- <copy todir="${build.dest}/examples" filtering="yes"
encoding="ISO-8859-1">
- <fileset dir="${build.src}/examples">
- <include name="**/*.xml"/>
- <include name="**/*.properties"/>
- </fileset>
- </copy>
- </target>
-
<!-- ================================================================== -->
<!-- Make Tomcat Native jar -->
<!-- ================================================================== -->
@@ -260,105 +189,4 @@
</manifest>
</jar>
</target>
-
- <!-- ===================================================================
-->
- <!-- Compiles the test directory
-->
- <!-- ===================================================================
-->
- <target name="compile-tests" depends="compile">
- <mkdir dir="${build.dest}/test"/>
- <mkdir dir="${build.src}/test"/>
- <copy todir="${build.src}/test" filtering="yes" encoding="ISO-8859-1">
- <fileset dir="${src.dir}/test">
- <include name="**/*.java"/>
- <include name="**/*.xml"/>
- <include name="**/*.properties"/>
- </fileset>
- </copy>
- <javac srcdir="${build.src}/test"
- destdir="${build.dest}/test"
- debug="on"
- deprecation="${deprecation}"
- optimize="${optimize}"
- encoding="ISO-8859-1">
- <classpath refid="test.classpath"/>
- </javac>
- </target>
-
- <!-- ===================================================================
-->
- <!-- Junit tests
-->
- <!-- ===================================================================
-->
- <target name="test" depends="compile-tests">
- <echo message="Running Tomcat Native package tests ..."/>
- <java dir="${test.dir}" classname="${test.runner}" fork="yes"
failonerror="${test.failonerror}">
- <arg value="org.apache.tomcat.jni.FileTestSuite"/>
- <classpath refid="test.classpath"/>
- <env key="PATH" path="${tc.library.path}:${java.library.path}"/>
- <env key="Path" path="${tc.library.path}:${java.library.path}"/>
- <jvmarg value="-Djava.library.path=${tc.library.path}"/>
- </java>
- <java dir="${test.dir}" classname="${test.runner}" fork="yes"
failonerror="${test.failonerror}">
- <arg value="org.apache.tomcat.jni.SocketServerTestSuite"/>
- <classpath refid="test.classpath"/>
- <env key="PATH" path="${tc.library.path}:${java.library.path}"/>
- <env key="Path" path="${tc.library.path}:${java.library.path}"/>
- <jvmarg value="-Djava.library.path=${tc.library.path}"/>
- </java>
- </target>
-
- <!-- ===================================================================
-->
- <!-- Compiles the examples directory
-->
- <!-- ===================================================================
-->
- <target name="compile-examples" depends="compile">
- <mkdir dir="${build.dest}/examples"/>
- <mkdir dir="${build.src}/examples"/>
- <copy todir="${build.src}/examples" filtering="yes"
encoding="ISO-8859-1">
- <fileset dir="${src.dir}/examples">
- <include name="**/*.java"/>
- <include name="**/*.xml"/>
- <include name="**/*.properties"/>
- </fileset>
- </copy>
- <javac srcdir="${build.src}/examples"
- destdir="${build.dest}/examples"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- encoding="ISO-8859-1">
- <classpath refid="examples.classpath"/>
- </javac>
- </target>
-
- <!-- ===================================================================
-->
- <!-- excutes the examples
-->
- <!-- ===================================================================
-->
- <target name="echo-example" depends="examples">
- <echo message="Running Tomcat Native Echo example ..."/>
- <java dir="${examples.dir}" classname="org.apache.tomcat.jni.Echo"
- fork="yes" failonerror="${test.failonerror}">
- <classpath refid="examples.classpath"/>
- <env key="PATH" path="${tc.library.path}:${java.library.path}"/>
- <env key="Path" path="${tc.library.path}:${java.library.path}"/>
- <jvmarg value="-Djava.library.path=${tc.library.path}"/>
- </java>
- </target>
- <target name="server-example" depends="examples">
- <echo message="Running Tomcat Native SSL Server example ..."/>
- <java dir="${examples.dir}" classname="org.apache.tomcat.jni.SSLServer"
- fork="yes" failonerror="${test.failonerror}">
- <env key="PATH" path="${tc.library.path}:${java.library.path}"/>
- <env key="Path" path="${tc.library.path}:${java.library.path}"/>
- <classpath refid="examples.classpath"/>
- <jvmarg value="-Djava.library.path=${tc.library.path}"/>
- </java>
- </target>
- <target name="locals-example" depends="examples">
- <echo message="Running Tomcat Native Local Server example ..."/>
- <java dir="${examples.dir}"
classname="org.apache.tomcat.jni.LocalServer"
- fork="yes" failonerror="${test.failonerror}">
- <classpath refid="examples.classpath"/>
- <env key="PATH" path="${tc.library.path}:${java.library.path}"/>
- <env key="Path" path="${tc.library.path}:${java.library.path}"/>
- <jvmarg value="-Djava.library.path=${tc.library.path}"/>
- </java>
- </target>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
