Thread: [Ejtools-cvs] CVS: build build.xml,1.1,1.2 build_application.xml,1.1,1.2 general.properties,1.1,1.2
Brought to you by:
letiemble
From: Laurent E. <let...@us...> - 2002-04-26 06:19:29
|
Update of /cvsroot/ejtools/build In directory usw-pr-cvs1:/tmp/cvs-serv13657/build Modified Files: build.xml build_application.xml general.properties Log Message: Add some comments Add some new libraries Index: build.xml =================================================================== RCS file: /cvsroot/ejtools/build/build.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build.xml 17 Apr 2002 20:48:54 -0000 1.1 --- build.xml 26 Apr 2002 06:19:26 -0000 1.2 *************** *** 1,18 **** ! <project name="Overall Build File" default="dist" basedir=".."> ! <!-- ==================== Global Definitions ======================== --> <property file="build/general.properties"/> <property file="build/location.properties"/> <property file="build/switch.properties"/> - - <!-- ==================== Everything Target ===================================== --> ! <target name="everything" depends="clean, build, javadoc, todo, website" description=""> ! </target> ! <!-- ==================== Rebuild Target ===================================== --> ! <target name="rebuild" depends="clean, build" description=""> </target> ! ! <!-- ==================== Build Target ===================================== --> <target name="build" description=""> <antcall target="sub"> --- 1,51 ---- ! <project name="EJTools Build File" default="dist" basedir=".."> ! <!-- ======================================== --> ! <!-- Global Definitions --> ! <!-- ======================================== --> <property file="build/general.properties"/> <property file="build/location.properties"/> <property file="build/switch.properties"/> <!-- ==================== Everything Target ===================================== --> ! <target name="everything" depends="clean, build, logo, dist, webapp, javadoc, todo, package, website" description=""/> <!-- ==================== Rebuild Target ===================================== --> ! <target name="rebuild" depends="clean, build" description=""/> ! <!-- ======================================== --> ! <!-- Displayed on demand or on failure --> ! <!-- ======================================== --> ! <target name="help" description=""> ! <echo message="------------------------------------------------------------"/> ! <echo message="EJTools Build System Help :"/> ! <echo/> ! <echo message="everything : Blah Blah"/> ! <echo message="build : Blah Blah"/> ! <echo message="dist : Blah Blah"/> ! <echo message="clean : Blah Blah"/> ! <echo message="webapp : Blah Blah"/> ! <echo message="javadoc : Blah Blah"/> ! <echo message="todo : Blah Blah"/> ! <echo message="logo : Blah Blah"/> ! <echo message="package : Blah Blah"/> ! <echo message="tarball : Blah Blah"/> ! <echo message="------------------------------------------------------------"/> </target> ! <!-- ======================================== --> ! <!-- Creates the output directory for the releases --> ! <!-- ======================================== --> ! <target name="prepare" description=""> ! <mkdir dir="${output.root}"/> ! </target> ! <!-- ======================================== --> ! <!-- Delete the output directory --> ! <!-- Executes the clean target on each modules --> ! <!-- ======================================== --> ! <target name="clean" description=""> ! <delete dir="${output.root}"/> ! <antcall target="sub"> ! <param name="target" value="clean"/> ! </antcall> ! </target> ! <!-- ======================================== --> ! <!-- Executes the build target on each modules --> ! <!-- ======================================== --> <target name="build" description=""> <antcall target="sub"> *************** *** 20,39 **** </antcall> </target> ! ! <!-- ==================== Build Target ===================================== --> ! <target name="dist" description=""> <antcall target="sub"> <param name="target" value="dist"/> </antcall> </target> ! ! <!-- ==================== Web Application Target ===================================== --> ! <target name="webapp" description=""> ! <antcall target="sub.applications"> ! <param name="target" value="webapp"/> ! </antcall> ! </target> ! ! <!-- ==================== Javadoc Target ===================================== --> <target name="javadoc" description=""> <property name="generate.javadoc" value="true"/> --- 53,67 ---- </antcall> </target> ! <!-- ======================================== --> ! <!-- Executes the dist target on each modules --> ! <!-- ======================================== --> ! <target name="dist" depends="prepare" description=""> <antcall target="sub"> <param name="target" value="dist"/> </antcall> </target> ! <!-- ======================================== --> ! <!-- Executes the javadoc target on each modules --> ! <!-- ======================================== --> <target name="javadoc" description=""> <property name="generate.javadoc" value="true"/> *************** *** 42,47 **** </antcall> </target> ! ! <!-- ==================== Todo Target ===================================== --> <target name="todo" description=""> <antcall target="sub"> --- 70,76 ---- </antcall> </target> ! <!-- ======================================== --> ! <!-- Executes the todo target on each modules --> ! <!-- ======================================== --> <target name="todo" description=""> <antcall target="sub"> *************** *** 49,75 **** </antcall> </target> ! ! <!-- ==================== Todo Target ===================================== --> ! <target name="logo" description=""> <antcall target="sub.applications"> <param name="target" value="logo"/> </antcall> </target> ! ! <!-- ==================== Website Target ===================================== --> ! <target name="website" description=""> ! <ant antfile="build/build_website.xml"> ! </ant> </target> ! ! <!-- ==================== Clean Target ===================================== --> ! <target name="clean" description=""> ! <antcall target="sub"> ! <param name="target" value="clean"/> </antcall> </target> ! ! ! <!-- ==================== Sub Target ===================================== --> <target name="sub" description=""> <antcall target="sub.thirdparty"> --- 78,109 ---- </antcall> </target> ! <!-- ==================== Logo Target ===================================== --> ! <target name="logo" depends="build" description=""> <antcall target="sub.applications"> <param name="target" value="logo"/> </antcall> </target> ! <!-- ==================== Web Application Target ===================================== --> ! <target name="webapp" description=""> ! <antcall target="sub.applications"> ! <param name="target" value="webapp"/> ! </antcall> </target> ! <!-- ==================== Package Target ===================================== --> ! <target name="package" description=""> ! <antcall target="sub.applications"> ! <param name="target" value="package"/> </antcall> </target> ! <!-- ======================================== --> ! <!-- WebSite --> ! <!-- Build the EJTools website --> ! <!-- ======================================== --> ! <target name="website" depends="javadoc, todo" description=""> ! <ant antfile="build/build_website.xml"/> ! </target> ! <!-- **************************************** --> ! <!-- Generic subtask which calls the subtask for thirdparty, libraries and applications --> ! <!-- **************************************** --> <target name="sub" description=""> <antcall target="sub.thirdparty"> *************** *** 83,89 **** </antcall> </target> ! ! ! <!-- ==================== Thirdparty Target ===================================== --> <target name="sub.thirdparty" description=""> <antcall target="sub.call"> --- 117,123 ---- </antcall> </target> ! <!-- **************************************** --> ! <!-- Generic subtask which calls any target on thirdparty --> ! <!-- **************************************** --> <target name="sub.thirdparty" description=""> <antcall target="sub.call"> *************** *** 100,105 **** </antcall> </target> ! ! <!-- ==================== Libraries Target ===================================== --> <target name="sub.libraries" description=""> <antcall target="sub.call"> --- 134,140 ---- </antcall> </target> ! <!-- **************************************** --> ! <!-- Generic subtask which calls any target on lirabries --> ! <!-- **************************************** --> <target name="sub.libraries" description=""> <antcall target="sub.call"> *************** *** 134,139 **** </antcall> </target> ! ! <!-- ==================== Applications Target ===================================== --> <target name="sub.applications" description=""> <antcall target="sub.call"> --- 169,175 ---- </antcall> </target> ! <!-- **************************************** --> ! <!-- Generic subtask which calls any target on applications --> ! <!-- **************************************** --> <target name="sub.applications" description=""> <antcall target="sub.call"> *************** *** 162,167 **** </antcall> </target> ! ! <!-- ==================== Sub Target ===================================== --> <target name="sub.call" description="" if="${target}.${type}.${name}"> <ant antfile="build/build_${type}.xml" target="${target}"> --- 198,204 ---- </antcall> </target> ! <!-- **************************************** --> ! <!-- Generic subtask which calls any target on any modules --> ! <!-- **************************************** --> <target name="sub.call" description="" if="${target}.${type}.${name}"> <ant antfile="build/build_${type}.xml" target="${target}"> Index: build_application.xml =================================================================== RCS file: /cvsroot/ejtools/build/build_application.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** build_application.xml 17 Apr 2002 20:48:54 -0000 1.1 --- build_application.xml 26 Apr 2002 06:19:26 -0000 1.2 *************** *** 3,14 **** <property file="build/general.properties"/> <property file="build/location.properties"/> - <!-- ==================== Task Definitions ======================== --> <taskdef name="xmlbean" classname="com.dreambean.xmlbeans.ant.XMLBeans"/> <taskdef name="todo" classname="xdoclet.doc.DocumentDocletTask"/> - <!-- ==================== Module Definition ======================== --> <property name="module.root" value="${applications.root}/${module.name}"/> - <!-- ==================== File and Directory Names ======================== --> <property name="build.home" value="${module.root}/output"/> --- 3,11 ---- *************** *** 21,25 **** <property name="build.lib" value="${build.home}/lib"/> <property name="build.src" value="${build.home}/src"/> - <property name="dist.home" value="${module.root}/dist"/> <property name="dist.bin" value="${dist.home}/bin"/> --- 18,21 ---- *************** *** 28,37 **** <property name="dist.lib" value="${dist.home}/lib"/> <property name="dist.lib.ext" value="${dist.lib}/ext"/> - <property name="dist.webapp" value="${module.root}/webapp"/> <property name="dist.webapp.webinf" value="${dist.webapp}/WEB-INF"/> <property name="dist.webapp.webinf.classes" value="${dist.webapp.webinf}/classes"/> <property name="dist.webapp.webinf.lib" value="${dist.webapp.webinf}/lib"/> - <property name="src.home" value="${module.root}/src"/> <property name="src.bin" value="${src.home}/bin"/> --- 24,31 ---- *************** *** 43,47 **** <property name="src.webapp.content" value="${src.webapp}/content"/> <property name="src.webapp.resources" value="${src.webapp}/resources"/> - <!-- ==================== Compilation Classpath =========================== --> <path id="compile.classpath"> --- 37,40 ---- *************** *** 65,69 **** <fileset dir="${sun.swing.root}" includes="*.jar"/> </path> - <!-- ==================== Info Target ================================== --> <target name="info"> --- 58,61 ---- *************** *** 72,76 **** <echo message="------------------------------------------------------------"/> </target> - <!-- ==================== Prepare Target ================================== --> <target name="prepare" depends="info"> --- 64,67 ---- *************** *** 83,87 **** <mkdir dir="${build.lib}"/> <mkdir dir="${build.src}"/> - <mkdir dir="${dist.home}"/> <mkdir dir="${dist.bin}"/> --- 74,77 ---- *************** *** 89,173 **** <mkdir dir="${dist.lib}"/> <mkdir dir="${dist.lib.ext}"/> - <mkdir dir="${dist.webapp}"/> <mkdir dir="${dist.webapp.webinf}"/> <mkdir dir="${dist.webapp.webinf.classes}"/> <mkdir dir="${dist.webapp.webinf.lib}"/> - <available file="${module.root}/lib.properties" property="has.lib.file"/> <available file="${module.root}/lib.ext.properties" property="has.lib.ext.file"/> <available file="${src.etc}/beaninfo" property="has.dir.etc.beaninfo"/> ! ! <copy todir="${build.etc}"> ! <fileset dir="${src.etc}"> ! <include name="*.mf"/> ! </fileset> ! <filterset> ! <filter token="module.name" value="${module.display.name}"/> ! <filter token="version.major" value="${version.major}"/> ! <filter token="version.minor" value="${version.minor}"/> ! <filter token="version.revision" value="${version.revision}"/> ! <filter token="version.tag" value="${version.tag}"/> ! </filterset> ! </copy> </target> - <!-- ==================== Compile Target ================================== --> <target name="compile" depends="prepare" description="Compile Java sources"> <!-- Compile Java classes as necessary --> ! <javac srcdir="${src.main}" ! destdir="${build.classes}" ! debug="${compile.debug}" ! deprecation="${compile.deprecation}" ! optimize="${compile.optimize}"> <classpath refid="compile.classpath"/> </javac> - <copy todir="${build.classes}"> <fileset dir="${src.resources}"> ! <include name="**/*.properties"/> ! <include name="**/*.gif"/> ! <include name="**/*.png"/> ! </fileset> </copy> </target> - <!-- ==================== XMLBeans Target ================================== --> ! <target name="xmlbeans" depends="compile" if="has.dir.etc.beaninfo"> ! <mkdir dir="${build.src}"/> ! <xmlbean destdir="${build.src}" ! srcdir="../${src.etc}/beaninfo" ! includes="**" ! excludes="**/CVS/**"/> ! <javac srcdir="${build.src}" ! destdir="${build.classes}" ! classpath="${classpath}" ! debug="${compile.debug}" ! deprecation="${compile.deprecation}" ! optimize="${compile.optimize}" ! includes="**/*BeanInfo.java" ! excludes="**/CVS/**"> <classpath refid="compile.classpath"/> ! </javac> ! </target> ! <!-- ==================== Build Target ===================================== --> <target name="build" depends="compile,xmlbeans" description="Create binary"> <!-- Create the Bootstrap JAR file --> ! <jar jarfile="${build.lib}/run.jar" ! basedir="${build.classes}" ! manifest="${build.etc}/run.mf" ! includes="${module.starter}*.*"/> ! <!-- Create the Module JAR file --> ! <jar jarfile="${build.lib}/${module.name}.jar" ! basedir="${build.classes}" ! manifest="${build.etc}/${module.name}.mf" ! excludes="${module.starter}*.*"/> </target> - <!-- ==================== Dist Target ===================================== --> <target name="dist" depends="dist.copy.lib,dist.copy.lib.ext" description=""/> - <!-- ==================== Dist Binaries Copy Target ===================================== --> <target name="dist.copy" depends="build" description=""> --- 79,133 ---- <mkdir dir="${dist.lib}"/> <mkdir dir="${dist.lib.ext}"/> <mkdir dir="${dist.webapp}"/> <mkdir dir="${dist.webapp.webinf}"/> <mkdir dir="${dist.webapp.webinf.classes}"/> <mkdir dir="${dist.webapp.webinf.lib}"/> <available file="${module.root}/lib.properties" property="has.lib.file"/> <available file="${module.root}/lib.ext.properties" property="has.lib.ext.file"/> <available file="${src.etc}/beaninfo" property="has.dir.etc.beaninfo"/> ! <copy todir="${build.etc}"> ! <fileset dir="${src.etc}"> ! <include name="*.mf"/> ! </fileset> ! <filterset> ! <filter token="module.name" value="${module.display.name}"/> ! <filter token="version.major" value="${version.major}"/> ! <filter token="version.minor" value="${version.minor}"/> ! <filter token="version.revision" value="${version.revision}"/> ! <filter token="version.tag" value="${version.tag}"/> ! </filterset> ! </copy> </target> <!-- ==================== Compile Target ================================== --> <target name="compile" depends="prepare" description="Compile Java sources"> <!-- Compile Java classes as necessary --> ! <javac srcdir="${src.main}" destdir="${build.classes}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}"> <classpath refid="compile.classpath"/> </javac> <copy todir="${build.classes}"> <fileset dir="${src.resources}"> ! <include name="**/*.properties"/> ! <include name="**/*.gif"/> ! <include name="**/*.png"/> ! </fileset> </copy> </target> <!-- ==================== XMLBeans Target ================================== --> ! <target name="xmlbeans" depends="compile" if="has.dir.etc.beaninfo"> ! <mkdir dir="${build.src}"/> ! <xmlbean destdir="${build.src}" srcdir="../${src.etc}/beaninfo" includes="**" excludes="**/CVS/**"/> ! <javac srcdir="${build.src}" destdir="${build.classes}" classpath="${classpath}" debug="${compile.debug}" deprecation="${compile.deprecation}" optimize="${compile.optimize}" includes="**/*BeanInfo.java" excludes="**/CVS/**"> <classpath refid="compile.classpath"/> ! </javac> ! </target> <!-- ==================== Build Target ===================================== --> <target name="build" depends="compile,xmlbeans" description="Create binary"> <!-- Create the Bootstrap JAR file --> ! <jar jarfile="${build.lib}/run.jar" basedir="${build.classes}" manifest="${build.etc}/run.mf" includes="${module.starter}*.*"/> <!-- Create the Module JAR file --> ! <jar jarfile="${build.lib}/${module.name}.jar" basedir="${build.classes}" manifest="${build.etc}/${module.name}.mf" excludes="${module.starter}*.*"/> </target> <!-- ==================== Dist Target ===================================== --> <target name="dist" depends="dist.copy.lib,dist.copy.lib.ext" description=""/> <!-- ==================== Dist Binaries Copy Target ===================================== --> <target name="dist.copy" depends="build" description=""> *************** *** 175,257 **** <fileset dir="${src.bin}"/> </copy> - <copy todir="${dist.conf}"> <fileset dir="${src.conf}"/> </copy> - <copy todir="${dist.bin}"> ! <fileset dir="${build.lib}"> ! <include name="run.jar"/> ! </fileset> ! </copy> ! ! <copy todir="${dist.lib}"> ! <fileset dir="${build.lib}"> ! <include name="${module.name}.jar"/> ! </fileset> ! </copy> </target> - <!-- ==================== Dist Libraries Copy Target ===================================== --> <target name="dist.copy.lib" depends="dist.copy" description="" if="has.lib.file"> ! <copy todir="${dist.lib}"> ! <mapper type="flatten"/> ! <fileset dir="." includesfile="${module.root}/lib.properties"/> ! </copy> </target> - <!-- ==================== Dist External Libraires Target ===================================== --> <target name="dist.copy.lib.ext" depends="dist.copy" description="" if="has.lib.ext.file"> ! <copy todir="${dist.lib.ext}"> ! <mapper type="flatten"/> ! <fileset dir="." includesfile="${module.root}/lib.ext.properties"/> ! </copy> </target> - <!-- ==================== WebApp Target ===================================== --> ! <target name="webapp" depends="dist.copy" description="" if="has.lib.ext.file"> ! <copy todir="${dist.webapp}"> ! <fileset dir="${src.webapp.content}"> ! </fileset> ! </copy> ! ! <copy todir="${dist.webapp.webinf.classes}"> ! <fileset dir="${build.classes}"> ! </fileset> ! </copy> ! ! <copy todir="${dist.webapp.webinf.lib}"> ! <mapper type="flatten"/> ! <fileset dir="." includesfile="${module.root}/webapp.properties"/> ! </copy> ! <jar jarfile="${dist.home}/${module.name}.war" basedir="${dist.webapp}"/> - </target> - <!-- ==================== Javadoc Target ================================== --> <target name="javadoc" depends="prepare" description="Create Javadoc API documentation" if="generate.javadoc"> ! <javadoc sourcepath="${src.main}" ! destdir="${build.doc.api}" ! packagenames="net.sourceforge.ejtools.*" ! windowtitle="${module.javadoc.title}" ! stylesheetfile="build/css/stylesheet.css"> <classpath refid="compile.classpath"/> </javadoc> </target> - <!-- ==================== Todo Target =================================== --> <target name="todo" depends="prepare" description="Create To Do documentation"> ! <todo sourcepath="${src.main}" ! destdir="${build.doc.todo}" ! classpathref="compile.classpath"> ! <fileset dir="${src.main}"> ! <include name="**/*.java" /> ! </fileset> ! <info projectname="${module.display.name}"/> ! </todo> <copy file="build/css/info.css" todir="${build.doc.todo}" overwrite="yes"/> ! </target> ! <!-- ==================== SVG Logo Target =================================== --> <target name="logo" depends="prepare"> --- 135,211 ---- <fileset dir="${src.bin}"/> </copy> <copy todir="${dist.conf}"> <fileset dir="${src.conf}"/> </copy> <copy todir="${dist.bin}"> ! <fileset dir="${build.lib}"> ! <include name="run.jar"/> ! </fileset> ! </copy> ! <copy todir="${dist.lib}"> ! <fileset dir="${build.lib}"> ! <include name="${module.name}.jar"/> ! </fileset> ! </copy> </target> <!-- ==================== Dist Libraries Copy Target ===================================== --> <target name="dist.copy.lib" depends="dist.copy" description="" if="has.lib.file"> ! <copy todir="${dist.lib}"> ! <mapper type="flatten"/> ! <fileset dir="." includesfile="${module.root}/lib.properties"/> ! </copy> </target> <!-- ==================== Dist External Libraires Target ===================================== --> <target name="dist.copy.lib.ext" depends="dist.copy" description="" if="has.lib.ext.file"> ! <copy todir="${dist.lib.ext}"> ! <mapper type="flatten"/> ! <fileset dir="." includesfile="${module.root}/lib.ext.properties"/> ! </copy> </target> <!-- ==================== WebApp Target ===================================== --> ! <target name="webapp" depends="build" description="" if="has.lib.ext.file"> ! <copy todir="${dist.webapp}"> ! <fileset dir="${src.webapp.content}"/> ! </copy> ! <copy todir="${dist.webapp.webinf.classes}"> ! <fileset dir="${build.classes}"/> ! </copy> ! <copy todir="${dist.webapp.webinf.lib}"> ! <mapper type="flatten"/> ! <fileset dir="." includesfile="${module.root}/webapp.properties"/> ! </copy> <jar jarfile="${dist.home}/${module.name}.war" basedir="${dist.webapp}"/> </target> <!-- ==================== Javadoc Target ================================== --> <target name="javadoc" depends="prepare" description="Create Javadoc API documentation" if="generate.javadoc"> ! <javadoc sourcepath="${src.main}" destdir="${build.doc.api}" packagenames="net.sourceforge.ejtools.*" windowtitle="${module.javadoc.title}" stylesheetfile="build/css/stylesheet.css"> <classpath refid="compile.classpath"/> </javadoc> </target> <!-- ==================== Todo Target =================================== --> <target name="todo" depends="prepare" description="Create To Do documentation"> ! <todo sourcepath="${src.main}" destdir="${build.doc.todo}" classpathref="compile.classpath"> ! <fileset dir="${src.main}"> ! <include name="**/*.java"/> ! </fileset> ! <info projectname="${module.display.name}"/> ! </todo> <copy file="build/css/info.css" todir="${build.doc.todo}" overwrite="yes"/> ! </target> ! <!-- ==================== Package Target =================================== --> ! <target name="package" depends="dist, webapp" description=""> ! <tar tarfile="${output.root}/${module.name}.tar"> ! <tarfileset dir="${dist.home}" mode="755"> ! <include name="${dist.bin}/run.sh"/> ! </tarfileset> ! <tarfileset dir="${dist.home}"> ! <include name="${dist.home}/**"/> ! <exclude name="${dist.bin}/run.sh"/> ! </tarfileset> ! </tar> ! <zip zipfile="${output.root}/${module.name}.zip"> ! <fileset dir="${dist.home}"/> ! </zip> ! </target> <!-- ==================== SVG Logo Target =================================== --> <target name="logo" depends="prepare"> *************** *** 281,285 **** <delete file="${src.resources}/images/logo.svg"/> </target> - <!-- ==================== Clean Target ==================================== --> <target name="clean" depends="info" description="Delete old build and dist directories"> --- 235,238 ---- *************** *** 287,290 **** <delete dir="${dist.home}"/> <delete dir="${dist.webapp}"/> ! </target> </project> --- 240,243 ---- <delete dir="${dist.home}"/> <delete dir="${dist.webapp}"/> ! </target> </project> Index: general.properties =================================================================== RCS file: /cvsroot/ejtools/build/general.properties,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** general.properties 17 Apr 2002 20:48:54 -0000 1.1 --- general.properties 26 Apr 2002 06:19:26 -0000 1.2 *************** *** 26,27 **** --- 26,28 ---- thirdparty.root=thirdparty website.root=website + output.root=output |