|
@@ -120,6 +120,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
|
|
<property name="ivy.package.lib" value="${build.dir}/package/lib"/>
|
|
<property name="ivy.package.lib" value="${build.dir}/package/lib"/>
|
|
<property name="ivy.test.lib" value="${build.dir}/test/lib"/>
|
|
<property name="ivy.test.lib" value="${build.dir}/test/lib"/>
|
|
<property name="ivy.jdiff.lib" value="${build.dir}/jdiff/lib"/>
|
|
<property name="ivy.jdiff.lib" value="${build.dir}/jdiff/lib"/>
|
|
|
|
+ <property name="ivy.javacc.lib" value="${build.dir}/javacc/lib"/>
|
|
<property name="ivysettings.xml" value="${basedir}/ivysettings.xml"/>
|
|
<property name="ivysettings.xml" value="${basedir}/ivysettings.xml"/>
|
|
|
|
|
|
<property name="mvnrepo" value="https://repo1.maven.org/maven2"/>
|
|
<property name="mvnrepo" value="https://repo1.maven.org/maven2"/>
|
|
@@ -254,17 +255,17 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
|
|
</target>
|
|
</target>
|
|
|
|
|
|
|
|
|
|
- <target name="generate_jute_parser" depends="init,ivy-retrieve">
|
|
|
|
|
|
+ <target name="generate_jute_parser" depends="init,ivy-retrieve,ivy-retrieve-javacc">
|
|
<property name="jute_javacc.dir" value="${build.dir}/jute_compiler" />
|
|
<property name="jute_javacc.dir" value="${build.dir}/jute_compiler" />
|
|
<property name="jute_javacc.packagedir" value="/org/apache/jute/compiler/generated" />
|
|
<property name="jute_javacc.packagedir" value="/org/apache/jute/compiler/generated" />
|
|
<mkdir dir="${jute_javacc.dir}${jute_javacc.packagedir}"/>
|
|
<mkdir dir="${jute_javacc.dir}${jute_javacc.packagedir}"/>
|
|
<!-- the javacc task expects a "javacc.jar" file... -->
|
|
<!-- the javacc task expects a "javacc.jar" file... -->
|
|
<ivy:artifactproperty name="[artifact].revision" value="[revision]" />
|
|
<ivy:artifactproperty name="[artifact].revision" value="[revision]" />
|
|
- <move file="${ivy.lib}/javacc-${javacc.revision}.jar" tofile="${ivy.lib}/javacc.jar" failonerror="false"/>
|
|
|
|
|
|
+ <move file="${ivy.javacc.lib}/javacc-${javacc.revision}.jar" tofile="${ivy.javacc.lib}/javacc.jar" failonerror="false"/>
|
|
<javacc
|
|
<javacc
|
|
target="${java.src.dir}${jute_javacc.packagedir}/rcc.jj"
|
|
target="${java.src.dir}${jute_javacc.packagedir}/rcc.jj"
|
|
outputdirectory="${jute_javacc.dir}${jute_javacc.packagedir}/"
|
|
outputdirectory="${jute_javacc.dir}${jute_javacc.packagedir}/"
|
|
- javacchome="${ivy.lib}"
|
|
|
|
|
|
+ javacchome="${ivy.javacc.lib}"
|
|
/>
|
|
/>
|
|
</target>
|
|
</target>
|
|
|
|
|
|
@@ -386,6 +387,12 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
|
|
pattern="${ivy.jdiff.lib}/[artifact]-[revision].[ext]"/>
|
|
pattern="${ivy.jdiff.lib}/[artifact]-[revision].[ext]"/>
|
|
</target>
|
|
</target>
|
|
|
|
|
|
|
|
+ <target name="ivy-retrieve-javacc" depends="init,ivy-init">
|
|
|
|
+ <mkdir dir="${ivy.javacc.lib}"/>
|
|
|
|
+ <ivy:retrieve settingsRef="${ant.project.name}" conf="javacc"
|
|
|
|
+ pattern="${ivy.javacc.lib}/[artifact]-[revision].[ext]"/>
|
|
|
|
+ </target>
|
|
|
|
+
|
|
<target name="ivy-retrieve-releaseaudit" depends="init,ivy-init">
|
|
<target name="ivy-retrieve-releaseaudit" depends="init,ivy-init">
|
|
<ivy:retrieve settingsRef="${ant.project.name}" conf="releaseaudit"
|
|
<ivy:retrieve settingsRef="${ant.project.name}" conf="releaseaudit"
|
|
pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
|
|
pattern="${ivy.lib}/[artifact]-[revision].[ext]"/>
|
|
@@ -749,7 +756,7 @@ xmlns:cs="antlib:com.puppycrawl.tools.checkstyle.ant">
|
|
|
|
|
|
<ivy:makepom settingsRef="${ant.project.name}" ivyfile="${basedir}/ivy.xml"
|
|
<ivy:makepom settingsRef="${ant.project.name}" ivyfile="${basedir}/ivy.xml"
|
|
pomfile="${dist.maven.dir}/${final.name}.pom"
|
|
pomfile="${dist.maven.dir}/${final.name}.pom"
|
|
- templatefile="${basedir}/src/pom.template">
|
|
|
|
|
|
+ templatefile="${basedir}/src/pom.template" conf="default,test" >
|
|
<mapping conf="default" scope="compile"/>
|
|
<mapping conf="default" scope="compile"/>
|
|
<mapping conf="test" scope="test"/>
|
|
<mapping conf="test" scope="test"/>
|
|
</ivy:makepom>
|
|
</ivy:makepom>
|