Menu
▾
▴
[Jnode-svn-commits] SF.net SVN: jnode:[5253] classlib6
|
From: <ls...@us...> - 2009-04-12 07:55:13
|
Revision: 5253
http://jnode.svn.sourceforge.net/jnode/?rev=5253&view=rev
Author: lsantha
Date: 2009-04-12 07:55:10 +0000 (Sun, 12 Apr 2009)
Log Message:
-----------
Removing non-classlib classes.
Modified Paths:
--------------
classlib6/all/build.xml
classlib6/builder/build.xml
classlib6/core/build.xml
Removed Paths:
-------------
classlib6/all/build-jop.xml
classlib6/all/build-x86.xml
classlib6/all/jnode_checks.xml
classlib6/all/new_checks.xml
Deleted: classlib6/all/build-jop.xml
===================================================================
--- classlib6/all/build-jop.xml 2009-04-12 07:54:15 UTC (rev 5252)
+++ classlib6/all/build-jop.xml 2009-04-12 07:55:10 UTC (rev 5253)
@@ -1,123 +0,0 @@
-<project name="JNode-jop" default="all" basedir=".">
-
- <property name="my-build.dir" value="${build.dir}/jop" />
- <property name="my-lib.dir" value="${basedir}/lib/jop" />
- <property name="my-conf.dir" value="${basedir}/conf/jop" />
-
- <property name="build.netboot.dir" value="${my-build.dir}/netboot" />
-
- <!-- Properties for building the boot files for Spartan-3/JOP -->
- <property name="bin-jop.dir" value="${basedir}\bin-jop" />
- <property name="conf-jop.dir" value="${basedir}\conf\jop" />
- <property name="lib-jop.dir" value="${basedir}\lib\jop" />
- <!-- end of Properties for building the boot files for Spartan-3/JOP -->
-
- <path id="cp-jop">
- <pathelement location="${jnode-mmtk.jar}" />
- <pathelement location="${jnode-builder.jar}" />
- <pathelement location="${jnode-core.jar}" />
- <pathelement location="${jnode-fs.jar}" />
- <pathelement location="${jnode-shell.jar}" />
- <pathelement location="${jnode-net.jar}" />
- <pathelement location="${jnode-gui.jar}" />
- <path refid="cp" />
- <pathelement location="${my-conf.dir}" />
- <pathelement location="${grub.dir}" />
- <pathelement location="${descriptors.dir}" />
- <pathelement location="${dom4j.jar}" />
- <pathelement location="${mmtk.jar}" />
- </path>
-
- <target name="test-properties">
- <condition property="jop-properties.exists">
- <available file="build-jop.properties" />
- </condition>
- </target>
- <target name="load-properties" if="jop-properties.exists">
- <property file="build-jop.properties" />
- </target>
- <target name="default-properties" unless="jop-properties.exists">
- <property name="jnodedrive.dir" value="${my-build.dir}" />
- </target>
-
- <target name="prepare-props" depends="test-properties,load-properties,default-properties">
- <property name="jnode.kernel.dir" value="${jnodedrive.dir}" />
- <property name="jnode.kernel" value="${jnode.kernel.dir}/jnodejop.gz" />
- <property name="jnode.compiler" value="default" />
-
- <property name="build.bootimage.dir" value="${my-build.dir}/bootimage" />
- </target>
-
- <!-- Initialize all project directories -->
- <target name="prepare-dirs" depends="prepare-props">
- <mkdir dir="${build.bootimage.dir}" />
- <mkdir dir="${build.netboot.dir}" />
- </target>
-
- <!-- Initialize all project properties -->
- <target name="prepare" depends="prepare-dirs">
- </target>
-
- <!-- Build the java object file -->
- <target name="java-image" depends="prepare">
- </target>
-
- <macrodef name="create-cdrom">
- <attribute name="dir" />
- <attribute name="destfile" />
- <sequential>
- <mkdir dir="@{dir}/boot/grub" />
- <copy todir="@{dir}">
- <fileset dir="${jnode.kernel.dir}" includes="jnode*.gz"/>
- </copy>
- <copy todir="@{dir}">
- <fileset dir="${initjars.dir}" />
- </copy>
- <copy file="${my-lib.dir}/stage2_eltorito" todir="@{dir}/boot/grub" />
- <copy file="${grub.menu.cdrom}" tofile="@{dir}/boot/grub/menu.lst" />
- <exec executable="mkisofs">
- <arg line="-o @{destfile} -R -b boot/grub/stage2_eltorito -no-emul-boot -boot-load-size 4 -boot-info-table @{dir}" />
- </exec>
- </sequential>
- </macrodef>
-
- <!-- Create a full distributable bootable CDROM image -->
- <target name="cdrom" depends="prepare">
- <copy file="${sources.dist.tar.gz}" todir="${my-build.dir}/cdrom-full" />
- <create-cdrom destfile="${jnode-jop.iso}" dir="${my-build.dir}/cdrom-full" />
- </target>
-
- <!-- Create a bootable CDROM image -->
- <target name="cdrom-lite" depends="prepare">
- <create-cdrom destfile="${jnode-jop-lite.iso}" dir="${my-build.dir}/cdrom-lite" />
- </target>
-
- <!-- Prepare for netboot -->
- <target name="netboot" depends="java-image" unless="no.netboot">
- <copy file="${jnode.kernel}" todir="${build.netboot.dir}" />
- <copy todir="${build.netboot.dir}">
- <fileset dir="${initjars.dir}" />
- </copy>
- <copy todir="${build.netboot.dir}">
- <fileset dir="${my-lib.dir}">
- <include name="nbgrub-*" />
- <include name="pxegrub-*" />
- </fileset>
- <fileset dir="${my-conf.dir}">
- <include name="menu-nb.lst" />
- <include name="menu-pxe.lst*" />
- </fileset>
- </copy>
- <mkdir dir="${build.netboot.dir}/plugins" />
- <copy todir="${build.netboot.dir}/plugins">
- <fileset dir="${plugins.dir}" />
- </copy>
- </target>
-
- <!-- Run all required targets -->
- <target name="all" depends="java-image">
- </target>
-
-</project>
-
-
Deleted: classlib6/all/build-x86.xml
===================================================================
--- classlib6/all/build-x86.xml 2009-04-12 07:54:15 UTC (rev 5252)
+++ classlib6/all/build-x86.xml 2009-04-12 07:55:10 UTC (rev 5253)
@@ -1,383 +0,0 @@
-<project name="JNode-x86" default="all" basedir=".">
-
- <property name="my-build.dir" value="${build.dir}/x86" />
- <property name="my-lib.dir" value="${basedir}/lib/x86" />
- <property name="my-conf.dir" value="${basedir}/conf/x86" />
-
- <property name="src.native.dir" value="${root.dir}/core/src/native" />
- <property name="build.netboot.dir" value="${my-build.dir}/netboot" />
- <property name="jnode.disk" value="${my-build.dir}/jnodedisk${jnode.bits}.dat" />
- <property name="jnode.disk.pln" value="${my-build.dir}/jnodedisk${jnode.bits}.pln" />
- <property name="jnode.disk.geometry" value="64/16/63" />
-
- <property name="jnode.virtual.memsize" value="512" />
- <property name="logFile" value="${build.dir}/debugger.txt" />
-
- <property name="grub-ver" value="grub-0.97-i386-pc" />
- <property name="grub.dir" value="${my-build.dir}/${grub-ver}/boot/grub" />
- <property name="grub.dist" value="${my-lib.dir}/${grub-ver}.tar.gz" />
-
- <property name="grub.stage1.name" value="stage1" />
- <property name="grub.stage2.name" value="stage2" />
- <property name="grub.menu" value="${my-conf.dir}/menu.lst" />
- <property name="grub.menu.cdrom" value="${my-conf.dir}/menu-cdrom.lst" />
-
- <!-- Properties for building the boot files for windows NT/2K/XP -->
- <property name="jnode.install-nt.dir" value="C:\jnode" />
- <!-- (hd0,0) stands for harddisk 0, partition 0 -->
- <property name="partition-nt.grub.menu" value="(hd0,0)" />
- <!-- patch -->
- <property name="partition-nt.grub.menu.final" value="${partition-nt.grub.menu}/jnode" />
- <property name="partition-nt" value="C:" />
-
- <property name="bin-nt.dir" value="${basedir}\bin-nt" />
- <property name="conf-nt.dir" value="${basedir}\conf\x86-nt" />
- <property name="lib-nt.dir" value="${basedir}\lib\x86-nt" />
-
- <property name="grub.stage1-nt.name" value="stage1-nt" />
- <property name="grub.stage2-nt.name" value="stage2-nt" />
-
- <property name="grub.stage1-nt" value="${lib-nt.dir}\${grub.stage1-nt.name}" />
- <property name="grub.stage2-nt" value="${lib-nt.dir}\${grub.stage2-nt.name}" />
-
- <property name="grub.install-nt.exe" value="${bin-nt.dir}\grubinstall-nt.exe" />
- <!-- end of Properties for building the boot files for windows NT/2K/XP -->
-
- <path id="cp-x86">
- <pathelement location="${jnode-mmtk.jar}" />
- <pathelement location="${jnode-builder.jar}" />
- <pathelement location="${jnode-core.jar}" />
- <pathelement location="${jnode-fs.jar}" />
- <pathelement location="${jnode-shell.jar}" />
- <pathelement location="${jnode-net.jar}" />
- <pathelement location="${jnode-gui.jar}" />
- <path refid="cp" />
- <pathelement location="${my-conf.dir}" />
- <pathelement location="${grub.dir}" />
- <pathelement location="${descriptors.dir}" />
- <pathelement location="${dom4j.jar}" />
- <pathelement location="${mmtk.jar}" />
- </path>
-
- <target name="test-properties">
- <condition property="x86-properties.exists">
- <available file="build-x86.properties" />
- </condition>
- </target>
- <target name="load-properties" if="x86-properties.exists">
- <property file="build-x86.properties" />
- </target>
- <target name="default-properties" unless="x86-properties.exists">
- <property name="jnodedrive.dir" value="${my-build.dir}" />
- </target>
-
- <target name="prepare-props" depends="test-properties,load-properties,default-properties">
- <property name="jnode.kernel.dir" value="${jnodedrive.dir}" />
- <property name="jnode.kernel" value="${jnode.kernel.dir}/jnode${jnode.bits}.gz" />
- <property name="jnode.compiler" value="default" />
-
- <property name="build.native.dir" value="${my-build.dir}/${jnode.bits}bits/native" />
- <property name="build.bootimage.dir" value="${my-build.dir}/${jnode.bits}bits/bootimage" />
- <condition property="vmware.vmx.overrides" value="">
- <and>
- <not>
- <isset property="vmware.vmx.overrides"/>
- </not>
- </and>
- </condition>
- <condition property="vmware.vmx.vmdk.image"
- value="${jnode.virtual.disk.dir}/${jnode.virtual.disk}" else="">
- <and>
- <equals arg1="${jnode.virtualization.platform}" arg2="vmware" casesensitive="false"/>
- <isset property="jnode.virtual.disk.dir"/>
- <isset property="jnode.virtual.disk"/>
- </and>
- </condition>
- </target>
-
- <!-- Initialize all project directories -->
- <target name="prepare-dirs" depends="prepare-props">
- <mkdir dir="${build.native.dir}" />
- <mkdir dir="${build.native.dir}/output" />
- <mkdir dir="${build.native.dir}/src" />
- <mkdir dir="${build.bootimage.dir}" />
- <mkdir dir="${build.netboot.dir}" />
- </target>
-
- <target name="test-grub">
- <available file="${grub.dir}" property="grub.exists" />
- </target>
-
- <target name="grub" depends="prepare-dirs,test-grub" unless="grub.exists">
- <untar src="${grub.dist}" dest="${my-build.dir}" compression="gzip" />
- </target>
-
- <!-- Initialize all project properties -->
- <target name="prepare" depends="grub">
- <copy todir="${grub.dir}">
- <fileset dir="${my-lib.dir}">
- <include name="nbgrub-*" />
- <include name="pxegrub-*" />
- </fileset>
- <fileset dir="${my-conf.dir}">
- <include name="menu-nb.lst" />
- <include name="menu-pxe.lst*" />
- </fileset>
- </copy>
- </target>
-
- <target name="asm-native" depends="prepare">
- <taskdef name="genconst" classname="org.jnode.build.x86.AsmConstBuilder" classpathref="cp-x86" />
- <taskdef name="asm" classname="org.jnode.ant.taskdefs.Asm" classpathref="cp-x86" />
-
- <genconst destfile="${build.native.dir}/src/java.inc" bits="${jnode.bits}" classesURL="file:///${jnode-core.jar}/">
- <class classname="java.lang.Throwable" />
- <class classname="org.jnode.build.x86.BootImageBuilder" static="on" />
- <class classname="org.jnode.vm.SoftByteCodes" static="on" />
- <class classname="org.jnode.vm.scheduler.VmProcessor" />
- <class classname="org.jnode.vm.scheduler.VmProcessor" static="on" />
- <class classname="org.jnode.vm.scheduler.VmThread" />
- <class classname="org.jnode.vm.scheduler.VmThread" static="on" />
- <class classname="org.jnode.vm.classmgr.ObjectLayout" static="on" />
- <class classname="org.jnode.vm.classmgr.TIBLayout" static="on" />
- <class classname="org.jnode.vm.classmgr.VmArray" static="on" />
- <class classname="org.jnode.vm.classmgr.VmMethod" />
- <class classname="org.jnode.vm.classmgr.VmStatics" />
- <class classname="org.jnode.vm.classmgr.VmType" />
- <class classname="org.jnode.vm.x86.MSR" />
- <class classname="org.jnode.vm.x86.VmX86Processor" />
- <class classname="org.jnode.vm.x86.VmX86StackReader" static="on" />
- <class classname="org.jnode.vm.x86.VmX86Thread" />
- <class classname="org.jnode.vm.x86.VmX86Thread" static="on" />
- <class classname="org.jnode.vm.x86.VmX86Thread64" />
- </genconst>
-
- <dependset>
- <srcfileset dir="${src.native.dir}/x86" />
- <srcfileset dir="${build.native.dir}/src" />
- <targetfileset dir="${build.native.dir}/output" />
- </dependset>
-
- <asm srcdir="${src.native.dir}/x86"
- destdir="${build.native.dir}/output"
- outputFormat="elf"
- extension="o"
- bits="${jnode.bits}"
- listfile="${build.native.dir}/jnodenative.lst"
- enablejnasm="${jnode.enable.jnasm}"
- version="${jnode-ver} ${TODAY}">
- <includedir dir="${src.native.dir}/x86" />
- <includedir dir="${build.native.dir}/src" />
- <include name="jnode.asm" />
- </asm>
- </target>
-
- <!-- Build the java object file -->
- <target name="java-image" depends="asm-native">
- <taskdef name="bootimage" classname="org.jnode.build.x86.BootImageBuilder" classpathref="cp-x86" />
-
- <bootimage
- destfile="${build.bootimage.dir}/bootimage.bin"
- listfile="${build.bootimage.dir}/bootimage.lst"
- debugfile="${build.bootimage.dir}/bootimage.debug"
- kernelfile="${build.native.dir}/output/jnode.o"
- pluginList="${system-plugin-list}"
- pluginDir="${plugins.dir}"
- targetArch="x86"
- memMgrPluginId="${jnode.memmgr.plugin.id}"
- cpu="${cpu}"
- version="${jnode-ver}"
- jnodeCompiler="${jnode.compiler}"
- bits="${jnode.bits}"
- enableJNasm="${jnode.enable.jnasm}">
-
- <nanokernelsources srcfile="${src.native.dir}/x86/jnode.asm">
- <includedir dir="${src.native.dir}/x86" />
- <includedir dir="${build.native.dir}/src" />
- </nanokernelsources>
-
- </bootimage>
-
- <gzip src="${build.bootimage.dir}/bootimage.bin" zipfile="${jnode.kernel}" />
- </target>
-
- <!-- Build the boot disk -->
- <target name="boot-disk" depends="java-image" unless="no.bootdisk">
- <taskdef name="bootdisk" classname="org.jnode.build.BootDiskBuilder" classpathref="cp-x86" />
-
- <property name="bootdisk.dir" value="${my-build.dir}/${jnode.bits}bits/bootdisk" />
-
- <mkdir dir="${bootdisk.dir}" />
- <mkdir dir="${bootdisk.dir}/boot/grub" />
- <copy file="${jnode.kernel}" todir="${bootdisk.dir}" />
- <copy file="${grub.menu}" todir="${bootdisk.dir}/boot/grub" />
- <copy todir="${bootdisk.dir}">
- <fileset dir="${initjars.dir}">
- <!-- Limit the size of the bootdisk -->
- <include name="default.jgz"/>
- <include name="full.jgz"/>
- </fileset>
- </copy>
-
- <bootdisk destfile="${jnode.disk}" stage1ResourceName="${grub.stage1.name}" stage2ResourceName="${grub.stage2.name}" plnfile="${jnode.disk.pln}" geometry="${jnode.disk.geometry}">
- <fileset dir="${bootdisk.dir}" />
- </bootdisk>
- </target>
-
- <!-- Build the boot files for windows NT/2K/XP (with NTLDR) -->
- <target name="boot-files-winNT" depends="java-image">
- <mkdir dir="${jnode.install-nt.dir}" />
-
- <copy file="${jnode.kernel}" todir="${jnode.install-nt.dir}" overwrite ="yes" />
- <copy file="${grub.menu}" todir="${jnode.install-nt.dir}" overwrite ="yes" />
- <copy todir="${jnode.install-nt.dir}" overwrite ="yes">
- <fileset dir="${initjars.dir}" />
- </copy>
- <copy file="${grub.stage1-nt}" todir="${jnode.install-nt.dir}" overwrite ="yes" />
- <copy file="${grub.stage2-nt}" todir="${jnode.install-nt.dir}" overwrite ="yes" />
-
- <replace file="${jnode.install-nt.dir}/menu.lst"
- token="(hd0,0)" value="${partition-nt.grub.menu}"/>
-
- <!-- patch -->
- <replace file="${jnode.install-nt.dir}/menu.lst"
- token="${partition-nt.grub.menu}" value="${partition-nt.grub.menu.final}"/>
-
-
- <echo message="${grub.install-nt.exe} -d ${partition-nt} -1 ${jnode.install-nt.dir}\${grub.stage1-nt.name} -2 ${jnode.install-nt.dir}\${grub.stage2-nt.name} -m ${jnode.install-nt.dir}\menu.lst" />
-
- <!-- the following wait is needed else grubinstall will fail finding stage2 -->
- <sleep seconds="20" />
-
- <exec executable="${grub.install-nt.exe}">
- <arg line="-d ${partition-nt} -1 ${jnode.install-nt.dir}\${grub.stage1-nt.name} -2 ${jnode.install-nt.dir}\${grub.stage2-nt.name} -m ${jnode.install-nt.dir}\menu.lst" />
- </exec>
-
- <!-- patch
- <replace file="${jnode.install-nt.dir}/menu.lst"
- token="${partition-nt.grub.menu}" value="${partition-nt.grub.menu.final}"/>
- -->
- </target>
-
- <macrodef name="create-cdrom">
- <attribute name="dir" />
- <attribute name="destfile" />
- <sequential>
- <mkdir dir="@{dir}/boot/grub" />
- <copy todir="@{dir}">
- <fileset dir="${jnode.kernel.dir}" includes="jnode*.gz"/>
- </copy>
- <copy todir="@{dir}">
- <fileset dir="${initjars.dir}" />
- </copy>
- <copy file="${my-lib.dir}/eltorito.s2" todir="@{dir}/boot/grub" />
- <copy file="${my-lib.dir}/fat.s15" todir="@{dir}/boot/grub" />
- <copy file="${my-lib.dir}/grub.s1" todir="@{dir}/boot/grub" />
- <copy file="${my-lib.dir}/grub.s2" todir="@{dir}/boot/grub" />
- <copy file="${grub.menu.cdrom}" tofile="@{dir}/boot/grub/menu.lst" />
- <if>
- <equals arg1="${jnode.enable.mkisofs}" arg2="true" />
- <then>
- <!-- 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>
- <contains string="${os.name}" substring="windows" casesensitive="false" />
- <contains string="${root.dir}" substring=" " casesensitive="false" />
- </and>
- </condition>
- </fail>
- <exec executable="mkisofs">
- <arg line="-o @{destfile} -R -b boot/grub/eltorito.s2 -no-emul-boot -boot-load-size 4 -boot-info-table @{dir}" />
- </exec>
- </then>
- <else>
- <taskdef name="jiic-iso" classname="de.tu_darmstadt.informatik.rbg.hatlak.iso9660.ISOTask" classpathref="cp-x86" />
- <jiic-iso basedir="@{dir}"
- destfile="@{destfile}"
- enableRockRidge="true"
- mkisofsCompatibility="true"
- bootImage="@{dir}/boot/grub/eltorito.s2"
- bootImageSectorCount="4"
- genBootInfoTable="true"
- />
- </else>
- </if>
- </sequential>
- </macrodef>
-
- <!-- Create a full distributable bootable CDROM image -->
- <target name="cdrom" depends="prepare">
- <copy file="${sources.dist.tar.gz}" todir="${my-build.dir}/cdrom-full" />
- <create-cdrom destfile="${jnode-x86.iso}" dir="${my-build.dir}/cdrom-full" />
-
- <taskdef name="vmware" classname="org.jnode.build.VMwareBuilderTask" classpathref="cp-x86" />
- <vmware
- isoFile="${jnode-x86.iso}"
- logFile="${logFile}"
- memSize="${jnode.virtual.memsize}"
- saveDir="${save.dir}"
- vmdkImageFile="${vmware.vmx.vmdk.image}"
- overrideFile="${vmware.vmx.overrides}"
- />
- </target>
-
- <!-- Create a bootable CDROM image -->
- <target name="cdrom-lite" depends="prepare">
- <create-cdrom destfile="${jnode-x86-lite.iso}" dir="${my-build.dir}/cdrom-lite" />
-
- <taskdef name="vmware" classname="org.jnode.build.VMwareBuilderTask" classpathref="cp-x86" />
- <vmware
- isoFile="${jnode-x86-lite.iso}"
- logFile="${logFile}"
- memSize="${jnode.virtual.memsize}"
- saveDir="${save.dir}"
- vmdkImageFile="${vmware.vmx.vmdk.image}"
- overrideFile="${vmware.vmx.overrides}"
- />
- </target>
-
- <target name="cdrom_64-lite" depends="prepare">
- <create-cdrom destfile="${jnode-x86_64-lite.iso}" dir="${my-build.dir}/cdrom-lite" />
-
- <taskdef name="vmware" classname="org.jnode.build.VMwareBuilderTask" classpathref="cp-x86" />
- <vmware
- isoFile="${jnode-x86_64-lite.iso}"
- logFile="${logFile}"
- memSize="${jnode.virtual.memsize}"
- saveDir="${save.dir}"
- vmdkImageFile="${vmware.vmx.vmdk.image}"
- overrideFile="${vmware.vmx.overrides}"
- />
- </target>
-
- <!-- Prepare for netboot -->
- <target name="netboot" depends="java-image" unless="no.netboot">
- <copy file="${jnode.kernel}" todir="${build.netboot.dir}" />
- <copy todir="${build.netboot.dir}">
- <fileset dir="${initjars.dir}" />
- </copy>
- <copy todir="${build.netboot.dir}">
- <fileset dir="${my-lib.dir}">
- <include name="nbgrub-*" />
- <include name="pxegrub-*" />
- </fileset>
- <fileset dir="${my-conf.dir}">
- <include name="menu-nb.lst" />
- <include name="menu-pxe.lst*" />
- </fileset>
- </copy>
- <mkdir dir="${build.netboot.dir}/plugins" />
- <copy todir="${build.netboot.dir}/plugins">
- <fileset dir="${plugins.dir}" />
- </copy>
- </target>
-
- <!-- Run all required targets -->
- <target name="all" depends="boot-disk,netboot">
- </target>
-
-</project>
-
-
Modified: classlib6/all/build.xml
===================================================================
--- classlib6/all/build.xml 2009-04-12 07:54:15 UTC (rev 5252)
+++ classlib6/all/build.xml 2009-04-12 07:55:10 UTC (rev 5253)
@@ -1,4 +1,4 @@
-<project name="JNode" default="assemble-plugins" basedir=".">
+<project name="JNode" default="classlib" basedir=".">
<!-- if task is used from this -->
<taskdef resource="net/sf/antcontrib/antcontrib.properties"/>
<!-- before including jnode.xml, we must set this property -->
@@ -100,9 +100,6 @@
<property name="install-plugin-list" value="${basedir}/conf/install-plugin-list.xml"/>
<property name="system-plugin-list" value="${basedir}/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"/>
<path id="cp">
<pathelement location="${mmtk.jar}"/>
@@ -199,6 +196,13 @@
<mkdir dir="${initjars.dir}"/>
</target>
+ <target name="classlib" depends="prepare">
+ <!-- pre compile tasks needed for compilation -->
+ <ant target="compile" dir="${root.dir}/core" inheritall="on" inheritrefs="on" />
+ <ant target="pre-compile" dir="${root.dir}/builder" inheritall="on" inheritrefs="on" />
+ <antcall target="openjdk-annotate"/>
+ </target>
+
<!-- Call the assemble target of all subprojects -->
<target name="assemble-projects" depends="prepare">
<!-- pre compile tasks needed for compilation -->
@@ -311,18 +315,6 @@
by specifying one or more targets on the command line.
See the list below for an explanation of all targets.
-x86 Build the JNode bootable image for the X86 32-bit
- architecture.
-x86_64 Build the JNode bootable image for the X86 64-bit
- architecture (AMD64).
-
-cd-x86 Build the JNode bootable CD-ROM for the X86
- architecture 32 and 64-bit. The CD-ROM also
- contains the JNode sources.
-cd-x86-lite Build the JNode bootable CD-ROM for the X86
- 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
@@ -345,32 +337,6 @@
</echo>
</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>
-
- <!-- Create the X86 32-bit boot image -->
- <target name="x86" depends="assemble">
- <x86-build bits="32"/>
- </target>
-
- <!-- Create the X86 64-bit boot image-->
- <target name="x86_64" depends="assemble">
- <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>
-
<!-- Upload a distribution -->
<target name="upload">
<property name="upload.dir" value="${build.dir}/upload"/>
@@ -760,7 +726,7 @@
</cp-compare>
</target>
- <target name="openjdk-annotate" depends="assemble-projects">
+ <target name="openjdk-annotate">
<taskdef name="oj-annotate" classname="org.jnode.ant.taskdefs.AnnotateTask"
classpathref="cp-jnode"/>
@@ -829,71 +795,6 @@
</descriptors>
</checkDeps>
</target>
-
- <!-- Define the task that check the rules -->
- <taskdef name="pmd" classname="net.sourceforge.pmd.ant.PMDTask"
- classpathref="cp-jnode">
- <classpath>
- <pathelement location="${pmd.jar}"/>
- <pathelement location="${jaxen.jar}"/>
- <pathelement location="${saxpath.jar}"/>
- <pathelement location="${xerces.jar}"/>
- <pathelement location="${xmlParserAPIs.jar}"/>
- </classpath>
- </taskdef>
-
-
- <!-- Macro used to check that the rules are applied in the source code -->
- <macrodef name="checkProjectRules">
- <attribute name="projectName"/>
- <attribute name="webSrcUrl"/>
- <attribute name="projectSrc"/>
- <sequential>
- <property name="nbFailures" value="0"/>
- <echo message="Scanning @{projectName}."/>
- <property name="tmp" value="../@{projectSrc}"/>
- <pmd failuresPropertyName="nbFailures">
- <formatter type="html" toFile="${reports.dir}/pmd_report-@{projectName}.html"/>
-
- <ruleset>rulesets/favorites.xml</ruleset>
- <ruleset>rulesets/basic.xml</ruleset>
-
- <fileset dir="../@{projectSrc}" includes="**/*.java"/>
- </pmd>
- <echo message="There was ${nbFailures} failures in @{projectName}."/>
- </sequential>
- </macrodef>
-
- <target name="checkJNodeRules" depends="prepare">
- <parallel>
- <checkProjectRules projectName="distr" webSrcUrl="distr" projectSrc="distr"/>
- <checkProjectRules projectName="JNode-Builder" webSrcUrl="builder" projectSrc="builder"/>
- <checkProjectRules projectName="JNode-Core" webSrcUrl="core" projectSrc="core"/>
- <checkProjectRules projectName="JNode-FS" webSrcUrl="fs" projectSrc="fs"/>
- <checkProjectRules projectName="JNode-GUI" webSrcUrl="gui" projectSrc="gui"/>
- <checkProjectRules projectName="JNode-Net" webSrcUrl="net" projectSrc="net"/>
- <checkProjectRules projectName="JNode-Shell" webSrcUrl="shell" projectSrc="shell"/>
- <checkProjectRules projectName="JNode-TestUI" webSrcUrl="textui" projectSrc="textui"/>
- </parallel>
- </target>
-
- <!-- Document all plugins -->
- <target name="document-plugins" depends="assemble-projects">
- <taskdef name="plugindocumentation" classname="org.jnode.build.documentation.PluginDocumentationTask" classpathref="cp-jnode"/>
-
- <plugindocumentation
- destdir="${reports.dir}/plugins"
- pluginDir="${descriptors.dir}"
- tree="${jnode.plugin.doc.tree}">
- <descriptors dir="${descriptors.dir}/">
- <include name="*.xml"/>
- <exclude name="*plugin-list.xml"/>
- </descriptors>
- </plugindocumentation>
-
- </target>
-
-
<!-- Create a patch -->
<!-- TODO create replacement SVN task
<target name="create-patch">
Deleted: classlib6/all/jnode_checks.xml
===================================================================
--- classlib6/all/jnode_checks.xml 2009-04-12 07:54:15 UTC (rev 5252)
+++ classlib6/all/jnode_checks.xml 2009-04-12 07:55:10 UTC (rev 5253)
@@ -1,188 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<!--
-
- Checkstyle configuration that checks the sun coding conventions from:
-
- - the Java Language Specification at
- http://java.sun.com/docs/books/jls/second_edition/html/index.html
-
- - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-
- - the Javadoc guidelines at
- http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
-
- - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
-
- - some best practices
-
- Checkstyle is very configurable. Be sure to read the documentation at
- http://checkstyle.sf.net (or in your downloaded distribution).
-
- Most Checks are configurable, be sure to consult the documentation.
-
- To completely disable a check, just comment it out or delete it from the file.
-
- Finally, it is worth reading the documentation.
-
--->
-
-<module name="Checker">
-
- <!-- Checks that a package.html file exists for each package. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
-<!-- <module name="PackageHtml"/> -->
-
- <!-- Checks whether files end with a new line. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#NewlineAtEndOfFile -->
- <module name="NewlineAtEndOfFile"/>
-
- <!-- Checks that property files contain the same keys. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-<!-- <module name="Translation"/> -->
-
-
- <module name="TreeWalker">
-
- <!-- Checks for Javadoc comments. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html -->
-<!-- <module name="JavadocMethod"/>
- <module name="JavadocType"/>
- <module name="JavadocVariable"/>
- <module name="JavadocStyle"/> -->
-
-
- <!-- Checks for Naming Conventions. -->
- <!-- See http://checkstyle.sf.net/config_naming.html -->
-<!-- <module name="ConstantName"/>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName"/>
- <module name="MethodName"/>
- <module name="PackageName"/>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
- <module name="TypeName"/> -->
-
-
- <!-- Checks for Headers -->
- <!-- See http://checkstyle.sf.net/config_header.html -->
- <!-- <module name="Header"> -->
- <!-- The follow property value demonstrates the ability -->
- <!-- to have access to ANT properties. In this case it uses -->
- <!-- the ${basedir} property to allow Checkstyle to be run -->
- <!-- from any directory within a project. See property -->
- <!-- expansion, -->
- <!-- http://checkstyle.sf.net/config.html#properties -->
- <!-- <property -->
- <!-- name="headerFile" -->
- <!-- value="${basedir}/java.header"/> -->
- <!-- </module> -->
-
- <!-- Following interprets the header file as regular expressions. -->
- <!-- <module name="RegexpHeader"/> -->
-
-
- <!-- Checks for imports -->
- <!-- See http://checkstyle.sf.net/config_import.html -->
- <module name="AvoidStarImport"/>
-<!-- <module name="IllegalImport"/> --><!-- defaults to sun.* packages -->
- <module name="RedundantImport"/>
- <module name="UnusedImports"/>
-
-
- <!-- Checks for Size Violations. -->
- <!-- See http://checkstyle.sf.net/config_sizes.html -->
-<!-- <module name="FileLength"/>
- <module name="MethodLength"/>
- <module name="ParameterNumber"/> -->
- <module name="LineLength">
- <property name="max" value="120"/>
- </module>
-
-
- <!-- Checks for whitespace -->
- <!-- See http://checkstyle.sf.net/config_whitespace.html -->
- <module name="MethodParamPad"/>
- <module name="NoWhitespaceAfter"/>
- <module name="NoWhitespaceBefore"/>
- <!--<module name="OperatorWrap">
- <property name="option" value="eol"/>
- </module>-->
- <module name="ParenPad"/>
- <module name="TypecastParenPad"/>
- <module name="WhitespaceAfter"/>
- <module name="WhitespaceAround">
- <property name="tokens" value="ASSIGN, BAND, BAND_ASSIGN, BOR, BOR_ASSIGN,
- BSR, BSR_ASSIGN, BXOR, BXOR_ASSIGN, COLON, DIV, DIV_ASSIGN,
- EQUAL, GE, GT, LAND, LCURLY, LE, LITERAL_ASSERT, LITERAL_CATCH,
- LITERAL_DO, LITERAL_ELSE, LITERAL_FINALLY, LITERAL_FOR, LITERAL_IF,
- LITERAL_RETURN, LITERAL_SYNCHRONIZED, LITERAL_TRY, LITERAL_WHILE,
- LOR, LT, MINUS, MINUS_ASSIGN, MOD, MOD_ASSIGN, NOT_EQUAL, PLUS,
- PLUS_ASSIGN, QUESTION, RCURLY, SL, SLIST, SL_ASSIGN, SR, SR_ASSIGN,
- STAR, STAR_ASSIGN"/>
- <property name="allowEmptyConstructors" value="true"/>
- <property name="allowEmptyMethods" value="true"/>
- </module>
-
- <module name="Indentation"/>
- <module name="TabCharacter"/>
-
- <!-- Modifier Checks -->
- <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-<!-- <module name="RedundantModifier"/> -->
- <module name="ModifierOrder"/>
-
- <!-- Checks for blocks. You know, those {}'s -->
- <!-- See http://checkstyle.sf.net/config_blocks.html -->
- <module name="EmptyBlock">
- <property name="option" value="text" />
- </module>
- <module name="LeftCurly"/>
- <module name="RightCurly"/>
- <!--module name="NeedBraces"/-->
- <module name="AvoidNestedBlocks">
- <property name="allowInSwitchCase" value="true" />
- </module>
-
- <!-- Checks for common coding problems -->
- <!-- See http://checkstyle.sf.net/config_coding.html -->
-<!-- <module name="AvoidInlineConditionals"/>
- <module name="DoubleCheckedLocking"/>
- <module name="EmptyStatement"/>
- <module name="EqualsHashCode"/>
- <module name="HiddenField"/>
- <module name="IllegalInstantiation"/>
- <module name="InnerAssignment"/>
- <module name="MagicNumber"/>
- <module name="MissingSwitchDefault"/>
- <module name="RedundantThrows"/>
- <module name="SimplifyBooleanExpression"/>
- <module name="SimplifyBooleanReturn"/> -->
-
- <!-- Checks for class design -->
- <!-- See http://checkstyle.sf.net/config_design.html -->
-<!-- <module name="DesignForExtension"/>
- <module name="FinalClass"/>
- <module name="HideUtilityClassConstructor"/>
- <module name="InterfaceIsType"/>
- <module name="VisibilityModifier"/> -->
-
-
- <!-- Miscellaneous other checks. -->
- <!-- See http://checkstyle.sf.net/config_misc.html -->
-<!-- <module name="ArrayTypeStyle"/>
- <module name="FinalParameters"/>
- <module name="GenericIllegalRegexp">
- <property name="format" value="\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
- <module name="TodoComment"/>
- <module name="UpperEll"/> -->
-
- </module>
-
-</module>
Deleted: classlib6/all/new_checks.xml
===================================================================
--- classlib6/all/new_checks.xml 2009-04-12 07:54:15 UTC (rev 5252)
+++ classlib6/all/new_checks.xml 2009-04-12 07:55:10 UTC (rev 5253)
@@ -1,157 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE module PUBLIC
- "-//Puppy Crawl//DTD Check Configuration 1.2//EN"
- "http://www.puppycrawl.com/dtds/configuration_1_2.dtd">
-
-<!--
-
- Checkstyle configuration that checks the sun coding conventions from:
-
- - the Java Language Specification at
- http://java.sun.com/docs/books/jls/second_edition/html/index.html
-
- - the Sun Code Conventions at http://java.sun.com/docs/codeconv/
-
- - the Javadoc guidelines at
- http://java.sun.com/j2se/javadoc/writingdoccomments/index.html
-
- - the JDK Api documentation http://java.sun.com/j2se/docs/api/index.html
-
- - some best practices
-
- Checkstyle is very configurable. Be sure to read the documentation at
- http://checkstyle.sf.net (or in your downloaded distribution).
-
- Most Checks are configurable, be sure to consult the documentation.
-
- To completely disable a check, just comment it out or delete it from the file.
-
- Finally, it is worth reading the documentation.
-
--->
-
-<module name="Checker">
-
- <!-- Checks that a package.html file exists for each package. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html#PackageHtml -->
- <!-- temporally disable since pakage-info.java is not supported
- <module name="PackageHtml"/>
- -->
-
- <!-- Checks that property files contain the same keys. -->
- <!-- See http://checkstyle.sf.net/config_misc.html#Translation -->
-<!-- <module name="Translation"/> -->
-
-
- <module name="TreeWalker">
-
- <!-- Checks for Javadoc comments. -->
- <!-- See http://checkstyle.sf.net/config_javadoc.html -->
- <module name="JavadocType">
- <property name="scope" value="public"/>
- </module>
- <module name="JavadocMethod">
- <property name="scope" value="public"/>
- <property name="allowUndeclaredRTE" value="true"/>
- <property name="allowMissingParamTags" value="true"/>
- <property name="allowMissingThrowsTags" value="true"/>
- <property name="allowMissingReturnTag" value="true"/>
- </module>
- <module name="JavadocVariable">
- <property name="scope" value="public"/>
- </module>
- <module name="JavadocStyle"/>
-
-
- <!-- Checks for Naming Conventions. -->
- <!-- See http://checkstyle.sf.net/config_naming.html -->
-<!-- <module name="ConstantName"/>
- <module name="LocalFinalVariableName"/>
- <module name="LocalVariableName"/>
- <module name="MemberName"/>
- <module name="MethodName"/>
- <module name="PackageName"/>
- <module name="ParameterName"/>
- <module name="StaticVariableName"/>
- <module name="TypeName"/> -->
-
-
- <!-- Checks for Headers -->
- <!-- See http://checkstyle.sf.net/config_header.html -->
- <!-- <module name="Header"> -->
- <!-- The follow property value demonstrates the ability -->
- <!-- to have access to ANT properties. In this case it uses -->
- <!-- the ${basedir} property to allow Checkstyle to be run -->
- <!-- from any directory within a project. See property -->
- <!-- expansion, -->
- <!-- http://checkstyle.sf.net/config.html#properties -->
- <!-- <property -->
- <!-- name="headerFile" -->
- <!-- value="${basedir}/java.header"/> -->
- <!-- </module> -->
-
- <!-- Following interprets the header file as regular expressions. -->
- <!-- <module name="RegexpHeader"/> -->
-
-
- <!-- Checks for imports -->
- <!-- See http://checkstyle.sf.net/config_import.html -->
-<!-- <module name="IllegalImport"/> --><!-- defaults to sun.* packages -->
-
- <!-- Checks for Size Violations. -->
- <!-- See http://checkstyle.sf.net/config_sizes.html -->
-<!-- <module name="FileLength"/>
- <module name="MethodLength"/>
- <module name="ParameterNumber"/> -->
-
- <!-- Checks for whitespace -->
- <!-- See http://checkstyle.sf.net/config_whitespace.html -->
- <!--<module name="OperatorWrap">
- <property name="option" value="eol"/>
- </module>-->
- <!-- Modifier Checks -->
- <!-- See http://checkstyle.sf.net/config_modifiers.html -->
-<!-- <module name="RedundantModifier"/> -->
-
- <!-- Checks for blocks. You know, those {}'s -->
- <!-- See http://checkstyle.sf.net/config_blocks.html -->
- <!--module name="NeedBraces"/-->
-
- <!-- Checks for common coding problems -->
- <!-- See http://checkstyle.sf.net/config_coding.html -->
-<!-- <module name="AvoidInlineConditionals"/>
- <module name="DoubleCheckedLocking"/>
- <module name="EmptyStatement"/>
- <module name="EqualsHashCode"/>
- <module name="HiddenField"/>
- <module name="IllegalInstantiation"/>
- <module name="InnerAssignment"/>
- <module name="MagicNumber"/>
- <module name="MissingSwitchDefault"/>
- <module name="RedundantThrows"/>
- <module name="SimplifyBooleanExpression"/>
- <module name="SimplifyBooleanReturn"/> -->
-
- <!-- Checks for class design -->
- <!-- See http://checkstyle.sf.net/config_design.html -->
-<!-- <module name="DesignForExtension"/>
- <module name="FinalClass"/>
- <module name="HideUtilityClassConstructor"/>
- <module name="InterfaceIsType"/>
- <module name="VisibilityModifier"/> -->
-
-
- <!-- Miscellaneous other checks. -->
- <!-- See http://checkstyle.sf.net/config_misc.html -->
-<!-- <module name="ArrayTypeStyle"/>
- <module name="FinalParameters"/>
- <module name="GenericIllegalRegexp">
- <property name="format" value="\s+$"/>
- <property name="message" value="Line has trailing spaces."/>
- </module>
- <module name="TodoComment"/>
- <module name="UpperEll"/> -->
-
- </module>
-
-</module>
Modified: classlib6/builder/build.xml
===================================================================
--- classlib6/builder/build.xml 2009-04-12 07:54:15 UTC (rev 5252)
+++ classlib6/builder/build.xml 2009-04-12 07:55:10 UTC (rev 5253)
@@ -24,8 +24,6 @@
<!-- Initialize all subproject directories -->
<target name="prepare">
<mkdir dir="${my-classes.dir}"/>
- <mkdir dir="${jnasm-preprocessor-gen.dir}"/>
- <mkdir dir="${jnasm-assembler-gen.dir}"/>
<copy todir="${my-classes.dir}">
<fileset dir="${my-src.dir}/builder" includes="**/*.properties"/>
@@ -37,17 +35,16 @@
<javac destdir="${my-classes.dir}"
debug="on"
optimize="on"
- fork="off"
+ fork="on"
compiler="modern"
includeJavaRuntime="true"
target="${java.target}"
source="${java.source}"
encoding="${java.encoding}"
excludes="**/*-template.java,**/package-info.java"
- srcdir="${my-src.dir}/builder/">
- <bootclasspath path="${jnode-core.jar}"/>
- <compilerarg value="${compilerarg}"/>
- <filename name="org/jnode/ant/taskdefs/TemplateTask.java" />
+ srcdir="${my-src.dir}/builder">
+ <classpath refid="my-cp"/>
+ <filename name="org/jnode/ant/taskdefs/AnnotateTask.java" />
</javac>
<jar jarfile="${jnode-builder.jar}"
basedir="${my-classes.dir}"
Modified: classlib6/core/build.xml
===================================================================
--- classlib6/core/build.xml 2009-04-12 07:54:15 UTC (rev 5252)
+++ classlib6/core/build.xml 2009-04-12 07:55:10 UTC (rev 5253)
@@ -33,11 +33,6 @@
<pathelement location="${my-src.dir}/icedtea"/>
<pathelement location="${my-src.dir}/classlib"/>
</path>
- <path id="classpath-sources-vm">
- <pathelement location="${my-src.dir}/classpath/ext"/>
- <pathelement location="${my-src.dir}/classpath/vm"/>
- <pathelement location="${my-src.dir}/openjdk/vm"/>
- </path>
<path id="classpath-sources-corba">
<pathelement location="${my-src.dir}/openjdk/corba"/>
</path>
@@ -47,16 +42,6 @@
<path id="classpath-sources-langtools">
<pathelement location="${my-src.dir}/openjdk/langtools"/>
</path>
- <path id="my-sources1">
- <path refid="classpath-sources-vm"/>
- <pathelement location="${my-src.dir}/core"/>
- <pathelement location="${my-src.dir}/endorsed/nanoxml"/>
- <pathelement location="${my-src.dir}/vmmagic"/>
- <pathelement location="${my-src.dir}/mmtk-vm"/>
- </path>
- <path id="my-sources">
- <path refid="my-sources1"/>
- </path>
<macrodef name="ExpandTest">
<attribute name="classname"/>
@@ -72,32 +57,6 @@
</sequential>
</macrodef>
- <macrodef name="CreatePlan">
- <attribute name="package"/>
- <sequential>
- <copy tofile="${my-gen-plan.dir}/@{package}/org/mmtk/vm/Plan.java"
- file="${my-src.dir}/mmtk-vm/org/mmtk/vm/Plan.template">
- <filterset>
- <filter token="PKG" value="@{package}"/>
- </filterset>
- </copy>
- <copy tofile="${my-gen-plan.dir}/@{package}/org/mmtk/vm/PlanConstants.java"
- file="${my-src.dir}/mmtk-vm/org/mmtk/vm/PlanConstants.template">
- <filterset>
- <filter token="PKG" value="@{package}"/>
- </filterset>
- </copy>
- <mkdir dir="${my-classes-plan.dir}/@{package}/"/>
- <jnode.compile destdir="${my-classes-plan.dir}/@{package}/">
- <src path="${my-gen-plan.dir}/@{package}/"/>
- <classpath>
- <pathelement location="${jnode-code.jar}"/>
- <pathelement location="${mmtk.jar}"/>
- </classpath>
- </jnode.compile>
- </sequential>
- </macrodef>
-
<!-- Initialize all subproject directories -->
<target name="prepare">
<mkdir dir="${my-classes.dir}"/>
@@ -107,7 +66,6 @@
<copy todir="${my-classes.dir}">
<fileset dir="${my-src.dir}/classpath/gnu" includes="**/*.properties"/>
<fileset dir="${my-src.dir}/classpath/java" includes="**/*.properties"/>
- <fileset dir="${my-src.dir}/classpath/vm" includes="**/*.security"/>
<fileset dir="${my-src.dir}/classpath/tools" includes="**/*.jav"/>
<fileset dir="${my-src.dir}/openjdk/java" includes="**/*.jav"/>
<fileset dir="${my-src.dir}/openjdk/javax" includes="**/*.jav"/>
@@ -115,20 +73,7 @@
<fileset dir="${my-src.dir}/openjdk/com" includes="**/*.jav"/>
<fileset dir="${my-src.dir}/openjdk/sun" includes="**/*.jav"/>
<fileset dir="${my-src.dir}/openjdk/svm" includes="**/*.jav"/>
- <fileset dir="${my-src.dir}/openjdk/vm" includes="**/*.jav"/>
</copy>
-
- <taskdef name="template" classname="org.jnode.ant.taskdefs.TemplateTask" classpathref="cp-jnode"/>
- <template file="${my-src.dir}/template/org/jnode/vm/VmSystemSettings.java"
- tofile="${my-gen.dir}/org/jnode/vm/VmSystemSettings.java">
- <token name="@java.home@" value="${jnode.java.home}"/>
- <token name="@java.io.tmpdir@" value="${jnode.java.io.tmpdir}"/>
- <token name="@user.home@" value="${jnode.user.home}"/>
- </template>
- <template file="${my-src.dir}/template/org/jnode/security/JNodeSecurityManagerSettings.java"
- tofile="${my-gen.dir}/org/jnode/security/JNodeSecurityManagerSettings.java">
- <token name="@jnode.security.enabled@" value="${jnode.security.enabled}"/>
- </template>
</target>
<!-- Compile all subproject java files -->
@@ -139,10 +84,6 @@
</jnode.compile>
<parallel >
<jnode.compile>
- <src refid="my-sources" />
- <classpath refid="my-cp"/>
- </jnode.compile>
- <jnode.compile>
<src refid="classpath-sources-corba" />
<classpath refid="my-cp"/>
</jnode.compile>
@@ -161,8 +102,6 @@
<fileset dir="${my-src.dir}/classpath/gnu" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/classpath/java" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/classpath/javax" excludes="${my-non-resources}"/>
- <fileset dir="${my-src.dir}/classpath/ext" excludes="${my-non-resources}"/>
- <fileset dir="${my-src.dir}/classpath/vm" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/classpath/tools" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/openjdk/java" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/openjdk/javax" excludes="${my-non-resources}"/>
@@ -170,15 +109,10 @@
<fileset dir="${my-src.dir}/openjdk/com" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/openjdk/sun" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/openjdk/svm" excludes="${my-non-resources}"/>
- <fileset dir="${my-src.dir}/openjdk/vm" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/openjdk/corba" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/openjdk/jaxws" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/openjdk/langtools" excludes="${my-non-resources}"/>
<fileset dir="${my-src.dir}/icedtea" excludes="${my-non-resources}"/>
- <fileset dir="${my-src.dir}/core" excludes="${my-non-resources}"/>
- <fileset dir="${my-src.dir}/endorsed/nanoxml" excludes="${my-non-resources}"/>
- <fileset dir="${my-src.dir}/vmmagic" excludes="${my-non-resources}"/>
- <fileset dir="${my-src.dir}/mmtk-vm" excludes="${my-non-resources}"/>
</copy>
</target>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
