From: <ls...@us...> - 2009-04-13 08:19:30
|
Revision: 5257 http://jnode.svn.sourceforge.net/jnode/?rev=5257&view=rev Author: lsantha Date: 2009-04-13 08:19:29 +0000 (Mon, 13 Apr 2009) Log Message: ----------- Build improvements. Modified Paths: -------------- classlib6/all/build.xml Modified: classlib6/all/build.xml =================================================================== --- classlib6/all/build.xml 2009-04-13 07:13:38 UTC (rev 5256) +++ classlib6/all/build.xml 2009-04-13 08:19:29 UTC (rev 5257) @@ -197,10 +197,19 @@ </target> <target name="classlib" depends="prepare"> + <property name="classlib.jar" value="${root.dir}/all/build/classlib.jar" /> + <property name="classlib.pack" value="${root.dir}/all/build/classlib.pack.gz" /> <!-- 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"/> + <delete file="${classlib.jar}"/> + <delete file="${classlib.pack}"/> + <jar compress="0" basedir="${root.dir}/core/build/classes" jarfile="${classlib.jar}"/> + <exec executable="pack200"> + <arg file="${classlib.pack}"/> + <arg file="${classlib.jar}"/> + </exec> </target> <!-- Call the assemble target of all subprojects --> @@ -319,10 +328,7 @@ 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 - +--> encoding-test Verify the file encoding of all java source files. encoding-fix Correct the file encoding of all java source This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ls...@us...> - 2009-04-16 20:36:39
|
Revision: 5293 http://jnode.svn.sourceforge.net/jnode/?rev=5293&view=rev Author: lsantha Date: 2009-04-16 20:36:30 +0000 (Thu, 16 Apr 2009) Log Message: ----------- Added support for classlib-src.jar. Modified Paths: -------------- classlib6/all/build.xml Modified: classlib6/all/build.xml =================================================================== --- classlib6/all/build.xml 2009-04-16 14:42:56 UTC (rev 5292) +++ classlib6/all/build.xml 2009-04-16 20:36:30 UTC (rev 5293) @@ -212,6 +212,32 @@ </exec> </target> + <target name="quickdeploy" depends="classlib"> + + </target> + + <target name="deploy"> + <property name="classlib-src.jar" value="${root.dir}/all/build/classlib-src.jar" /> + <jar compress="0" jarfile="${classlib-src.jar}" filesonly="true"> + <fileset dir="${root.dir}/core/src/classlib" includes="**/*.java"/> + <fileset dir="${root.dir}/core/src/classpath/gnu" includes="**/*.java"/> + <fileset dir="${root.dir}/core/src/classpath/java" includes="**/*.java"/> + <fileset dir="${root.dir}/core/src/classpath/javax" includes="**/*.java"/> + <fileset dir="${root.dir}/core/src/classpath/tools" includes="**/*.java"/> + <fileset dir="${root.dir}/core/src/icedtea" includes="**/*.java"/> + <fileset dir="${root.dir}/core/src/openjdk/com" includes="**/*.java"/> + <fileset dir="${root.dir}/core/src/openjdk/corba" includes="**/*.java"/> + <fileset dir="${root.dir}/core/src/openjdk/java" includes="**/*.java"/> + <fileset dir="${root.dir}/core/src/openjdk/javax" includes="**/*.java"/> + <fileset dir="${root.dir}/core/src/openjdk/jaxws" includes="**/*.java"/> + <fileset dir="${root.dir}/core/src/openjdk/langtools" includes="**/*.java"/> + <fileset dir="${root.dir}/core/src/openjdk/org" includes="**/*.java"/> + <fileset dir="${root.dir}/core/src/openjdk/sun" includes="**/*.java"/> + <fileset dir="${root.dir}/core/src/openjdk/svm" includes="**/*.java"/> + </jar> + <bzip2 src="${classlib-src.jar}" destfile="${classlib-src.jar}.bz2"/> + </target> + <!-- Call the assemble target of all subprojects --> <target name="assemble-projects" depends="prepare"> <!-- pre compile tasks needed for compilation --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cr...@us...> - 2009-04-29 15:08:39
|
Revision: 5356 http://jnode.svn.sourceforge.net/jnode/?rev=5356&view=rev Author: crawley Date: 2009-04-29 15:08:36 +0000 (Wed, 29 Apr 2009) Log Message: ----------- Pack200 needs a lot of memory to pack classlib.jar. Giving it up to 256Mb. (Should probably also set its startup memory to 256Mb as well.) Modified Paths: -------------- classlib6/all/build.xml Modified: classlib6/all/build.xml =================================================================== --- classlib6/all/build.xml 2009-04-28 08:39:26 UTC (rev 5355) +++ classlib6/all/build.xml 2009-04-29 15:08:36 UTC (rev 5356) @@ -206,10 +206,13 @@ <delete file="${classlib.jar}"/> <delete file="${classlib.pack}"/> <jar compress="0" basedir="${root.dir}/core/build/classes" jarfile="${classlib.jar}"/> + <echo message="packing..."/> <exec executable="pack200"> + <arg value="-J-Xmx256m"/> <arg file="${classlib.pack}"/> <arg file="${classlib.jar}"/> </exec> + <echo message="...done"/> </target> <target name="quickdeploy" depends="classlib"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cr...@us...> - 2009-05-25 09:54:45
|
Revision: 5520 http://jnode.svn.sourceforge.net/jnode/?rev=5520&view=rev Author: crawley Date: 2009-05-25 09:54:37 +0000 (Mon, 25 May 2009) Log Message: ----------- Deleting the 'save' target. It is not needed in the classlib6 tree. Modified Paths: -------------- classlib6/all/build.xml Modified: classlib6/all/build.xml =================================================================== --- classlib6/all/build.xml 2009-05-24 20:15:25 UTC (rev 5519) +++ classlib6/all/build.xml 2009-05-25 09:54:37 UTC (rev 5520) @@ -508,13 +508,8 @@ </target> --> - <!-- Save virtualization etc state across 'clean' --> - <target name="save"> - <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"> + <target name="clean" description="clean the complete build output"> <jnode.antall target="clean"/> <delete dir="${build.dir}" quiet="on"/> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <cr...@us...> - 2009-05-25 10:57:58
|
Revision: 5521 http://jnode.svn.sourceforge.net/jnode/?rev=5521&view=rev Author: crawley Date: 2009-05-25 10:57:49 +0000 (Mon, 25 May 2009) Log Message: ----------- Refactored targets so that quick-deploy (aka quickdeploy) no longer wastes 5+ minutes building the classlib.pack which it doesn't need. Modified Paths: -------------- classlib6/all/build.xml Modified: classlib6/all/build.xml =================================================================== --- classlib6/all/build.xml 2009-05-25 09:54:37 UTC (rev 5520) +++ classlib6/all/build.xml 2009-05-25 10:57:49 UTC (rev 5521) @@ -1,4 +1,4 @@ -<project name="JNode" default="classlib" basedir="."> +<project name="classlib" 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 --> @@ -196,16 +196,19 @@ <mkdir dir="${initjars.dir}"/> </target> - <target name="classlib" depends="prepare" description="build and package the classlib"> + <target name="classlib" depends="prepare" description="compile and create the classlib JAR file"> <property name="classlib.jar" value="${root.dir}/all/build/classlib.jar" /> - <property name="classlib.pack" value="${root.dir}/all/build/classlib.pack.gz" /> <!-- 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"/> <delete file="${classlib.jar}"/> + <jar compress="0" basedir="${root.dir}/core/build/classes" jarfile="${classlib.jar}"/> + </target> + + <target name="classlib-pack" depends="classlib" description="create the classlib pack file"> + <property name="classlib.pack" value="${root.dir}/all/build/classlib.pack.gz" /> <delete file="${classlib.pack}"/> - <jar compress="0" basedir="${root.dir}/core/build/classes" jarfile="${classlib.jar}"/> <echo message="packing..."/> <exec executable="pack200"> <arg value="-J-Xmx256m"/> @@ -215,7 +218,7 @@ <echo message="...done"/> </target> - <target name="classlib-src" depends="prepare" description="package the classlib sources"> + <target name="classlib-src" depends="prepare" description="create the classlib source JAR file"> <property name="classlib-src.jar" value="${root.dir}/all/build/classlib-src.jar" /> <jar compress="0" jarfile="${classlib-src.jar}" filesonly="true"> <fileset dir="${root.dir}/core/src/classlib" includes="**/*.java"/> @@ -234,10 +237,14 @@ <fileset dir="${root.dir}/core/src/openjdk/sun" includes="**/*.java"/> <fileset dir="${root.dir}/core/src/openjdk/svm" includes="**/*.java"/> </jar> + </target> + + <target name="classlib-src-bz" depends="classlib-src" description="compress the classlib source JAR file"> + <property name="classlib-src.jar" value="${root.dir}/all/build/classlib-src.jar" /> <bzip2 src="${classlib-src.jar}" destfile="${classlib-src.jar}.bz2"/> </target> - <target name="copy" depends="prepare" description="copy the classlib binaries to the local JNode project"> + <target name="copy" depends="prepare" description="copy the classlib JARs to the local JNode project"> <fail message="main.jnode.dir not set in jnode.properties"> <condition><not><isset property="main.jnode.dir"/></not></condition> </fail> @@ -330,12 +337,14 @@ classlib-src.md5=${classlib-src.md5}</echo> </target> - <target name="deploy" depends="classlib,classlib-src,upload" description="build and upload"/> + <target name="deploy" depends="classlib-pack,classlib-src-bz,upload" description="build and upload"/> - <target name="quickdeploy" depends="classlib,classlib-src,copy" description="build and copy"/> + <target name="quick-deploy" depends="classlib,classlib-src,copy" description="build and copy"/> - <target name="all" depends="clean,classlib,classlib-src,upload" description="clean build and upload"/> + <target name="quickdeploy" depends="quick-deploy" description="build and copy"/> + <target name="all" depends="clean,classlib-pack,classlib-src-bz,upload" description="clean build and upload"/> + <target name="ftp-init" depends="prepare,ftp-properties" description="initialize the FTP server"> <!-- create maid directory --> <ftp action="mkdir" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fd...@us...> - 2009-08-24 18:49:13
|
Revision: 5662 http://jnode.svn.sourceforge.net/jnode/?rev=5662&view=rev Author: fduminy Date: 2009-08-24 18:49:03 +0000 (Mon, 24 Aug 2009) Log Message: ----------- cleanup : removed references to non-existing sub projects/sub directories Modified Paths: -------------- classlib6/all/build.xml Modified: classlib6/all/build.xml =================================================================== --- classlib6/all/build.xml 2009-08-24 14:11:14 UTC (rev 5661) +++ classlib6/all/build.xml 2009-08-24 18:49:03 UTC (rev 5662) @@ -31,13 +31,7 @@ <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-fonts.jar" value="${build.dir}/descriptors/jnode-fonts.jar"/> <property name="jnode-images.jar" value="${build.dir}/descriptors/jnode-images.jar"/> @@ -48,26 +42,10 @@ <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="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="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="iso9660.jar" value="${root.dir}/builder/lib/iso9660.jar" /> <property name="sabre.jar" value="${root.dir}/builder/lib/sabre.jar" /> @@ -81,8 +59,6 @@ <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" /> @@ -131,13 +107,7 @@ <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="${thinlet.jar}"/> - <pathelement location="${jnode-textui.jar}"/> <pathelement location="${bcel-5.1.jar}"/> <path refid="cp"/> </path> @@ -380,11 +350,6 @@ <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}"/> @@ -596,18 +561,6 @@ <pathelement location="${root.dir}/core/src/endorsed/nanoxml"/> <pathelement location="${root.dir}/core/src/test"/> <pathelement location="${root.dir}/core/src/vmmagic"/> - <pathelement location="${root.dir}/distr/src/install"/> - <pathelement location="${root.dir}/fs/src/fs"/> - <pathelement location="${root.dir}/fs/src/fs"/> - <pathelement location="${root.dir}/fs/src/driver"/> - <pathelement location="${root.dir}/gui/src/awt"/> - <pathelement location="${root.dir}/gui/src/driver"/> - <pathelement location="${root.dir}/gui/src/desktop"/> - <pathelement location="${root.dir}/gui/src/font"/> - <pathelement location="${root.dir}/gui/src/thinlet"/> - <pathelement location="${root.dir}/net/src/net"/> - <pathelement location="${root.dir}/net/src/driver"/> - <pathelement location="${root.dir}/shell/src/shell"/> </sourcepath> <package name="org.jnode.*"/> <package name="org.mmtk.*"/> @@ -716,7 +669,6 @@ </cp-compare> </target> - <!-- Compare classpath version of jnode with real classpath version --> <target name="header-fix" depends="assemble"> <!-- todo clean up the excludes --> <taskdef name="header" classname="org.jnode.ant.taskdefs.HeaderTask" classpathref="cp-jnode"/> @@ -740,23 +692,6 @@ <fileset dir="${root.dir}/core/src/mmtk-vm" includes="**/*.java" excludes="org/mmtk/vm/**/*.java"/> <fileset dir="${root.dir}/core/src/driver" includes="**/*.java"/> <fileset dir="${root.dir}/core/src/test" includes="**/*.java" excludes="org/jnode/test/mauve/**/*.java,org/jtestserver/**/*.java"/> - <fileset dir="${root.dir}/distr/src/install" includes="**/*.java"/> - <fileset dir="${root.dir}/distr/src/apps" includes="**/*.java"/> - <fileset dir="${root.dir}/distr/src/emu" includes="**/*.java"/> - <fileset dir="${root.dir}/distr/src/test" includes="**/*.java"/> - <fileset dir="${root.dir}/fs/src/fs" includes="**/*.java"/> - <fileset dir="${root.dir}/fs/src/driver" includes="**/*.java"/> - <fileset dir="${root.dir}/fs/src/test" includes="**/*.java"/> - <fileset dir="${root.dir}/gui/src/awt" includes="**/*.java" excludes="org/jnode/awt/font/bdf/**/*.java"/> - <fileset dir="${root.dir}/gui/src/desktop" includes="**/*.java"/> - <fileset dir="${root.dir}/gui/src/driver" includes="**/*.java"/> - <fileset dir="${root.dir}/gui/src/test" includes="**/*.java"/> - <fileset dir="${root.dir}/net/src/net" includes="**/*.java"/> - <fileset dir="${root.dir}/net/src/driver" includes="**/*.java"/> - <fileset dir="${root.dir}/net/src/test" includes="**/*.java"/> - <fileset dir="${root.dir}/shell/src/emu" includes="**/*.java"/> - <fileset dir="${root.dir}/shell/src/shell" includes="**/*.java"/> - <fileset dir="${root.dir}/shell/src/test" includes="**/*.java"/> </header> </target> @@ -771,24 +706,6 @@ <fileset dir="../core/build/classes/" includes="**/*.class"> <date datetime="${hotswap.class.tstamp}" pattern="MM/dd/yyyy kk:mm:ss" when="after" granularity="0"/> </fileset> - <fileset dir="../distr/build/classes/" includes="**/*.class"> - <date datetime="${hotswap.class.tstamp}" pattern="MM/dd/yyyy kk:mm:ss" when="after" granularity="0"/> - </fileset> - <fileset dir="../fs/build/classes/" includes="**/*.class"> - <date datetime="${hotswap.class.tstamp}" pattern="MM/dd/yyyy kk:mm:ss" when="after" granularity="0"/> - </fileset> - <fileset dir="../gui/build/classes/" includes="**/*.class"> - <date datetime="${hotswap.class.tstamp}" pattern="MM/dd/yyyy kk:mm:ss" when="after" granularity="0"/> - </fileset> - <fileset dir="../net/build/classes/" includes="**/*.class"> - <date datetime="${hotswap.class.tstamp}" pattern="MM/dd/yyyy kk:mm:ss" when="after" granularity="0"/> - </fileset> - <fileset dir="../shell/build/classes/" includes="**/*.class"> - <date datetime="${hotswap.class.tstamp}" pattern="MM/dd/yyyy kk:mm:ss" when="after" granularity="0"/> - </fileset> - <fileset dir="../textui/build/classes/" includes="**/*.class"> - <date datetime="${hotswap.class.tstamp}" pattern="MM/dd/yyyy kk:mm:ss" when="after" granularity="0"/> - </fileset> </hotswap> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ls...@us...> - 2013-11-10 10:57:55
|
Revision: 5991 http://sourceforge.net/p/jnode/svn/5991 Author: lsantha Date: 2013-11-10 10:57:53 +0000 (Sun, 10 Nov 2013) Log Message: ----------- Fixed pack200 memory issue. Modified Paths: -------------- classlib6/all/build.xml Modified: classlib6/all/build.xml =================================================================== --- classlib6/all/build.xml 2013-11-10 10:45:32 UTC (rev 5990) +++ classlib6/all/build.xml 2013-11-10 10:57:53 UTC (rev 5991) @@ -169,8 +169,8 @@ <property name="classlib.pack" value="${root.dir}/all/build/classlib.pack.gz" /> <delete file="${classlib.pack}"/> <echo message="packing..."/> - <exec executable="pack200"> - <arg value="-J-Xmx256m"/> + <exec executable="pack200" failonerror="true" > + <arg value="-J-Xmx1024m"/> <arg file="${classlib.pack}"/> <arg file="${classlib.jar}"/> </exec> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |