[Nice-commit] Nice build.xml,1.9,1.10

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

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

Modified Files:
	build.xml 
Log Message:
Separate "compiler" target.
share/java/nice.jar generated instead of classes/nice.jar.

Index: build.xml
===================================================================
RCS file: /cvsroot/nice/Nice/build.xml,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** build.xml	12 Apr 2005 15:54:15 -0000	1.9
--- build.xml	16 Apr 2005 17:57:24 -0000	1.10
***************
*** 102,106 ****
    </target>
  
!   <!-- Bootstrap is split into a sequence of targets, combined in the "bootstrap" target. -->
    <target name="core-bootstrap" depends="initialize">
      <mkdir dir="${build}" />
--- 102,106 ----
    </target>
  
!   <!-- Bootstrap is split into a sequence of targets, combined in the "compiler1" target. -->
    <target name="core-bootstrap" depends="initialize">
      <mkdir dir="${build}" />
***************
*** 198,205 ****
      </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" />
--- 198,203 ----
      </manifest>
    </target>
!   <target name="compiler" depends="initialize">
!     <!-- The last part of the bootstrapping. -->
      <mac-nicec-old package="bossa.syntax" args="-r" />
      <mac-nicec-old package="nice.tools.compiler.console" args="-R" />
***************
*** 211,215 ****
      <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" />
--- 209,218 ----
      <antcall target="makeArchive" />
    </target>
!   <target name="compiler1"
!           depends="core-bootstrap,javacc,parser,recompile,setDate,compiler"
!           description="build intermediate compiler"
!   />
!   <target name="compiler2" depends="initialize">
!     <!-- Rebuild the compiler with itself. -->
      <mac-nicec-new package="bossa.syntax" args="-R" />
      <mac-nicec-new package="nice.tools.compiler.console" args="-R" />
***************
*** 245,250 ****
  
    <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/**" />
--- 248,254 ----
  
    <target name="makeArchive">
!     <delete file="share/java/nice.jar" />
!     <mkdir dir="share/java" />
!     <jar destfile="share/java/nice.jar" duplicate="preserve" manifest="src/nice/tools/compiler/Manifest">
        <fileset dir="${build}">
          <include name="nice/**" />
***************
*** 255,259 ****
      </jar>
    </target>
!   <available file="${build}/nice.jar" property="haveArchive" />
    <target name="archive" unless="haveArchive">
      <antcall target="bootstrap" />
--- 259,263 ----
      </jar>
    </target>
!   <available file="share/java/nice.jar" property="haveArchive" />
    <target name="archive" unless="haveArchive">
      <antcall target="bootstrap" />
***************
*** 262,266 ****
  
    <target name="jar" depends="archive" description="compile and put Nice compiler into share/java/nice.jar">
-     <copy file="${build}/nice.jar" todir="share/java" />
    </target>
  
--- 266,269 ----