Ignore:
Timestamp:
Jul 9, 2019 3:08:30 PM (5 months ago)
Author:
tgutzmann
Message:

Merge from trunk

Location:
branches/dev-mj-1626
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-mj-1626

  • branches/dev-mj-1626/Compiler/build-base.xml

    r12981 r13095  
    3232    <property name="java_compiler" value="javac${java_version}"/>
    3333
    34     <fail unless="target" message="Property 'target' not set. Should point to build directory where this ant file will generate intermediate files and build outputs. For builds in eclipse we normally use ${workspace_loc}/JModelica/tools/eclipse/antbuild."/>
     34    <fail unless="target" message="Property 'target' not set. Should point to build directory where this ant file will generate intermediate files and build outputs. For builds in eclipse we normally use ${workspace_loc:&lt;project&gt;/tools/eclipse/antbuild}."/>
    3535    <echo>build-base.xml: running in ${target}</echo>
    3636
     
    7676        <classpath path="${ant-contrib_dir}/target/ant-contrib.jar" />
    7777    </taskdef>
    78     <!-- "jastadd" is an ant task class in jastadd2.jar -->
    79     <taskdef classname="org.jastadd.JastAddTask" name="jastadd" classpath="${jastadd_dir}/jastadd2.jar" />
    8078    <!-- "jflex" is an ant task class for the scanner generator in JFlex.jar -->
    8179    <taskdef name="jflex" classname="JFlex.anttask.JFlexTask" classpath="${jflex_dir}/lib/JFlex.jar" />
     
    612610            <isset property="javadoc.packages"/>
    613611            <then>
    614                 <mkdir dir="${javadoc_output}" />
     612                <!-- The javadoc directory is sometimes unusable, unclear why.
     613                     It is recreated by the javadoc task. -->
     614                <delete dir="${javadoc_output}" />
    615615                <javadoc
    616616                    access="public"
Note: See TracChangeset for help on using the changeset viewer.