Changeset 2135

Show
Ignore:
Timestamp:
06/29/08 19:07:49 (4 months ago)
Author:
jon
Message:

[build] check properties so the ast generators are not always built

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/ProjectFortress/build.xml

    r2123 r2135  
    4242         <property name="cache10" location="${basedir}/../.bytecode_cache"/> 
    4343         <property name="cache11" location="${basedir}/.bytecode_cache"/> 
    44 <property name="astgen" location="${basedir}/astgen"/> 
     44<property name="astgen.src" location="${basedir}/astgen"/> 
    4545 <property name="build" location="${basedir}/build"/> 
    4646 <property name="docs" location="${basedir}/docs"/> 
    …… 
    5858 <property name="xtc" location="${basedir}/third_party/xtc"/> 
    5959 <!-- astgen --> 
    60  <property name="generate-sourcefile" value="${astgen}/Fortress.ast" /> 
     60 <property name="generate-sourcefile" value="${astgen.src}/Fortress.ast" /> 
    6161 <!-- nodes --> 
    6262 <property name="nodesPackage" value="${packagePrefix}/nodes"/> 
    …… 
    301301            </target> 
    302302 
    303     <target name="astGenerators" depends="init"  
     303    <target name="checkAstgen"> 
     304        <condition property="astgenerators.uptodate"> 
     305                <uptodate targetfile="${basedir}/build/com/sun/fortress/astgen/FortressAstGenerator.class"> 
     306                    <srcfiles dir="${basedir}/src/com/sun/fortress/astgen/" includes="*.java"/> 
     307                </uptodate> 
     308        </condition> 
     309    </target> 
     310 
     311    <target name="astGenerators" unless="astgenerators.uptodate" depends="init,checkAstgen"  
    304312     description="Compile all AstGen custom generators."> 
    305313        <depend srcdir="${astgen.generators.src}" 
    …… 
    329337          <and> 
    330338            <available file="${nodes}/AbstractNode.java"/> 
    331             <uptodate srcfile="${astgen}/Fortress.ast" 
     339            <uptodate srcfile="${astgen.src}/Fortress.ast" 
    332340                      targetfile="${nodes}/AbstractNode.java"/> 
    333341            <available file="${library}/FortressAst.fsi" /> 
    334             <uptodate srcfile="${astgen}/Fortress.ast" 
     342            <uptodate srcfile="${astgen.src}/Fortress.ast" 
    335343                    targetfile="${library}/FortressAst.fsi" /> 
    336344            <available file="${library}/FortressAst.fss" /> 
    337             <uptodate srcfile="${astgen}/Fortress.ast" 
     345            <uptodate srcfile="${astgen.src}/Fortress.ast" 
    338346                    targetfile="${library}/FortressAst.fss" /> 
    339347            <uptodate srcfile="${basedir}/src/com/sun/fortress/astgen/FortressAstGenerator.java" 
    340                     targetfile="${astgen}/FortressAst.fsi" /> 
     348                    targetfile="${library}/FortressAst.fsi" /> 
    341349          </and> 
    342350        </condition> 
    …… 
    352360        <astgen file="${generate-sourcefile}" /> 
    353361        <move todir="${nodes}"> 
    354           <fileset dir="${astgen}"> 
     362          <fileset dir="${astgen.src}"> 
    355363            <include name="**/*.java"/> 
    356364            <exclude name="**/Fortress.ast"/> 
    …… 
    358366        </move> 
    359367        <move todir="${library}"> 
    360           <fileset dir="${astgen}"> 
     368          <fileset dir="${astgen.src}"> 
    361369            <include name="FortressAst.*" /> 
    362370          </fileset> 
    …… 
    435443--> 
    436444             <include name="${blahblahblah}/useful/*.java"/> 
    437              <include name="${blahblahblah}/astgen/*.java"/> 
     445             <!-- <include name="${blahblahblah}/astgen/*.java"/> --> 
    438446             <include name="${blahblahblah}/unicode/*.java"/> 
    439447         </javac>