[Nice-commit] Nice build.xml,1.3,1.4
Brought to you by:
bonniot
Menu
▾
▴
[Nice-commit] Nice build.xml,1.3,1.4
|
From: Artem Gr K. <ar...@us...> - 2005-03-07 08:13:45
|
Update of /cvsroot/nice/Nice In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19908 Modified Files: build.xml Log Message: Execution of testsuite is now possible after "compiler1" (stdlib sourcepath absence is fixed). Index: build.xml =================================================================== RCS file: /cvsroot/nice/Nice/build.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** build.xml 4 Mar 2005 21:36:08 -0000 1.3 --- build.xml 7 Mar 2005 08:13:34 -0000 1.4 *************** *** 2,8 **** <!-- The file was formatted automatically by Eclipse 3.1.0 with maximum line width set to 110. --> <project name="Nice" default="check"> - <!-- For Nice arguments see "http://nice.sourceforge.net/cgi-bin/twiki/view/Doc/NicecAntTaskdef". --> <property environment="env" /> <property name="compiler" value="modern" description="example: ant -Dcompiler=gcj" /> <property name="build" value="classes" /> <property name="javaccVersion" value="javacc-3.2" /> --- 2,8 ---- <!-- The file was formatted automatically by Eclipse 3.1.0 with maximum line width set to 110. --> <project name="Nice" default="check"> <property environment="env" /> <property name="compiler" value="modern" description="example: ant -Dcompiler=gcj" /> + <property name="jvmArgs" value="-Xms64m -Xmx128m" description="JVM options for speed" /> <property name="build" value="classes" /> <property name="javaccVersion" value="javacc-3.2" /> *************** *** 11,15 **** <path id="freshNice"> <pathelement path="${build}" /> - <pathelement path="${build}/console.jar" /> </path> --- 11,14 ---- *************** *** 46,51 **** <attribute name="package" /> <attribute name="runtime" default="${NICE_JAR}" /> ! <attribute name="args" default="--recompile-all" /> ! <attribute name="sourcepath" default="src" /> <sequential> <java failonerror="yes" --- 45,50 ---- <attribute name="package" /> <attribute name="runtime" default="${NICE_JAR}" /> ! <attribute name="args" default="" /> ! <attribute name="sourcepath" default="src${path.separator}stdlib" /> <sequential> <java failonerror="yes" *************** *** 54,61 **** --- 53,62 ---- classname="nice.tools.compiler.console.dispatch" > + <jvmarg line="${jvmArgs}" /> <arg value="--sourcepath" /> <arg value="@{sourcepath}" /> <arg value="--destination" /> <arg value="${build}" /> + <arg value="--exclude-runtime" /> <arg line="@{args}" /> <arg value="@{package}" /> *************** *** 65,69 **** <macrodef name="mac-nicec-new"> <attribute name="package" /> ! <attribute name="runtime" default="${build}/console.jar${path.separator}${build}" /> <attribute name="args" default="" /> <attribute name="sourcepath" default="src${path.separator}stdlib" /> --- 66,70 ---- <macrodef name="mac-nicec-new"> <attribute name="package" /> ! <attribute name="runtime" default="${build}" /> <attribute name="args" default="" /> <attribute name="sourcepath" default="src${path.separator}stdlib" /> *************** *** 74,77 **** --- 75,79 ---- classname="nice.tools.compiler.console.dispatch" > + <jvmarg line="${jvmArgs}" /> <arg value="--sourcepath" /> <arg value="@{sourcepath}" /> *************** *** 107,111 **** /> <mac-javac-single includes="nice/tools/util/System.java" /> ! <mac-nicec-old package="nice.tools.repository" /> <mac-javac-multi> <include> --- 109,113 ---- /> <mac-javac-single includes="nice/tools/util/System.java" /> ! <mac-nicec-old package="nice.tools.repository" args="-R" /> <mac-javac-multi> <include> *************** *** 122,127 **** </mac-javac-multi> <mac-javac-single includes="nice/lang/inline/*.java" /> ! <mac-nicec-old package="bossa.modules" /> ! <mac-nicec-old package="nice.tools.ast" /> <mac-javac-single includes="bossa/syntax/*.java" /> <move file="src/bossa/syntax/dispatch.java" --- 124,129 ---- </mac-javac-multi> <mac-javac-single includes="nice/lang/inline/*.java" /> ! <mac-nicec-old package="bossa.modules" args="-R" /> ! <mac-nicec-old package="nice.tools.ast" args="-r" /> <mac-javac-single includes="bossa/syntax/*.java" /> <move file="src/bossa/syntax/dispatch.java" *************** *** 130,134 **** /> <delete file="${build}/bossa/syntax/dispatch.class" /> ! <mac-nicec-old package="bossa.syntax" /> </target> <target name="javacc-download" unless="haveJavacc"> --- 132,136 ---- /> <delete file="${build}/bossa/syntax/dispatch.class" /> ! <mac-nicec-old package="bossa.syntax" args="-r" /> </target> <target name="javacc-download" unless="haveJavacc"> *************** *** 193,203 **** </manifest> </target> ! <target name="compiler1" depends="setDate,initialize"> ! <mac-nicec-old package="bossa.syntax" /> ! <mac-nicec-old package="nice.tools.compiler.console" args="--recompile-all --jar ${build}/console.jar" /> </target> <target name="compiler2"> ! <mac-nicec-new package="bossa.syntax" args="--recompile-all" /> ! <mac-nicec-new package="nice.tools.compiler.console" args="--recompile-all --jar ${build}/console.jar" /> </target> <target name="tools" depends="initialize"> --- 195,214 ---- </manifest> </target> ! <target name="compiler1" ! depends="core-bootstrap,javacc,parser,recompile,setDate,initialize" ! description="build intermediate compiler" ! > ! <mac-nicec-old package="bossa.syntax" args="-r" /> ! <mac-nicec-old package="nice.tools.compiler.console" args="-R" /> ! <!-- ! Make a snapshot of the compiler. ! It isn't used, but the "check" target will see that the file exists ! and will not try to recompile everything. ! --> ! <antcall target="makeArchive" /> </target> <target name="compiler2"> ! <mac-nicec-new package="bossa.syntax" args="-R" /> ! <mac-nicec-new package="nice.tools.compiler.console" args="-R" /> </target> <target name="tools" depends="initialize"> *************** *** 227,240 **** <mac-nicec-new package="nice.io" /> </target> ! <target name="bootstrap" ! depends="core-bootstrap,javacc,parser,recompile,compiler1,compiler2,tools,libs,recompile" ! /> <!-- The end of bootstrap targets. --> ! <available file="${build}/nice.jar" property="haveArchive" /> ! <target name="archive" unless="haveArchive"> ! <antcall target="bootstrap" /> <jar destfile="${build}/nice.jar" duplicate="preserve" manifest="src/nice/tools/compiler/Manifest"> - <zipfileset src="${build}/console.jar" /> <fileset dir="${build}"> <include name="nice/**" /> --- 238,247 ---- <mac-nicec-new package="nice.io" /> </target> ! <target name="bootstrap" depends="compiler1,compiler2,tools,libs,recompile" /> <!-- The end of bootstrap targets. --> ! <target name="makeArchive"> ! <delete file="${build}/nice.jar" /> <jar destfile="${build}/nice.jar" duplicate="preserve" manifest="src/nice/tools/compiler/Manifest"> <fileset dir="${build}"> <include name="nice/**" /> *************** *** 245,248 **** --- 252,260 ---- </jar> </target> + <available file="${build}/nice.jar" property="haveArchive" /> + <target name="archive" unless="haveArchive"> + <antcall target="bootstrap" /> + <antcall target="makeArchive" /> + </target> <target name="jar" depends="archive" description="compile and put Nice compiler into share/java/nice.jar"> *************** *** 256,269 **** </target> <target name="check_compiler" depends="archive,testengine"> ! <java classpathref="freshNice" classname="nice.tools.testsuite.TestNice" failonerror="${checkFail}"> ! <arg value="-runtime" /> ! <arg value="${build}" /> <arg value="testsuite/compiler" /> </java> </target> <target name="check_lib" depends="archive,testengine"> ! <java classpathref="freshNice" classname="nice.tools.testsuite.TestNice" failonerror="${checkFail}"> ! <arg value="-runtime" /> ! <arg value="${build}" /> <arg value="testsuite/lib" /> </java> --- 268,287 ---- </target> <target name="check_compiler" depends="archive,testengine"> ! <java classpathref="freshNice" ! classname="nice.tools.testsuite.TestNice" ! fork="yes" ! failonerror="${checkFail}" ! > ! <jvmarg line="${jvmArgs}" /> <arg value="testsuite/compiler" /> </java> </target> <target name="check_lib" depends="archive,testengine"> ! <java classpathref="freshNice" ! classname="nice.tools.testsuite.TestNice" ! fork="yes" ! failonerror="${checkFail}" ! > ! <jvmarg line="${jvmArgs}" /> <arg value="testsuite/lib" /> </java> |
