[Nice-commit] Nice build.xml,1.1,1.2

[Artem Gr K. <ar...@us...>]

Update of /cvsroot/nice/Nice
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20203

Modified Files:
	build.xml 
Log Message:
Bootstrapping no longer requires 'nice.jar' to be present in the Ant classpath.

Index: build.xml
===================================================================
RCS file: /cvsroot/nice/Nice/build.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** build.xml	27 Feb 2005 19:22:52 -0000	1.1
--- build.xml	28 Feb 2005 06:29:06 -0000	1.2
***************
*** 3,7 ****
  <project name="Nice" default="check">
    <!-- For Nice arguments see "http://nice.sourceforge.net/cgi-bin/twiki/view/Doc/NicecAntTaskdef". -->
-   <taskdef name="nicec" classname="nice.tools.ant.Nicec" />
    <property environment="env" />
    <property name="compiler" value="modern" description="example: ant -Dcompiler=gcj" />
--- 3,6 ----
***************
*** 46,70 ****
    <macrodef name="mac-nicec-old">
      <attribute name="package" />
      <attribute name="sourcepath" default="src" />
      <sequential>
!       <nicec package="@{package}"
!              sourcepath="@{sourcepath}"
!              destination="${build}"
!              runtime="${NICE_JAR}"
!              recompile_all="yes"
!       />
      </sequential>
    </macrodef>
    <macrodef name="mac-nicec-new">
      <attribute name="package" />
      <attribute name="args" default="" />
      <sequential>
        <java failonerror="yes"
              fork="yes"
!             classpath="${NICE_JAR}"
              classname="nice.tools.compiler.console.dispatch"
        >
          <arg value="--sourcepath" />
!         <arg value="src${path.separator}stdlib" />
          <arg value="--destination" />
          <arg value="${build}" />
--- 45,79 ----
    <macrodef name="mac-nicec-old">
      <attribute name="package" />
+     <attribute name="runtime" default="${NICE_JAR}" />
+     <attribute name="args" default="--recompile-all" />
      <attribute name="sourcepath" default="src" />
      <sequential>
!       <java failonerror="yes"
!             fork="yes"
!             classpath="@{runtime}"
!             classname="nice.tools.compiler.console.dispatch"
!       >
!         <arg value="--sourcepath" />
!         <arg value="@{sourcepath}" />
!         <arg value="--destination" />
!         <arg value="${build}" />
!         <arg line="@{args}" />
!         <arg value="@{package}" />
!       </java>
      </sequential>
    </macrodef>
    <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" />
      <sequential>
        <java failonerror="yes"
              fork="yes"
!             classpath="@{runtime}"
              classname="nice.tools.compiler.console.dispatch"
        >
          <arg value="--sourcepath" />
!         <arg value="@{sourcepath}" />
          <arg value="--destination" />
          <arg value="${build}" />
***************
*** 133,137 ****
      </exec>
    </target>
!   <target name="javacc" depends="javacc-download">
      <unzip src="${javaccZip}" dest="${build}">
        <patternset>
--- 142,147 ----
      </exec>
    </target>
!   <available file="${build}/javacc.jar" property="haveJavaccJar" />
!   <target name="javacc" depends="javacc-download" unless="haveJavaccJar">
      <unzip src="${javaccZip}" dest="${build}">
        <patternset>
***************
*** 142,146 ****
      <delete dir="${build}/${javaccVersion}" />
    </target>
!   <target name="parser">
      <java fork="yes" dir="src/bossa/parser" classname="javacc">
        <classpath>
--- 152,156 ----
      <delete dir="${build}/${javaccVersion}" />
    </target>
!   <target name="parser" depends="javacc">
      <java fork="yes" dir="src/bossa/parser" classname="javacc">
        <classpath>
***************
*** 151,156 ****
      </java>
    </target>
!   <target name="recompile">
!     <mac-javac-multi>
        <include>
          <include name="bossa/**/*.java" />
--- 161,166 ----
      </java>
    </target>
!   <target name="recompile" depends="initialize">
!     <mac-javac-multi classpath="${NICE_JAR}">
        <include>
          <include name="bossa/**/*.java" />
***************
*** 183,192 ****
      </manifest>
    </target>
!   <target name="compiler" depends="setDate">
!     <!-- <mac-nicec-new package="nice.lang" /> -->
      <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">
      <echo message="Compiling nice.tools.doc..." level="info" />
      <mac-nicec-new package="nice.tools.doc" />
--- 193,205 ----
      </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">
      <echo message="Compiling nice.tools.doc..." level="info" />
      <mac-nicec-new package="nice.tools.doc" />
***************
*** 210,217 ****
      <mac-nicec-new package="nice.tools.repository.publish" args="--jar ${build}/nicepublish.jar" />
    </target>
!   <target name="libs">
      <mac-nicec-new package="nice.functional" />
    </target>
!   <target name="bootstrap" depends="core-bootstrap,javacc,parser,recompile,compiler,tools,libs" />
    <!-- The end of bootstrap targets. -->
  
--- 223,232 ----
      <mac-nicec-new package="nice.tools.repository.publish" args="--jar ${build}/nicepublish.jar" />
    </target>
!   <target name="libs" depends="initialize">
      <mac-nicec-new package="nice.functional" />
    </target>
!   <target name="bootstrap"
!           depends="core-bootstrap,javacc,parser,recompile,compiler1,compiler2,tools,libs,recompile"
!   />
    <!-- The end of bootstrap targets. -->