Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5881] trunk
|
From: <ga...@us...> - 2011-12-22 15:30:45
|
Revision: 5881
http://jnode.svn.sourceforge.net/jnode/?rev=5881&view=rev
Author: galatnm
Date: 2011-12-22 15:30:32 +0000 (Thu, 22 Dec 2011)
Log Message:
-----------
build files clean up.
Modified Paths:
--------------
trunk/all/build.xml
trunk/builder/build.xml
Modified: trunk/all/build.xml
===================================================================
--- trunk/all/build.xml 2011-12-15 21:22:44 UTC (rev 5880)
+++ trunk/all/build.xml 2011-12-22 15:30:32 UTC (rev 5881)
@@ -1,541 +1,540 @@
<project name="JNode" default="help" basedir=".">
- <property name="root.dir" value="${basedir}/.."/>
-
+ <property name="root.dir" value="${basedir}/.."/>
+
<!-- if task is used from this -->
- <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
+ <taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
<!-- before including jnode.xml, we must set this property -->
- <condition property="memoryMaximumSize" value="1512m" else="768m">
- <os arch="amd64"/>
- </condition>
- <echo message="Setting memoryMaximumSize to ${memoryMaximumSize}"/>
-
- <!-- Include antlib -->
- <typedef file="${root.dir}/all/lib/jnode.xml"/>
+ <condition property="memoryMaximumSize" value="1512m" else="768m">
+ <os arch="amd64"/>
+ </condition>
+ <echo message="Setting memoryMaximumSize to ${memoryMaximumSize}"/>
- <!-- JNode version -->
- <property name="jnode-ver" value="0.2.9-dev"/>
+ <!-- Include antlib -->
+ <typedef file="${root.dir}/all/lib/jnode.xml"/>
- <!-- Java target and source version -->
- <property name="java.target" value="1.6"/>
- <property name="java.source" value="1.6"/>
- <property name="java.encoding" value="US-ASCII"/>
+ <!-- JNode version -->
+ <property name="jnode-ver" value="0.2.9-dev"/>
- <property name="build.dir" value="${basedir}/build"/>
- <property name="reports.dir" value="${build.dir}/reports"/>
- <property name="cdroms.dir" value="${build.dir}/cdroms"/>
- <property name="descriptors.dir" value="${build.dir}/descriptors"/>
- <property name="plugins.dir" value="${build.dir}/plugins"/>
- <property name="initjars.dir" value="${build.dir}/initjars"/>
- <property name="save.dir" value="${basedir}/save"/>
- <property name="backup.dir" value="${build.dir}/backup"/>
+ <!-- Java target and source version -->
+ <property name="java.target" value="1.6"/>
+ <property name="java.source" value="1.6"/>
+ <property name="java.encoding" value="US-ASCII"/>
- <property name="jnode-builder.jar" value="${build.dir}/descriptors/jnode-builder.jar"/>
- <property name="jnode-configure.jar" value="${build.dir}/descriptors/jnode-configure.jar"/>
- <property name="jnode-core.jar" value="${root.dir}/core/build/classes"/>
- <property name="jnode-distr.jar" value="${root.dir}/distr/build/classes"/>
- <property name="jnode-fs.jar" value="${root.dir}/fs/build/classes"/>
- <property name="jnode-gui.jar" value="${root.dir}/gui/build/classes"/>
- <property name="thinlet.jar" value="${root.dir}/gui/build/classes"/>
- <property name="jnode-textui.jar" value="${root.dir}/textui/build/classes"/>
- <property name="jnode-net.jar" value="${root.dir}/net/build/classes"/>
- <property name="jnode-shell.jar" value="${root.dir}/shell/build/classes"/>
- <property name="jnode-cli.jar" value="${root.dir}/cli/build/classes"/>
- <property name="jnode-fonts.jar" value="${build.dir}/descriptors/jnode-fonts.jar"/>
- <property name="jnode-images.jar" value="${build.dir}/descriptors/jnode-images.jar"/>
+ <property name="build.dir" value="${basedir}/build"/>
+ <property name="reports.dir" value="${build.dir}/reports"/>
+ <property name="cdroms.dir" value="${build.dir}/cdroms"/>
+ <property name="descriptors.dir" value="${build.dir}/descriptors"/>
+ <property name="plugins.dir" value="${build.dir}/plugins"/>
+ <property name="initjars.dir" value="${build.dir}/initjars"/>
+ <property name="save.dir" value="${basedir}/save"/>
+ <property name="backup.dir" value="${build.dir}/backup"/>
- <property name="jnode-mmtk-genrc.jar" value="${root.dir}/core/build/classes-plan/org.jnode.vm.memmgr.mmtk.genrc"/>
+ <property name="jnode-builder.jar" value="${build.dir}/descriptors/jnode-builder.jar"/>
+ <property name="jnode-configure.jar" value="${build.dir}/descriptors/jnode-configure.jar"/>
+ <property name="jnode-core.jar" value="${root.dir}/core/build/classes"/>
+ <property name="jnode-distr.jar" value="${root.dir}/distr/build/classes"/>
+ <property name="jnode-fs.jar" value="${root.dir}/fs/build/classes"/>
+ <property name="jnode-gui.jar" value="${root.dir}/gui/build/classes"/>
+ <property name="thinlet.jar" value="${root.dir}/gui/build/classes"/>
+ <property name="jnode-textui.jar" value="${root.dir}/textui/build/classes"/>
+ <property name="jnode-net.jar" value="${root.dir}/net/build/classes"/>
+ <property name="jnode-shell.jar" value="${root.dir}/shell/build/classes"/>
+ <property name="jnode-cli.jar" value="${root.dir}/cli/build/classes"/>
+ <property name="jnode-fonts.jar" value="${build.dir}/descriptors/jnode-fonts.jar"/>
+ <property name="jnode-images.jar" value="${build.dir}/descriptors/jnode-images.jar"/>
+
+ <property name="jnode-mmtk-genrc.jar" value="${root.dir}/core/build/classes-plan/org.jnode.vm.memmgr.mmtk.genrc"/>
<property name="jnode-mmtk-ms.jar" value="${root.dir}/core/build/classes-plan/org.jnode.vm.memmgr.mmtk.ms"/>
<property name="jnode-mmtk-nogc.jar" value="${root.dir}/core/build/classes-plan/org.jnode.vm.memmgr.mmtk.nogc"/>
- <property name="classlib.jar" value="${root.dir}/all/lib/classlib.jar"/>
- <property name="classlib-src.jar" value="${root.dir}/all/lib/classlib-src.jar"/>
- <property name="ant.jar" value="${root.dir}/core/lib/ant.jar"/>
- <property name="ant-launcher.jar" value="${root.dir}/core/lib/ant-launcher.jar"/>
- <property name="commons-net.jar" value="${root.dir}/core/lib/commons-net-1.1.0.jar"/>
- <property name="dnsjava.jar" value="${root.dir}/net/lib/dnsjava-1.6.6.jar"/>
- <property name="jsch.jar" value="${root.dir}/net/lib/jsch-0.1.24.jar"/>
- <property name="junit.jar" value="${root.dir}/core/lib/junit-4.5.jar"/>
- <property name="mmtk.jar" value="${root.dir}/core/lib/mmtk/mmtk.jar"/>
+ <property name="classlib.jar" value="${root.dir}/all/lib/classlib.jar"/>
+ <property name="classlib-src.jar" value="${root.dir}/all/lib/classlib-src.jar"/>
+ <property name="ant.jar" value="${root.dir}/core/lib/ant.jar"/>
+ <property name="ant-launcher.jar" value="${root.dir}/core/lib/ant-launcher.jar"/>
+ <property name="commons-net.jar" value="${root.dir}/core/lib/commons-net-1.1.0.jar"/>
+ <property name="dnsjava.jar" value="${root.dir}/net/lib/dnsjava-1.6.6.jar"/>
+ <property name="jsch.jar" value="${root.dir}/net/lib/jsch-0.1.24.jar"/>
+ <property name="junit.jar" value="${root.dir}/core/lib/junit-4.5.jar"/>
+ <property name="mmtk.jar" value="${root.dir}/core/lib/mmtk/mmtk.jar"/>
<property name="mauve.jar" value="${root.dir}/core/lib/mauve.jar"/>
- <property name="edtftpj.jar" value="${root.dir}/fs/lib/edtftpj-1.5.2.jar"/>
- <property name="jcifs.jar" value="${root.dir}/fs/lib/jcifs-1.2.6.jar"/>
- <property name="ejc.jar" value="${root.dir}/core/lib/ejc-3.1.1.jar"/>
+ <property name="edtftpj.jar" value="${root.dir}/fs/lib/edtftpj-1.5.2.jar"/>
+ <property name="jcifs.jar" value="${root.dir}/fs/lib/jcifs-1.2.6.jar"/>
+ <property name="ejc.jar" value="${root.dir}/core/lib/ejc-3.1.1.jar"/>
<property name="oncrpc.jar" value="${root.dir}/net/lib/oncrpc.jar"/>
<property name="telnetd.jar" value="${root.dir}/distr/lib/telnetd.jar" />
<property name="commons-logging.jar" value="${root.dir}/distr/lib/commons-logging.jar" />
<property name="jawk.jar" value="${root.dir}/distr/lib/jawk-1.02.jar"/>
<property name="jetty.jar" value="${root.dir}/distr/lib/jetty-6.1.5.jar" />
<property name="jetty-util.jar" value="${root.dir}/distr/lib/jetty-util-6.1.5.jar" />
- <property name="jsp.jar" value="${root.dir}/distr/lib/jsp-2.1.jar" />
- <property name="jsp-api.jar" value="${root.dir}/distr/lib/jsp-api-2.1.jar" />
- <property name="servlet.jar" value="${root.dir}/distr/lib/servlet-api-2.5-6.1.5.jar" />
- <property name="derby.jar" value="${root.dir}/distr/lib/derby.jar" />
- <property name="derbynet.jar" value="${root.dir}/distr/lib/derbynet.jar" />
- <property name="derbytools.jar" value="${root.dir}/distr/lib/derbytools.jar" />
- <property name="nanoxml-java.jar" value="${root.dir}/shell/lib/nanoxml-2.2.3.jar" />
+ <property name="jsp.jar" value="${root.dir}/distr/lib/jsp-2.1.jar" />
+ <property name="jsp-api.jar" value="${root.dir}/distr/lib/jsp-api-2.1.jar" />
+ <property name="servlet.jar" value="${root.dir}/distr/lib/servlet-api-2.5-6.1.5.jar" />
+ <property name="derby.jar" value="${root.dir}/distr/lib/derby.jar" />
+ <property name="derbynet.jar" value="${root.dir}/distr/lib/derbynet.jar" />
+ <property name="derbytools.jar" value="${root.dir}/distr/lib/derbytools.jar" />
+ <property name="nanoxml-java.jar" value="${root.dir}/shell/lib/nanoxml-2.2.3.jar" />
- <property name="iso9660.jar" value="${root.dir}/builder/lib/iso9660.jar" />
- <property name="sabre.jar" value="${root.dir}/builder/lib/sabre.jar" />
+ <property name="iso9660.jar" value="${root.dir}/builder/lib/iso9660.jar" />
+ <property name="sabre.jar" value="${root.dir}/builder/lib/sabre.jar" />
- <!-- libraries needed to run tests -->
- <property name="jmock-cglib.jar" value="${root.dir}/core/lib/jmock-cglib-1.0.1.jar"/>
- <property name="jmock.jar" value="${root.dir}/core/lib/jmock-1.0.1.jar"/>
- <property name="cglib.jar" value="${root.dir}/core/lib/cglib-2.1.jar"/>
- <property name="asm.jar" value="${root.dir}/core/lib/asm-1.5.3.jar"/>
+ <!-- libraries needed to run tests -->
+ <property name="jmock-cglib.jar" value="${root.dir}/core/lib/jmock-cglib-1.0.1.jar"/>
+ <property name="jmock.jar" value="${root.dir}/core/lib/jmock-1.0.1.jar"/>
+ <property name="cglib.jar" value="${root.dir}/core/lib/cglib-2.1.jar"/>
+ <property name="asm.jar" value="${root.dir}/core/lib/asm-1.5.3.jar"/>
<property name="asm-attrs.jar" value="${root.dir}/core/lib/asm-attrs-1.5.3.jar"/>
<property name="asm-util.jar" value="${root.dir}/core/lib/asm-util-1.5.3.jar"/>
-
- <property name="log4j.jar" value="${root.dir}/core/lib/log4j-1.2.8.jar"/>
- <property name="beanshell.jar" value="${root.dir}/shell/lib/bsh-2.0b5.jar"/>
- <property name="js.jar" value="${root.dir}/shell/lib/rhino1.6r5-jsr223.jar"/>
- <!-- libraries needed to check plugin dependencies -->
- <property name="bcel-5.1.jar" value="${root.dir}/builder/lib/bcel-5.1.jar" />
+ <property name="log4j.jar" value="${root.dir}/core/lib/log4j-1.2.8.jar"/>
+ <property name="beanshell.jar" value="${root.dir}/shell/lib/bsh-2.0b5.jar"/>
+ <property name="js.jar" value="${root.dir}/shell/lib/rhino1.6r5-jsr223.jar"/>
- <!-- lists of plugins to use while booting -->
- <property name="default-plugin-list" value="${root.dir}/all/conf/default-plugin-list.xml"/>
- <property name="full-plugin-list" value="${root.dir}/all/conf/full-plugin-list.xml"/>
- <property name="install-plugin-list" value="${root.dir}/all/conf/install-plugin-list.xml"/>
- <property name="system-plugin-list" value="${root.dir}/all/conf/system-plugin-list.xml"/>
- <property name="sources.dist.tar.gz" value="${build.dir}/jnodesources-${jnode-ver}.tar.gz"/>
- <property name="jnode-x86.iso" value="${cdroms.dir}/jnode-x86.iso"/>
- <property name="jnode-x86-lite.iso" value="${cdroms.dir}/jnode-x86-lite.iso"/>
- <property name="jnode-x86_64-lite.iso" value="${cdroms.dir}/jnode-x86_64-lite.iso"/>
-
+ <!-- libraries needed to check plugin dependencies -->
+ <property name="bcel-5.1.jar" value="${root.dir}/builder/lib/bcel-5.1.jar" />
+
+ <!-- lists of plugins to use while booting -->
+ <property name="default-plugin-list" value="${root.dir}/all/conf/default-plugin-list.xml"/>
+ <property name="full-plugin-list" value="${root.dir}/all/conf/full-plugin-list.xml"/>
+ <property name="install-plugin-list" value="${root.dir}/all/conf/install-plugin-list.xml"/>
+ <property name="system-plugin-list" value="${root.dir}/all/conf/system-plugin-list.xml"/>
+ <property name="sources.dist.tar.gz" value="${build.dir}/jnodesources-${jnode-ver}.tar.gz"/>
+ <property name="jnode-x86.iso" value="${cdroms.dir}/jnode-x86.iso"/>
+ <property name="jnode-x86-lite.iso" value="${cdroms.dir}/jnode-x86-lite.iso"/>
+ <property name="jnode-x86_64-lite.iso" value="${cdroms.dir}/jnode-x86_64-lite.iso"/>
+
<!-- list of classes and packages that should to be compiled to native code
in the boot image. -->
<property name="jnode-core-class-list" value="${root.dir}/all/conf/core-classes.txt"/>
<property name="jnode-x86-class-list" value="${root.dir}/all/conf/x86-classes.txt"/>
- <path id="cp">
- <pathelement location="${classlib.jar}"/>
- <pathelement location="${mmtk.jar}"/>
- <pathelement location="${ant.jar}"/>
- <pathelement location="${junit.jar}"/>
- <pathelement location="${jmock.jar}"/>
- <pathelement location="${jmock-cglib.jar}"/>
- <pathelement location="${asm.jar}"/>
- <pathelement location="${asm-attrs.jar}"/>
- <pathelement location="${asm-util.jar}"/>
- <pathelement location="${cglib.jar}"/>
- <pathelement location="${log4j.jar}"/>
- <pathelement location="${root.dir}/all/conf"/>
- <pathelement location="${beanshell.jar}"/>
- <pathelement location="${js.jar}"/>
- <pathelement location="${oncrpc.jar}"/>
- <pathelement location="${edtftpj.jar}"/>
- <pathelement location="${jcifs.jar}"/>
- <pathelement location="${commons-net.jar}"/>
- <pathelement location="${dnsjava.jar}"/>
- <pathelement location="${mauve.jar}"/>
- <pathelement location="${derby.jar}"/>
- <pathelement location="${derbynet.jar}"/>
- <pathelement location="${derbytools.jar}"/>
- <pathelement location="${iso9660.jar}"/>
- <pathelement location="${sabre.jar}"/>
- </path>
+ <path id="cp">
+ <pathelement location="${classlib.jar}"/>
+ <pathelement location="${mmtk.jar}"/>
+ <pathelement location="${ant.jar}"/>
+ <pathelement location="${junit.jar}"/>
+ <pathelement location="${jmock.jar}"/>
+ <pathelement location="${jmock-cglib.jar}"/>
+ <pathelement location="${asm.jar}"/>
+ <pathelement location="${asm-attrs.jar}"/>
+ <pathelement location="${asm-util.jar}"/>
+ <pathelement location="${cglib.jar}"/>
+ <pathelement location="${log4j.jar}"/>
+ <pathelement location="${root.dir}/all/conf"/>
+ <pathelement location="${beanshell.jar}"/>
+ <pathelement location="${js.jar}"/>
+ <pathelement location="${oncrpc.jar}"/>
+ <pathelement location="${edtftpj.jar}"/>
+ <pathelement location="${jcifs.jar}"/>
+ <pathelement location="${commons-net.jar}"/>
+ <pathelement location="${dnsjava.jar}"/>
+ <pathelement location="${mauve.jar}"/>
+ <pathelement location="${derby.jar}"/>
+ <pathelement location="${derbynet.jar}"/>
+ <pathelement location="${derbytools.jar}"/>
+ <pathelement location="${iso9660.jar}"/>
+ <pathelement location="${sabre.jar}"/>
+ </path>
- <path id="cp-jnode">
- <pathelement location="${jnode-builder.jar}"/>
- <pathelement location="${jnode-core.jar}"/>
- <pathelement location="${jnode-distr.jar}"/>
- <pathelement location="${jnode-fs.jar}"/>
- <pathelement location="${jnode-shell.jar}"/>
- <pathelement location="${jnode-net.jar}"/>
- <pathelement location="${jnode-gui.jar}"/>
- <pathelement location="${jnode-cli.jar}"/>
- <pathelement location="${thinlet.jar}"/>
- <pathelement location="${jnode-textui.jar}"/>
- <pathelement location="${bcel-5.1.jar}"/>
- <path refid="cp"/>
- </path>
-
+ <path id="cp-jnode">
+ <pathelement location="${jnode-builder.jar}"/>
+ <pathelement location="${jnode-core.jar}"/>
+ <pathelement location="${jnode-distr.jar}"/>
+ <pathelement location="${jnode-fs.jar}"/>
+ <pathelement location="${jnode-shell.jar}"/>
+ <pathelement location="${jnode-net.jar}"/>
+ <pathelement location="${jnode-gui.jar}"/>
+ <pathelement location="${jnode-cli.jar}"/>
+ <pathelement location="${thinlet.jar}"/>
+ <pathelement location="${jnode-textui.jar}"/>
+ <pathelement location="${bcel-5.1.jar}"/>
+ <path refid="cp"/>
+ </path>
+
<path id="cp-test">
- <pathelement location="${root.dir}/core/build/classes"/>
- <pathelement location="${root.dir}/distr/build/classes"/>
- <pathelement location="${root.dir}/fs/build/classes"/>
- <pathelement location="${root.dir}/shell/build/classes"/>
- <pathelement location="${root.dir}/net/build/classes"/>
- <pathelement location="${root.dir}/gui/build/classes"/>
- <pathelement location="${root.dir}/cli/build/classes"/>
- <pathelement location="${root.dir}/textui/build/classes"/>
- <pathelement location="${root.dir}/shell/lib/nanoxml-2.2.3.jar"/>
- <path refid="cp"/>
- </path>
+ <pathelement location="${root.dir}/core/build/classes"/>
+ <pathelement location="${root.dir}/distr/build/classes"/>
+ <pathelement location="${root.dir}/fs/build/classes"/>
+ <pathelement location="${root.dir}/shell/build/classes"/>
+ <pathelement location="${root.dir}/net/build/classes"/>
+ <pathelement location="${root.dir}/gui/build/classes"/>
+ <pathelement location="${root.dir}/cli/build/classes"/>
+ <pathelement location="${root.dir}/textui/build/classes"/>
+ <pathelement location="${root.dir}/shell/lib/nanoxml-2.2.3.jar"/>
+ <path refid="cp"/>
+ </path>
- <filterset id="descriptors-filter">
- <filter token="PROVIDER" value="JNode.org"/>
- <filter token="VERSION" value="${jnode-ver}"/>
- </filterset>
+ <filterset id="descriptors-filter">
+ <filter token="PROVIDER" value="JNode.org"/>
+ <filter token="VERSION" value="${jnode-ver}"/>
+ </filterset>
- <patternset id="exts">
- <include name="**/*.dat"/>
- <include name="**/*.ids"/>
- <include name="**/*.properties"/>
- <include name="**/*.xml"/>
- </patternset>
+ <patternset id="exts">
+ <include name="**/*.dat"/>
+ <include name="**/*.ids"/>
+ <include name="**/*.properties"/>
+ <include name="**/*.xml"/>
+ </patternset>
- <target name="prepare">
- <!-- Fail on a Windows platform if there are spaces in the root dir's pathname. It will
+ <target name="prepare">
+ <!-- Fail on a Windows platform if there are spaces in the root dir's pathname. It will
lead to mkisofs dying with a misleading error message. bluebit / crawley 2008-05-03 -->
- <fail message="Cannot build JNode from a directory with spaces in the pathname.">
- <condition>
- <and>
- <os family="windows"/>
- <contains string="${root.dir}" substring=" " casesensitive="false" />
- </and>
- </condition>
- </fail>
-
- <fail message="Java Runtime version 1.6 needed. Your version is: ${java.runtime.version}">
- <condition>
- <not>
- <contains string="${java.runtime.version}" substring="1.6" casesensitive="false"/>
- </not>
- </condition>
- </fail>
+ <fail message="Cannot build JNode from a directory with spaces in the pathname.">
+ <condition>
+ <and>
+ <os family="windows"/>
+ <contains string="${root.dir}" substring=" " casesensitive="false" />
+ </and>
+ </condition>
+ </fail>
- <!-- Initialize all project directories -->
- <property file="${root.dir}/jnode.properties"/>
- <!-- Set overwritable properties -->
- <property name="jnode.memmgr.plugin.id" value="org.jnode.vm.memmgr.def"/>
- <property name="compilerarg" value="-nowarn"/>
+ <fail message="Java Runtime version 1.6 needed. Your version is: ${java.runtime.version}">
+ <condition>
+ <not>
+ <contains string="${java.runtime.version}" substring="1.6" casesensitive="false"/>
+ </not>
+ </condition>
+ </fail>
- <!-- Derive properties -->
- <property name="jnode-mmtk.jar" value="${root.dir}/core/build/classes-plan/${jnode.memmgr.plugin.id}"/>
+ <!-- Initialize all project directories -->
+ <property file="${root.dir}/jnode.properties"/>
+ <!-- Set overwritable properties -->
+ <property name="jnode.memmgr.plugin.id" value="org.jnode.vm.memmgr.def"/>
+ <property name="compilerarg" value="-nowarn"/>
- <!-- Initialize timestamp -->
- <tstamp/>
-
- <property name="hotswap.class.tstamp.pattern" value="MM/dd/yyyy kk:mm:ss.SSS"/>
- <tstamp>
- <format property="hotswap.class.tstamp" pattern="${hotswap.class.tstamp.pattern}" />
- </tstamp>
+ <!-- Derive properties -->
+ <property name="jnode-mmtk.jar" value="${root.dir}/core/build/classes-plan/${jnode.memmgr.plugin.id}"/>
+ <!-- Initialize timestamp -->
+ <tstamp/>
- <!-- Update default excludes -->
- <defaultexcludes add="**/_svn"/>
- <defaultexcludes add="**/_svn/**"/>
-
- <!-- Create basic build directories -->
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${reports.dir}"/>
- <mkdir dir="${save.dir}"/>
- <mkdir dir="${cdroms.dir}"/>
- <mkdir dir="${descriptors.dir}"/>
- <mkdir dir="${plugins.dir}"/>
- <mkdir dir="${initjars.dir}"/>
- <property file="${root.dir}/all/lib/ftp.properties"/>
- <!-- check for classlib update -->
- <if>
- <or>
- <not>
- <uptodate srcfile="${root.dir}/all/lib/ftp.properties" targetfile="${root.dir}/all/lib/classlib.pack.gz"/>
- </not>
- <not>
- <uptodate srcfile="${root.dir}/all/lib/ftp.properties" targetfile="${root.dir}/all/lib/classlib-src.jar.bz2"/>
- </not>
- </or>
- <then>
- <!-- check if classlib update should be done locally or from the FTP server -->
- <if>
- <isset property="jnode.local.classlib"/>
- <then>
- <fail message="classlib is out of date, run copy or quickdeploy in classlib project">
- <condition>
- <or>
- <not>
- <uptodate srcfile="${root.dir}/all/lib/ftp.properties"
+ <property name="hotswap.class.tstamp.pattern" value="MM/dd/yyyy kk:mm:ss.SSS"/>
+ <tstamp>
+ <format property="hotswap.class.tstamp" pattern="${hotswap.class.tstamp.pattern}" />
+ </tstamp>
+
+
+ <!-- Update default excludes -->
+ <defaultexcludes add="**/_svn"/>
+ <defaultexcludes add="**/_svn/**"/>
+
+ <!-- Create basic build directories -->
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${reports.dir}"/>
+ <mkdir dir="${save.dir}"/>
+ <mkdir dir="${cdroms.dir}"/>
+ <mkdir dir="${descriptors.dir}"/>
+ <mkdir dir="${plugins.dir}"/>
+ <mkdir dir="${initjars.dir}"/>
+ <property file="${root.dir}/all/lib/ftp.properties"/>
+ <!-- check for classlib update -->
+ <if>
+ <or>
+ <not>
+ <uptodate srcfile="${root.dir}/all/lib/ftp.properties" targetfile="${root.dir}/all/lib/classlib.pack.gz"/>
+ </not>
+ <not>
+ <uptodate srcfile="${root.dir}/all/lib/ftp.properties" targetfile="${root.dir}/all/lib/classlib-src.jar.bz2"/>
+ </not>
+ </or>
+ <then>
+ <!-- check if classlib update should be done locally or from the FTP server -->
+ <if>
+ <isset property="jnode.local.classlib"/>
+ <then>
+ <fail message="classlib is out of date, run copy or quickdeploy in classlib project">
+ <condition>
+ <or>
+ <not>
+ <uptodate srcfile="${root.dir}/all/lib/ftp.properties"
targetfile="${root.dir}/all/lib/classlib.jar"/>
- </not>
- <not>
- <uptodate srcfile="${root.dir}/all/lib/ftp.properties"
+ </not>
+ <not>
+ <uptodate srcfile="${root.dir}/all/lib/ftp.properties"
targetfile="${root.dir}/all/lib/classlib-src.jar"/>
- </not>
- </or>
- </condition>
- </fail>
- </then>
- <else>
- <!-- classlib update from the FTP server -->
- <delete file="${root.dir}/all/lib/classlib.pack.gz"/>
- <delete file="${root.dir}/all/lib/classlib-src.jar.bz2"/>
- <get src="${classlib.url}/classlib.pack.gz" dest="${root.dir}/all/lib/classlib.pack.gz"/>
- <get src="${classlib.url}/classlib-src.jar.bz2" dest="${root.dir}/all/lib/classlib-src.jar.bz2"/>
- <!-- verify checksum for downloaded files -->
- <if>
- <not>
- <checksum algorithm="MD5" file="${root.dir}/all/lib/classlib.pack.gz" property="${classlib.md5}"/>
- </not>
- <then>
- <delete file="${root.dir}/all/lib/classlib.pack.gz"/>
- <fail message="checksum failed for classlib.pack.gz"/>
- </then>
- </if>
- <if>
- <not>
- <checksum algorithm="MD5" file="${root.dir}/all/lib/classlib-src.jar.bz2" property="${classlib-src.md5}"/>
- </not>
- <then>
- <delete file="${root.dir}/all/lib/classlib-src.jar.bz2"/>
- <fail message="checksum failed for classlib-src.jar.bz2"/>
- </then>
- </if>
- </else>
- </if>
- </then>
- </if>
- <if>
- <or>
- <not>
- <available file="${classlib.jar}" />
- </not>
- <uptodate srcfile="${classlib.jar}" targetfile="${root.dir}/all/lib/classlib.pack.gz"/>
- </or>
- <then>
- <delete file="${classlib.jar}"/>
- <echo message="Creating ${classlib.jar}"/>
- <exec executable="${java.home}/bin/unpack200">
- <arg file="${root.dir}/all/lib/classlib.pack.gz"/>
- <arg file="${classlib.jar}"/>
- </exec>
- </then>
- </if>
- <if>
- <or>
- <not>
- <available file="${classlib-src.jar}" />
- </not>
- <uptodate srcfile="${classlib-src.jar}" targetfile="${root.dir}/all/lib/classlib-src.jar.bz2"/>
- </or>
- <then>
- <delete file="${classlib-src.jar}"/>
- <echo message="Creating ${classlib-src.jar}"/>
- <bunzip2 src="${root.dir}/all/lib/classlib-src.jar.bz2" dest="${classlib-src.jar}"/>
- </then>
- </if>
- <property name="classlib.stamp" value="${root.dir}/all/build/classlib.stamp" />
- </target>
+ </not>
+ </or>
+ </condition>
+ </fail>
+ </then>
+ <else>
+ <!-- classlib update from the FTP server -->
+ <delete file="${root.dir}/all/lib/classlib.pack.gz"/>
+ <delete file="${root.dir}/all/lib/classlib-src.jar.bz2"/>
+ <get src="${classlib.url}/classlib.pack.gz" dest="${root.dir}/all/lib/classlib.pack.gz"/>
+ <get src="${classlib.url}/classlib-src.jar.bz2" dest="${root.dir}/all/lib/classlib-src.jar.bz2"/>
+ <!-- verify checksum for downloaded files -->
+ <if>
+ <not>
+ <checksum algorithm="MD5" file="${root.dir}/all/lib/classlib.pack.gz" property="${classlib.md5}"/>
+ </not>
+ <then>
+ <delete file="${root.dir}/all/lib/classlib.pack.gz"/>
+ <fail message="checksum failed for classlib.pack.gz"/>
+ </then>
+ </if>
+ <if>
+ <not>
+ <checksum algorithm="MD5" file="${root.dir}/all/lib/classlib-src.jar.bz2" property="${classlib-src.md5}"/>
+ </not>
+ <then>
+ <delete file="${root.dir}/all/lib/classlib-src.jar.bz2"/>
+ <fail message="checksum failed for classlib-src.jar.bz2"/>
+ </then>
+ </if>
+ </else>
+ </if>
+ </then>
+ </if>
+ <if>
+ <or>
+ <not>
+ <available file="${classlib.jar}" />
+ </not>
+ <uptodate srcfile="${classlib.jar}" targetfile="${root.dir}/all/lib/classlib.pack.gz"/>
+ </or>
+ <then>
+ <delete file="${classlib.jar}"/>
+ <echo message="Creating ${classlib.jar}"/>
+ <exec executable="${java.home}/bin/unpack200">
+ <arg file="${root.dir}/all/lib/classlib.pack.gz"/>
+ <arg file="${classlib.jar}"/>
+ </exec>
+ </then>
+ </if>
+ <if>
+ <or>
+ <not>
+ <available file="${classlib-src.jar}" />
+ </not>
+ <uptodate srcfile="${classlib-src.jar}" targetfile="${root.dir}/all/lib/classlib-src.jar.bz2"/>
+ </or>
+ <then>
+ <delete file="${classlib-src.jar}"/>
+ <echo message="Creating ${classlib-src.jar}"/>
+ <bunzip2 src="${root.dir}/all/lib/classlib-src.jar.bz2" dest="${classlib-src.jar}"/>
+ </then>
+ </if>
+ <property name="classlib.stamp" value="${root.dir}/all/build/classlib.stamp" />
+ </target>
- <!-- Call the assemble target of all subprojects -->
- <target name="assemble-projects" depends="prepare">
- <!-- pre compile tasks needed for compilation -->
- <ant target="pre-compile" dir="${root.dir}/builder" inheritall="on" inheritrefs="on" />
- <jnode.antall target="assemble"/>
- </target>
+ <!-- Call the assemble target of all subprojects -->
+ <target name="assemble-projects" depends="prepare">
+ <!-- pre compile tasks needed for compilation -->
+ <ant target="pre-compile" dir="${root.dir}/builder" inheritall="on" inheritrefs="on" />
+ <jnode.antall target="assemble"/>
+ </target>
- <!-- Assemble all plugins -->
- <target name="assemble-plugins" depends="assemble-projects,openjdk-annotate">
- <!-- Now assemble all plugins -->
- <taskdef name="plugin" classname="org.jnode.build.PluginTask" classpathref="cp-jnode"/>
- <if>
- <or>
- <not>
- <available file="${classlib.stamp}" />
- </not>
- <uptodate srcfile="${classlib.stamp}" targetfile="${classlib.jar}"/>
- </or>
- <then>
- <!-- Now assemble all plugins -->
- <plugin todir="${plugins.dir}" tmpdir="${build.dir}/tmp/plugins" pluginDir="${descriptors.dir}">
- <packager userApplicationsDir="${user.applications.dir}" pathRefId="cp"/>
+ <!-- Assemble all plugins -->
+ <target name="assemble-plugins" depends="assemble-projects,openjdk-annotate">
+ <!-- Now assemble all plugins -->
+ <taskdef name="plugin" classname="org.jnode.build.PluginTask" classpathref="cp-jnode"/>
+ <if>
+ <or>
+ <not>
+ <available file="${classlib.stamp}" />
+ </not>
+ <uptodate srcfile="${classlib.stamp}" targetfile="${classlib.jar}"/>
+ </or>
+ <then>
+ <!-- Now assemble all plugins -->
+ <plugin todir="${plugins.dir}" tmpdir="${build.dir}/tmp/plugins" pluginDir="${descriptors.dir}">
+ <packager userApplicationsDir="${user.applications.dir}" pathRefId="cp"/>
- <libalias name="jnode-core.jar" alias="${jnode-core.jar}"/>
- <libalias name="jnode-distr.jar" alias="${jnode-distr.jar}"/>
- <libalias name="jnode-fs.jar" alias="${jnode-fs.jar}"/>
- <libalias name="jnode-gui.jar" alias="${jnode-gui.jar}"/>
- <libalias name="jnode-textui.jar" alias="${jnode-textui.jar}"/>
- <libalias name="jnode-net.jar" alias="${jnode-net.jar}"/>
- <libalias name="jnode-shell.jar" alias="${jnode-shell.jar}"/>
+ <libalias name="jnode-core.jar" alias="${jnode-core.jar}"/>
+ <libalias name="jnode-distr.jar" alias="${jnode-distr.jar}"/>
+ <libalias name="jnode-fs.jar" alias="${jnode-fs.jar}"/>
+ <libalias name="jnode-gui.jar" alias="${jnode-gui.jar}"/>
+ <libalias name="jnode-textui.jar" alias="${jnode-textui.jar}"/>
+ <libalias name="jnode-net.jar" alias="${jnode-net.jar}"/>
+ <libalias name="jnode-shell.jar" alias="${jnode-shell.jar}"/>
- <libalias name="jnode-mmtk-genrc.jar" alias="${jnode-mmtk-genrc.jar}"/>
- <libalias name="jnode-mmtk-ms.jar" alias="${jnode-mmtk-ms.jar}"/>
- <libalias name="jnode-mmtk-nogc.jar" alias="${jnode-mmtk-nogc.jar}"/>
+ <libalias name="jnode-mmtk-genrc.jar" alias="${jnode-mmtk-genrc.jar}"/>
+ <libalias name="jnode-mmtk-ms.jar" alias="${jnode-mmtk-ms.jar}"/>
+ <libalias name="jnode-mmtk-nogc.jar" alias="${jnode-mmtk-nogc.jar}"/>
- <libalias name="mmtk.jar" alias="${mmtk.jar}"/>
+ <libalias name="mmtk.jar" alias="${mmtk.jar}"/>
- <libalias name="commons-net-1.1.0.jar" alias="${commons-net.jar}"/>
- <libalias name="dnsjava-1.6.6.jar" alias="${dnsjava.jar}"/>
- <libalias name="jsch-0.1.24.jar" alias="${jsch.jar}"/>
- <libalias name="log4j.jar" alias="${log4j.jar}"/>
- <libalias name="beanshell.jar" alias="${beanshell.jar}"/>
- <libalias name="nanoxml-java.jar" alias="${nanoxml-java.jar}"/>
- <libalias name="js.jar" alias="${js.jar}"/>
- <libalias name="thinlet.jar" alias="${thinlet.jar}"/>
+ <libalias name="commons-net-1.1.0.jar" alias="${commons-net.jar}"/>
+ <libalias name="dnsjava-1.6.6.jar" alias="${dnsjava.jar}"/>
+ <libalias name="jsch-0.1.24.jar" alias="${jsch.jar}"/>
+ <libalias name="log4j.jar" alias="${log4j.jar}"/>
+ <libalias name="beanshell.jar" alias="${beanshell.jar}"/>
+ <libalias name="nanoxml-java.jar" alias="${nanoxml-java.jar}"/>
+ <libalias name="js.jar" alias="${js.jar}"/>
+ <libalias name="thinlet.jar" alias="${thinlet.jar}"/>
- <libalias name="junit.jar" alias="${junit.jar}"/>
- <libalias name="jmock-1.0.1.jar" alias="${jmock.jar}"/>
- <libalias name="jmock-cglib-1.0.1.jar" alias="${jmock-cglib.jar}"/>
- <libalias name="asm.jar" alias="${asm.jar}"/>
- <libalias name="asm-attrs.jar" alias="${asm-attrs.jar}"/>
- <libalias name="asm-util.jar" alias="${asm-util.jar}"/>
- <libalias name="cglib.jar" alias="${cglib.jar}"/>
- <libalias name="mauve.jar" alias="${mauve.jar}"/>
+ <libalias name="junit.jar" alias="${junit.jar}"/>
+ <libalias name="jmock-1.0.1.jar" alias="${jmock.jar}"/>
+ <libalias name="jmock-cglib-1.0.1.jar" alias="${jmock-cglib.jar}"/>
+ <libalias name="asm.jar" alias="${asm.jar}"/>
+ <libalias name="asm-attrs.jar" alias="${asm-attrs.jar}"/>
+ <libalias name="asm-util.jar" alias="${asm-util.jar}"/>
+ <libalias name="cglib.jar" alias="${cglib.jar}"/>
+ <libalias name="mauve.jar" alias="${mauve.jar}"/>
- <libalias name="ant.jar" alias="${ant.jar}"/>
- <libalias name="ant-launcher.jar" alias="${ant-launcher.jar}"/>
- <libalias name="edtftpj.jar" alias="${edtftpj.jar}"/>
- <libalias name="jcifs.jar" alias="${jcifs.jar}"/>
- <libalias name="ejc.jar" alias="${ejc.jar}"/>
- <libalias name="oncrpc.jar" alias="${oncrpc.jar}"/>
- <libalias name="telnetd.jar" alias="${telnetd.jar}"/>
- <libalias name="commons-logging.jar" alias="${commons-logging.jar}"/>
- <libalias name="jawk.jar" alias="${jawk.jar}"/>
- <libalias name="jetty.jar" alias="${jetty.jar}"/>
- <libalias name="jetty-util.jar" alias="${jetty-util.jar}"/>
- <libalias name="jsp.jar" alias="${jsp.jar}"/>
- <libalias name="jsp-api.jar" alias="${jsp-api.jar}"/>
- <libalias name="servlet.jar" alias="${servlet.jar}"/>
- <libalias name="derby.jar" alias="${derby.jar}"/>
- <libalias name="derbynet.jar" alias="${derbynet.jar}"/>
- <libalias name="derbytools.jar" alias="${derbytools.jar}"/>
- <libalias name="classlib.jar" alias="${classlib.jar}"/>
+ <libalias name="ant.jar" alias="${ant.jar}"/>
+ <libalias name="ant-launcher.jar" alias="${ant-launcher.jar}"/>
+ <libalias name="edtftpj.jar" alias="${edtftpj.jar}"/>
+ <libalias name="jcifs.jar" alias="${jcifs.jar}"/>
+ <libalias name="ejc.jar" alias="${ejc.jar}"/>
+ <libalias name="oncrpc.jar" alias="${oncrpc.jar}"/>
+ <libalias name="telnetd.jar" alias="${telnetd.jar}"/>
+ <libalias name="commons-logging.jar" alias="${commons-logging.jar}"/>
+ <libalias name="jawk.jar" alias="${jawk.jar}"/>
+ <libalias name="jetty.jar" alias="${jetty.jar}"/>
+ <libalias name="jetty-util.jar" alias="${jetty-util.jar}"/>
+ <libalias name="jsp.jar" alias="${jsp.jar}"/>
+ <libalias name="jsp-api.jar" alias="${jsp-api.jar}"/>
+ <libalias name="servlet.jar" alias="${servlet.jar}"/>
+ <libalias name="derby.jar" alias="${derby.jar}"/>
+ <libalias name="derbynet.jar" alias="${derbynet.jar}"/>
+ <libalias name="derbytools.jar" alias="${derbytools.jar}"/>
+ <libalias name="classlib.jar" alias="${classlib.jar}"/>
- <descriptors dir="${descriptors.dir}/">
- <include name="org.classpath.core.xml"/>
- <include name="org.classpath.ext.awt.xml"/>
- <include name="org.classpath.ext.corba.xml"/>
- <include name="org.classpath.ext.core.xml"/>
- <include name="org.classpath.ext.imageio.xml"/>
- <include name="org.classpath.ext.management.xml"/>
- <include name="org.classpath.ext.print.xml"/>
- <include name="org.classpath.ext.security.xml"/>
- <include name="org.classpath.ext.sql.xml"/>
- <include name="org.classpath.ext.xml"/>
- <include name="org.classpath.ext.xml.ws.tools.xml"/>
- <include name="org.classpath.ext.xml.ws.xml"/>
- <include name="org.classpath.ext.xml.xml"/>
- <include name="org.classpath.tools.xml"/>
- <include name="com.sun.tools.javac.xml"/>
- <include name="com.sun.tools.jdi.xml"/>
- <include name="javax.ext.tools.xml"/>
- <include name="sun.tools.xml"/>
- </descriptors>
- </plugin>
+ <descriptors dir="${descriptors.dir}/">
+ <include name="org.classpath.core.xml"/>
+ <include name="org.classpath.ext.awt.xml"/>
+ <include name="org.classpath.ext.corba.xml"/>
+ <include name="org.classpath.ext.core.xml"/>
+ <include name="org.classpath.ext.imageio.xml"/>
+ <include name="org.classpath.ext.management.xml"/>
+ <include name="org.classpath.ext.print.xml"/>
+ <include name="org.classpath.ext.security.xml"/>
+ <include name="org.classpath.ext.sql.xml"/>
+ <include name="org.classpath.ext.xml"/>
+ <include name="org.classpath.ext.xml.ws.tools.xml"/>
+ <include name="org.classpath.ext.xml.ws.xml"/>
+ <include name="org.classpath.ext.xml.xml"/>
+ <include name="org.classpath.tools.xml"/>
+ <include name="com.sun.tools.javac.xml"/>
+ <include name="com.sun.tools.jdi.xml"/>
+ <include name="javax.ext.tools.xml"/>
+ <include name="sun.tools.xml"/>
+ </descriptors>
+ </plugin>
- <touch file="${classlib.stamp}"/>
- </then>
- </if>
+ <touch file="${classlib.stamp}"/>
+ </then>
+ </if>
- <plugin todir="${plugins.dir}" tmpdir="${build.dir}/tmp/plugins" pluginDir="${descriptors.dir}">
- <packager userApplicationsDir="${user.applications.dir}" pathRefId="cp"/>
-
- <libalias name="jnode-core.jar" alias="${jnode-core.jar}"/>
- <libalias name="jnode-distr.jar" alias="${jnode-distr.jar}"/>
- <libalias name="jnode-fs.jar" alias="${jnode-fs.jar}"/>
- <libalias name="jnode-gui.jar" alias="${jnode-gui.jar}"/>
- <libalias name="jnode-textui.jar" alias="${jnode-textui.jar}"/>
- <libalias name="jnode-net.jar" alias="${jnode-net.jar}"/>
- <libalias name="jnode-shell.jar" alias="${jnode-shell.jar}"/>
- <libalias name="jnode-cli.jar" alias="${jnode-cli.jar}"/>
+ <plugin todir="${plugins.dir}" tmpdir="${build.dir}/tmp/plugins" pluginDir="${descriptors.dir}">
+ <packager userApplicationsDir="${user.applications.dir}" pathRefId="cp"/>
- <libalias name="jnode-mmtk-genrc.jar" alias="${jnode-mmtk-genrc.jar}"/>
- <libalias name="jnode-mmtk-ms.jar" alias="${jnode-mmtk-ms.jar}"/>
- <libalias name="jnode-mmtk-nogc.jar" alias="${jnode-mmtk-nogc.jar}"/>
+ <libalias name="jnode-core.jar" alias="${jnode-core.jar}"/>
+ <libalias name="jnode-distr.jar" alias="${jnode-distr.jar}"/>
+ <libalias name="jnode-fs.jar" alias="${jnode-fs.jar}"/>
+ <libalias name="jnode-gui.jar" alias="${jnode-gui.jar}"/>
+ <libalias name="jnode-textui.jar" alias="${jnode-textui.jar}"/>
+ <libalias name="jnode-net.jar" alias="${jnode-net.jar}"/>
+ <libalias name="jnode-shell.jar" alias="${jnode-shell.jar}"/>
+ <libalias name="jnode-cli.jar" alias="${jnode-cli.jar}"/>
- <libalias name="mmtk.jar" alias="${mmtk.jar}"/>
+ <libalias name="jnode-mmtk-genrc.jar" alias="${jnode-mmtk-genrc.jar}"/>
+ <libalias name="jnode-mmtk-ms.jar" alias="${jnode-mmtk-ms.jar}"/>
+ <libalias name="jnode-mmtk-nogc.jar" alias="${jnode-mmtk-nogc.jar}"/>
- <libalias name="commons-net-1.1.0.jar" alias="${commons-net.jar}"/>
- <libalias name="dnsjava-1.6.6.jar" alias="${dnsjava.jar}"/>
- <libalias name="jsch-0.1.24.jar" alias="${jsch.jar}"/>
- <libalias name="log4j.jar" alias="${log4j.jar}"/>
- <libalias name="beanshell.jar" alias="${beanshell.jar}"/>
- <libalias name="nanoxml-java.jar" alias="${nanoxml-java.jar}"/>
- <libalias name="js.jar" alias="${js.jar}"/>
- <libalias name="thinlet.jar" alias="${thinlet.jar}"/>
+ <libalias name="mmtk.jar" alias="${mmtk.jar}"/>
- <libalias name="junit.jar" alias="${junit.jar}"/>
- <libalias name="jmock-1.0.1.jar" alias="${jmock.jar}"/>
- <libalias name="jmock-cglib-1.0.1.jar" alias="${jmock-cglib.jar}"/>
- <libalias name="asm.jar" alias="${asm.jar}"/>
- <libalias name="asm-attrs.jar" alias="${asm-attrs.jar}"/>
- <libalias name="asm-util.jar" alias="${asm-util.jar}"/>
- <libalias name="cglib.jar" alias="${cglib.jar}"/>
- <libalias name="mauve.jar" alias="${mauve.jar}"/>
+ <libalias name="commons-net-1.1.0.jar" alias="${commons-net.jar}"/>
+ <libalias name="dnsjava-1.6.6.jar" alias="${dnsjava.jar}"/>
+ <libalias name="jsch-0.1.24.jar" alias="${jsch.jar}"/>
+ <libalias name="log4j.jar" alias="${log4j.jar}"/>
+ <libalias name="beanshell.jar" alias="${beanshell.jar}"/>
+ <libalias name="nanoxml-java.jar" alias="${nanoxml-java.jar}"/>
+ <libalias name="js.jar" alias="${js.jar}"/>
+ <libalias name="thinlet.jar" alias="${thinlet.jar}"/>
- <libalias name="ant.jar" alias="${ant.jar}"/>
- <libalias name="ant-launcher.jar" alias="${ant-launcher.jar}"/>
- <libalias name="edtftpj.jar" alias="${edtftpj.jar}"/>
- <libalias name="jcifs.jar" alias="${jcifs.jar}"/>
- <libalias name="ejc.jar" alias="${ejc.jar}"/>
- <libalias name="oncrpc.jar" alias="${oncrpc.jar}"/>
- <libalias name="telnetd.jar" alias="${telnetd.jar}"/>
- <libalias name="commons-logging.jar" alias="${commons-logging.jar}"/>
- <libalias name="jawk.jar" alias="${jawk.jar}"/>
- <libalias name="jetty.jar" alias="${jetty.jar}"/>
- <libalias name="jetty-util.jar" alias="${jetty-util.jar}"/>
- <libalias name="jsp.jar" alias="${jsp.jar}"/>
- <libalias name="jsp-api.jar" alias="${jsp-api.jar}"/>
- <libalias name="servlet.jar" alias="${servlet.jar}"/>
- <libalias name="derby.jar" alias="${derby.jar}"/>
- <libalias name="derbynet.jar" alias="${derbynet.jar}"/>
- <libalias name="derbytools.jar" alias="${derbytools.jar}"/>
+ <libalias name="junit.jar" alias="${junit.jar}"/>
+ <libalias name="jmock-1.0.1.jar" alias="${jmock.jar}"/>
+ <libalias name="jmock-cglib-1.0.1.jar" alias="${jmock-cglib.jar}"/>
+ <libalias name="asm.jar" alias="${asm.jar}"/>
+ <libalias name="asm-attrs.jar" alias="${asm-attrs.jar}"/>
+ <libalias name="asm-util.jar" alias="${asm-util.jar}"/>
+ <libalias name="cglib.jar" alias="${cglib.jar}"/>
+ <libalias name="mauve.jar" alias="${mauve.jar}"/>
- <descriptors dir="${descriptors.dir}/">
- <include name="*.xml"/>
- <exclude name="*plugin-list.xml"/>
- <exclude name="com.sun.tools.javac.xml"/>
- <exclude name="com.sun.tools.jdi.xml"/>
- <exclude name="javax.ext.tools.xml"/>
- <exclude name="sun.tools.xml"/>
- <exclude name="org.classpath.core.xml"/>
- <exclude name="org.classpath.core.xml"/>
- <exclude name="org.classpath.ext.awt.xml"/>
- <exclude name="org.classpath.ext.corba.xml"/>
- <exclude name="org.classpath.ext.core.xml"/>
- <exclude name="org.classpath.ext.imageio.xml"/>
- <exclude name="org.classpath.ext.management.xml"/>
- <exclude name="org.classpath.ext.print.xml"/>
- <exclude name="org.classpath.ext.security.xml"/>
- <exclude name="org.classpath.ext.sql.xml"/>
- <exclude name="org.classpath.ext.xml"/>
- <exclude name="org.classpath.ext.xml.ws.tools.xml"/>
- <exclude name="org.classpath.ext.xml.ws.xml"/>
- <exclude name="org.classpath.ext.xml.xml"/>
- <exclude name="org.classpath.tools.xml"/>
- </descriptors>
- </plugin>
- </target>
+ <libalias name="ant.jar" alias="${ant.jar}"/>
+ <libalias name="ant-launcher.jar" alias="${ant-launcher.jar}"/>
+ <libalias name="edtftpj.jar" alias="${edtftpj.jar}"/>
+ <libalias name="jcifs.jar" alias="${jcifs.jar}"/>
+ <libalias name="ejc.jar" alias="${ejc.jar}"/>
+ <libalias name="oncrpc.jar" alias="${oncrpc.jar}"/>
+ <libalias name="telnetd.jar" alias="${telnetd.jar}"/>
+ <libalias name="commons-logging.jar" alias="${commons-logging.jar}"/>
+ <libalias name="jawk.jar" alias="${jawk.jar}"/>
+ <libalias name="jetty.jar" alias="${jetty.jar}"/>
+ <libalias name="jetty-util.jar" alias="${jetty-util.jar}"/>
+ <libalias name="jsp.jar" alias="${jsp.jar}"/>
+ <libalias name="jsp-api.jar" alias="${jsp-api.jar}"/>
+ <libalias name="servlet.jar" alias="${servlet.jar}"/>
+ <libalias name="derby.jar" alias="${derby.jar}"/>
+ <libalias name="derbynet.jar" alias="${derbynet.jar}"/>
+ <libalias name="derbytools.jar" alias="${derbytools.jar}"/>
- <!-- Assemble all default initjars -->
- <target name="assemble-default-initjars" depends="assemble-plugins" unless="no.default.initjars">
- <!-- Build all default initjar's -->
- <taskdef name="initjars" classname="org.jnode.build.InitJarsBuilder" classpathref="cp-jnode"/>
- <initjars destdir="${initjars.dir}"
+ <descriptors dir="${descriptors.dir}/">
+ <include name="*.xml"/>
+ <exclude name="*plugin-list.xml"/>
+ <exclude name="com.sun.tools.javac.xml"/>
+ <exclude name="com.sun.tools.jdi.xml"/>
+ <exclude name="javax.ext.tools.xml"/>
+ <exclude name="sun.tools.xml"/>
+ <exclude name="org.classpath.core.xml"/>
+ <exclude name="org.classpath.core.xml"/>
+ <exclude name="org.classpath.ext.awt.xml"/>
+ <exclude name="org.classpath.ext.corba.xml"/>
+ <exclude name="org.classpath.ext.core.xml"/>
+ <exclude name="org.classpath.ext.imageio.xml"/>
+ <exclude name="org.classpath.ext.management.xml"/>
+ <exclude name="org.classpath.ext.print.xml"/>
+ <exclude name="org.classpath.ext.security.xml"/>
+ <exclude name="org.classpath.ext.sql.xml"/>
+ <exclude name="org.classpath.ext.xml"/>
+ <exclude name="org.classpath.ext.xml.ws.tools.xml"/>
+ <exclude name="org.classpath.ext.xml.ws.xml"/>
+ <exclude name="org.classpath.ext.xml.xml"/>
+ <exclude name="org.classpath.tools.xml"/>
+ </descriptors>
+ </plugin>
+ </target>
+
+ <!-- Assemble all default initjars -->
+ <target name="assemble-default-initjars" depends="assemble-plugins" unless="no.default.initjars">
+ <!-- Build all default initjar's -->
+ <taskdef name="initjars" classname="org.jnode.build.InitJarsBuilder" classpathref="cp-jnode"/>
+ <initjars destdir="${initjars.dir}"
pluginDir="${plugins.dir}"
systemPluginList="${root.dir}/all/conf/system-plugin-list.xml">
- <insert userApplicationsDir="${user.applications.dir}"/>
+ <insert userApplicationsDir="${user.applications.dir}"/>
- <fileset dir="${root.dir}/all/conf">
- <exclude name="system-plugin-list.xml"/>
- <include name="*plugin-list.xml"/>
- </fileset>
- </initjars>
- </target>
+ <fileset dir="${root.dir}/all/conf">
+ <exclude name="system-plugin-list.xml"/>
+ <include name="*plugin-list.xml"/>
+ </fileset>
+ </initjars>
+ </target>
- <!-- Assemble all custom initjars -->
- <target name="assemble-custom-initjars" depends="assemble-plugins" if="custom.plugin-list.dir">
- <!-- Build all custom initjar's -->
- <taskdef name="initjars" classname="org.jnode.build.InitJarsBuilder" classpathref="cp-jnode"/>
- <initjars destdir="${initjars.dir}"
+ <!-- Assemble all custom initjars -->
+ <target name="assemble-custom-initjars" depends="assemble-plugins" if="custom.plugin-list.dir">
+ <!-- Build all custom initjar's -->
+ <taskdef name="initjars" classname="org.jnode.build.InitJarsBuilder" classpathref="cp-jnode"/>
+ <initjars destdir="${initjars.dir}"
pluginDir="${plugins.dir}"
systemPluginList="${root.dir}/all/conf/system-plugin-list.xml">
- <insert userApplicationsDir="${user.applications.dir}"/>
- <fileset dir="${custom.plugin-list.dir}">
- <include name="*plugin-list.xml"/>
- </fileset>
- </initjars>
- </target>
+ <insert userApplicationsDir="${user.applications.dir}"/>
+ <fileset dir="${custom.plugin-list.dir}">
+ <include name="*plugin-list.xml"/>
+ </fileset>
+ </initjars>
+ </target>
- <!-- Assemble all subprojects, plugins and initjars -->
- <target name="assemble" depends="assemble-default-initjars, assemble-custom-initjars">
- </target>
+ <target name="assemble" depends="assemble-default-initjars, assemble-custom-initjars" description="Assemble all subprojects, plugins and initjars.">
+ </target>
- <!-- Give help on possible targets -->
- <target name="help" description="help on the important targets">
- <echo>
+
+ <target name="help" description="Display detailed usage information.">
+ <echo>
Welcome to the JNode build system.
You can use this build system to perform various tasks,
@@ -554,11 +553,7 @@
32-bit architecture.
cd-x86_64-lite Build the JNode bootable CD-ROM for the X86
64-bit architecture.
-<!--
-create-patch Create a patch file containing the differences
- between the local sources and the cvs HEAD
- branch.
--->
+
boot-files-winNT Build the JNode boot files for windows NT/2K/XP
used together with NTLDR
@@ -574,77 +569,71 @@
clean Remove all intermediate build results.
</echo>
- </target>
+ </target>
- <!-- Macro used to call the x86 build script -->
- <macrodef name="x86-build">
- <attribute name="bits"/>
- <attribute name="target" default="all"/>
- <sequential>
- <ant antfile="build-x86.xml" inheritall="on" inheritrefs="on" target="@{target}">
- <property name="jnode.bits" value="@{bits}"/>
- </ant>
- </sequential>
- </macrodef>
+ <macrodef name="x86-build" description="Call the x86 build script.">
+ <attribute name="bits"/>
+ <attribute name="target" default="all"/>
+ <sequential>
+ <ant antfile="build-x86.xml" inheritall="on" inheritrefs="on" target="@{target}">
+ <property name="jnode.bits" value="@{bits}"/>
+ </ant>
+ </sequential>
+ </macrodef>
- <!-- Create the X86 32-bit boot image -->
- <target name="x86" depends="assemble">
- <x86-build bits="32"/>
- </target>
+ <target name="x86" depends="assemble" description="Create the X86 32-bit boot image">
+ <x86-build bits="32"/>
+ </target>
- <!-- Create the X86 64-bit boot image-->
- <target name="x86_64" depends="assemble">
- <x86-build bits="64"/>
- </target>
+ <target name="x86_64" depends="assemble" description="Create the X86 64-bit boot image">
+ <x86-build bits="64"/>
+ </target>
- <!-- Create the JOP boot image -->
- <target name="jop" depends="assemble">
- <ant antfile="build-jop.xml" inheritall="on" inheritrefs="on"/>
- </target>
+ <target name="jop" depends="assemble" description="Create the JOP boot image">
+ <ant antfile="build-jop.xml" inheritall="on" inheritrefs="on"/>
+ </target>
- <!-- Build the boot files for windows NT/2K/XP (with NTLDR) -->
- <target name="boot-files-winNT" depends="assemble">
- <x86-build bits="32" target="boot-files-winNT"/>
- </target>
+ <target name="boot-files-winNT" depends="assemble" description="Build the boot files for windows NT/2K/XP (with NTLDR)">
+ <x86-build bits="32" target="boot-files-winNT"/>
+ </target>
- <!-- Create a bootable CDROM image containing all x86 bootable images and the sources -->
- <target name="cd-x86" depends="assemble" description="create a bootable JNode CD image with sources included">
- <tar destfile="${sources.dist.tar.gz}" compression="gzip" basedir="${root.dir}" excludes="*/build/**"/>
- <x86-build bits="32" target="java-image"/>
- <!-- TODO enable this when 64 bit support is working -->
- <!--x86-build bits="64" target="java-image"/-->
- <property name="jnode.bits" value="32" />
- <ant antfile="build-x86.xml" inheritall="true" inheritrefs="true" target="cdrom"/>
- </target>
+ <!-- Create a bootable CDROM image containing all x86 bootable images and the sources -->
+ <target name="cd-x86" depends="assemble" description="Create a bootable JNode CD image with sources included">
+ <tar destfile="${sources.dist.tar.gz}" compression="gzip" basedir="${root.dir}" excludes="*/build/**"/>
+ <x86-build bits="32" target="java-image"/>
+ <!-- TODO enable this when 64 bit support is working -->
+ <!--x86-build bits="64" target="java-image"/-->
+ <property name="jnode.bits" value="32" />
+ <ant antfile="build-x86.xml" inheritall="true" inheritrefs="true" target="cdrom"/>
+ </target>
- <!-- Create a bootable CDROM image for x86 32-bits -->
- <target name="cd-x86-lite" depends="assemble" description="create a bootable JNode CD image">
- <x86-build bits="32" target="java-image"/>
- <property name="jnode.bits" value="32" />
- <ant antfile="build-x86.xml" inheritall="true" inheritrefs="true" target="cdrom-lite"/>
- </target>
+ <!-- Create a bootable CDROM image for x86 32-bits -->
+ <target name="cd-x86-lite" depends="assemble" description="Create a bootable JNode CD image">
+ <x86-build bits="32" target="java-image"/>
+ <property name="jnode.bits" value="32" />
+ <ant antfile="build-x86.xml" inheritall="true" inheritrefs="true" target="cdrom-lite"/>
+ </target>
- <!-- Create a bootable CDROM image for x86 64-bits -->
- <target name="cd-x86_64-lite" depends="assemble">
- <x86-build bits="64" target="java-image"/>
- <property name="jnode.bits" value="64" />
- <ant antfile="build-x86.xml" inheritall="true" inheritrefs="true" target="cdrom_64-lite"/>
- </target>
+ <target name="cd-x86_64-lite" depends="assemble" description="Create a bootable CDROM image for x86 64-bits">
+ <x86-build bits="64" target="java-image"/>
+ <property name="jnode.bits" value="64" />
+ <ant antfile="build-x86.xml" inheritall="true" inheritrefs="true" target="cdrom_64-lite"/>
+ </target>
- <!-- Upload a distribution -->
- <target name="upload">
- <property name="upload.dir" value="${build.dir}/upload"/>
- <mkdir dir="${upload.dir}"/>
- <gzip src="${jnode-x86.iso}" destfile="${upload.dir}/jnode-x86-${jnode-ver}.iso.gz"/>
- <copy todir="${upload.dir}" file="${sources.dist.tar.gz}"/>
- <checksum algorithm="MD5" forceoverwrite="true">
- <fileset dir="${upload.dir}">
- <include name="jnode-x86-${jnode-ver}.iso.gz" />
- <include name="jnodesources-${jnode-ver}.tar.gz" />
- </fileset>
- </checksum>
- <echo message="FTP upload disabled. Uploadables are in: ${upload.dir}"/>
- <!--
+ <!-- Upload a distribution -->
+ <target name="upload">
+ <property name="upload.dir" value="${build.dir}/upload"/>
+ <mkdir dir="${upload.dir}"/>
+ <gzip src="${jnode-x86.iso}" destfile="${upload.dir}/jnode-x86-${jnode-ver}.iso.gz"/>
+ <copy todir="${upload.dir}" file="${sources.dist.tar.gz}"/>
+ <checksum algorithm="MD5" forceoverwrite="true">
+ <fileset dir="${upload.dir}">
+ <include name="jnode-x86-${jnode-ver}.iso.gz" />
+ <include name="jnodesources-${jnode-ver}.tar.gz" />
+ </fileset>
+ </checksum>
+ <echo message="FTP upload disabled. Uploadables are in: ${upload.dir}"/>
+ <!--
TODO find a way to automatically upload the files
jsch based scp with sftp fails with an error to sourceforge
FTP uploads are abandone by sourceforge
@@ -652,108 +641,107 @@
<fileset dir="${upload.dir}"/>
</ftp>
-->
- </target>
-
+ </target>
+
<!-- Save virtualization etc state across 'clean' -->
<target name="save">
- <copy file="${cdroms.dir}/JNode.nvram" todir="${save.dir}" failonerror="no"/>
+ <copy file="${cdroms.dir}/JNode.nvram" todir="${save.dir}" failonerror="no"/>
</target>
- <!-- Clean everything files -->
- <target name="clean" depends="save" description="clean the complete build output">
- <jnode.antall target="clean"/>
- <delete dir="${build.dir}" quiet="on"/>
- </target>
-
+ <!-- Clean everything files -->
+ <target name="clean" depends="save" description="clean the complete build output">
+ <jnode.antall target="clean"/>
+ <delete dir="${build.dir}" quiet="on"/>
+ </target>
+
<path id="cp-javadoc">
- <path refid="cp"/>
+ <path refid="cp"/>
<pathelement location="${bcel-5.1.jar}"/>
<pathelement location="${nanoxml-java.jar}"/>
</path>
- <!-- Generate only the basic api javadoc files -->
- <target name="javadoc-small" description="generate documentation of the basic JNode APIs">
- <jnode.javadoc destdir="${build.dir}/javadoc/small">
- <sourcepath>
- <pathelement location="${root.dir}/core/src/classlib"/>
- <pathelement location="${root.dir}/core/src/classpath/ext"/>
- <pathelement location="${root.dir}/core/src/classpath/vm"/>
- <pathelement location="${root.dir...
[truncated message content] |
