You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/09/13 21:32:56 UTC
cvs commit: jakarta-turbine-flux build.properties build.xml
jvanzyl 01/09/13 12:32:56
Added: . Tag: T_2_1_BRANCH build.properties build.xml
Log:
- moving build to the top level directory
- giving the flux jar a version keyed off 2.x so that
the different versions of flux don't interfere in ${lib.repo}
Revision Changes Path
No revision
No revision
1.1.2.1 +22 -7 jakarta-turbine-flux/build.properties
Index: build.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-flux/build.properties,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- build.properties 2001/08/12 20:51:59 1.1
+++ build.properties 2001/09/13 19:32:56 1.1.2.1
@@ -1,7 +1,22 @@
-servlet.jar = ${lib.repo}/servlet.jar
-turbine.jar = ${lib.repo}/turbine-3.0-dev.jar
-fulcrum.jar = ${lib.repo}/fulcrum-1.0.jar
-velocity.jar = ${lib.repo}/velocity-1.2-dev.jar
-torque.jar = ${lib.repo}/torque-1.0.jar
-commons-util.jar = ${lib.repo}/commons-util-0.1-dev.jar
-jaf.jar = ${lib.repo}/activation-1.0.1.jar
+name = flux
+version = 2.1
+project = flux
+build.compiler = classic
+build.dir = ./bin
+build.dest = ./bin/classes
+src.dir = ./src
+java.src.dir = ./src/java
+template.src.dir = ./src/templates
+resources.src.dir = ./src/resources
+final.name = ${project}-${version}
+final.dir = ../${final.name}/
+ant.home = .
+debug = on
+optimize = off
+deprecation = off
+
+servlet.jar = ${lib.repo}/servlet.jar
+turbine.jar = ${lib.repo}/turbine-2.1.jar
+velocity.jar = ${lib.repo}/velocity-1.2-dev.jar
+jaf.jar = ${lib.repo}/activation-1.0.1.jar
+ecs.jar = ${lib.repo}/ecs-1.4.1.jar
1.5.2.1 +17 -174 jakarta-turbine-flux/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-flux/build.xml,v
retrieving revision 1.5
retrieving revision 1.5.2.1
diff -u -r1.5 -r1.5.2.1
--- build.xml 2001/08/12 22:42:47 1.5
+++ build.xml 2001/09/13 19:32:56 1.5.2.1
@@ -1,183 +1,22 @@
<?xml version="1.0"?>
-<!-- Build file for application -->
-<project name="admin" default="jar" basedir=".">
+<project name="admin" default="compile" basedir=".">
- <!-- Allow any user specific values to override the defaults -->
<property file="${user.home}/build.properties" />
-
- <!-- Set default values for the build -->
<property file="build.properties" />
- <property name="name" value="flux"/>
- <property name="version" value="0.1"/>
- <property name="project" value="flux"/>
- <property name="build.compiler" value="classic"/>
- <property name="build.dir" value="./bin"/>
- <property name="build.dest" value="./bin/classes"/>
- <property name="src.dir" value="./src"/>
- <property name="java.src.dir" value="./src/java"/>
- <property name="template.src.dir" value="./src/templates"/>
- <property name="resources.src.dir" value="./src/resources"/>
- <property name="final.name" value="${project}-${version}"/>
- <property name="ant.home" value="."/>
- <property name="debug" value="on"/>
- <property name="optimize" value="off"/>
- <property name="deprecation" value="off"/>
-
- <property name="project.home" value="project"/>
- <property name="project.props" value="${project.home}/${project}.properties"/>
- <property file="${project.props}"/>
-
<path id="classpath">
+ <pathelement location="${ecs.jar}"/>
+ <pathelement location="${jaf.jar}"/>
<pathelement location="${servlet.jar}"/>
<pathelement location="${turbine.jar}"/>
- <pathelement location="${fulcrum.jar}"/>
<pathelement location="${velocity.jar}"/>
- <pathelement location="${torque.jar}"/>
- <pathelement location="${commons-util.jar}"/>
- <pathelement location="${jaf.jar}"/>
</path>
<!-- ================================================================== -->
- <!-- Prints useful build environment values -->
- <!-- ================================================================== -->
-
- <target name="env" depends="check_available">
- <echo message="java.home = ${java.home}"/>
- <echo message="user.home = ${user.home}"/>
- <echo message="lib.repo = ${lib.repo}"/>
-
- <echo message="servlet.jar = ${servlet.jar}"/>
- <echo message="turbine.jar = ${turbine.jar}"/>
- <echo message="fulcrum.jar = ${fulcrum.jar}"/>
- <echo message="velocity.jar = ${velocity.jar}"/>
- <echo message="torque.jar = ${torque.jar}"/>
- <echo message="commons-util.jar = ${commons-util.jar}"/>
- <echo message="jaf.jar = ${jaf.jar}"/>
- </target>
-
- <!-- ================================================================== -->
- <!-- Check to see what optional dependencies are available -->
- <!-- ================================================================== -->
-
- <target name="check_available">
- <available
- classname="javax.servlet.http.HttpServletRequest"
- property="servlet.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.turbine.Turbine"
- property="turbine.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.fulcrum.BaseService"
- property="fulcrum.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.velocity.runtime.Runtime"
- property="velocity.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.torque.Torque"
- property="torque.present"
- classpathref="classpath"
- />
-
- <available
- classname="org.apache.commons.util.exception.NestableException"
- property="commons-util.present"
- classpathref="classpath"
- />
-
- <available
- classname="javax.activation.DataSource"
- property="jaf.present"
- classpathref="classpath"
- />
- </target>
-
- <target name="check.servlet" unless="servlet.present">
- <antcall target="property-warning">
- <param name="name" value="servlet.jar"/>
- <param name="value" value="${servlet.jar}"/>
- </antcall>
- </target>
-
- <target name="check.turbine" unless="turbine.present">
- <antcall target="property-warning">
- <param name="name" value="turbine.jar"/>
- <param name="value" value="${turbine.jar}"/>
- </antcall>
- </target>
-
- <target name="check.fulcrum" unless="fulcrum.present">
- <antcall target="property-warning">
- <param name="name" value="fulcrum.jar"/>
- <param name="value" value="${fulcrum.jar}"/>
- </antcall>
- </target>
-
- <target name="check.velocity" unless="velocity.present">
- <antcall target="property-warning">
- <param name="name" value="velocity.jar"/>
- <param name="value" value="${velocity.jar}"/>
- </antcall>
- </target>
-
- <target name="check.torque" unless="torque.present">
- <antcall target="property-warning">
- <param name="name" value="torque.jar"/>
- <param name="value" value="${torque.jar}"/>
- </antcall>
- </target>
-
- <target name="check.commons-util" unless="commons-util.present">
- <antcall target="property-warning">
- <param name="name" value="commons-util.jar"/>
- <param name="value" value="${commons-util.jar}"/>
- </antcall>
- </target>
-
- <target name="check.jaf" unless="jaf.present">
- <antcall target="property-warning">
- <param name="name" value="jaf.jar"/>
- <param name="value" value="${jaf.jar}"/>
- </antcall>
- </target>
-
- <target name="property-warning">
- <echo>
- +----------------------------------------------------------------+
- + F A I L E D R E Q U I R E M E N T |
- +----------------------------------------------------------------+
- | You must define the following property in order |
- | to build Torque: |
- | |
- | ${name} = ${value}
- | |
- | You can set this property in the provided build.properties |
- | file, or you may set this property in your |
- | ${user.home}/build.properties file.
- +----------------------------------------------------------------+
- </echo>
- <fail message="Failed Requirement"/>
- </target>
-
- <!-- ================================================================== -->
<!-- Prepares the build directory -->
<!-- ================================================================== -->
- <target name="prepare" depends="env,check.servlet,check.turbine,
- check.fulcrum,check.velocity,check.torque,
- check.commons-util,check.jaf">
+ <target name="prepare">
<mkdir dir="${build.dest}"/>
</target>
@@ -187,7 +26,7 @@
<target name="compile"
depends="prepare"
description="--> compiles the source code">
-
+
<javac srcdir="${java.src.dir}"
destdir="${build.dest}"
debug="${debug}"
@@ -203,20 +42,29 @@
<target name="jar"
depends="compile"
description="--> generates the .jar file">
-
<jar jarfile="${build.dir}/${final.name}.jar">
<fileset dir="${build.dest}"/>
<fileset dir="${src.dir}">
<exclude name="**/java/**"/>
+ <exclude name="**/templates/**"/>
</fileset>
+ <fileset dir="${src.dir}/templates"/>
</jar>
</target>
<!-- ================================================================== -->
+ <!-- Cleans up the build directory -->
+ <!-- ================================================================== -->
+ <target name="clean" description="--> cleans up the build directory">
+ <delete dir="${build.dir}"/>
+ </target>
+
+ <!-- ================================================================== -->
<!-- I N S T A L L J A R -->
<!-- ================================================================== -->
+
<target name="install-jar" depends="jar"
- description="==> Installs .jar file in ${lib.repo}">
+ description="--> Installs .jar file in ${lib.repo}">
<copy todir="${lib.repo}" filtering="no">
<fileset dir="${build.dir}">
<include name="${final.name}.jar"/>
@@ -224,12 +72,7 @@
</copy>
</target>
- <!-- ================================================================== -->
- <!-- Cleans up the build directory -->
- <!-- ================================================================== -->
- <target name="clean" description="--> cleans up the build directory">
- <delete dir="${build.dir}"/>
- </target>
+
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org