Skip to content

Commit

Permalink
Change Ant's echo log level from "Warning" to "Info"
Browse files Browse the repository at this point in the history 
Due to the new version of the maven-antrun-plugin, every echo
instruction is treated as a warning.

See https://ant.apache.org/manual/Tasks/echo.html
  • Loading branch information
@ptziegler @azoitl
ptziegler authored and azoitl committed Dec 27, 2024
1 parent 83c0e5d commit 134336d
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 47 deletions.
28 changes: 14 additions & 14 deletions org.eclipse.draw2d.doc.isv/buildDoc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
</target>

<target name="generateJavadoc">
<echo message="Cleaning reference/api..." />
<echo level="info" message="Cleaning reference/api..." />
<delete dir="reference/api" />
<mkdir dir="reference/api" />
<echo message="Done." />
<echo level="info" message="Done." />

<echo message="Determining path to javadoc executable, using home dir ${java.home}..." />
<echo level="info" message="Determining path to javadoc executable, using home dir ${java.home}..." />
<available file="${java.home}/bin/javadoc.exe" property="javadoc" value="${java.home}/bin/javadoc.exe" />
<available file="${java.home}/../bin/javadoc" property="javadoc" value="${java.home}/../bin/javadoc" />
<available file="${java.home}/bin/javadoc" property="javadoc" value="${java.home}/bin/javadoc" />
<echo message="Done: ${javadoc}" />
<echo level="info" message="Done: ${javadoc}" />

<echo message="Determining args list delimiter..." />
<echo level="info" message="Determining args list delimiter..." />
<condition property="args.list.delimiter" value=":">
<or>
<os family="unix" />
Expand All @@ -28,9 +28,9 @@
<condition property="args.list.delimiter" value=";">
<os family="windows" />
</condition>
<echo message="Done: ${args.list.delimiter}" />
<echo level="info" message="Done: ${args.list.delimiter}" />

<echo message="Determining context libs for javadoc generation ..." />
<echo level="info" message="Determining context libs for javadoc generation ..." />
<path id="api.context.libs">
<fileset dir="api-context-libs">
<include name="*.jar" />
Expand All @@ -39,27 +39,27 @@
<pathconvert property="api.context.libs.classpath" pathsep="${args.list.delimiter}">
<path refid="api.context.libs" />
</pathconvert>
<echo message="Done: ${api.context.libs.classpath}" />
<echo level="info" message="Done: ${api.context.libs.classpath}" />

<echo message="Preparing offline link target" />
<echo level="info" message="Preparing offline link target" />
<property name="linkoffline-target" value="linkoffline-target"/>
<unzip src="${linkoffline-target}/org.eclipse.platform.doc.isv.jar" dest="${linkoffline-target}/org.eclipse.platform.doc.isv/" />
<echo message="Done: ${linkoffline-target} contains unzipped offline link target." />
<echo level="info" message="Done: ${linkoffline-target} contains unzipped offline link target." />

<property name="tmp.options.file" value="javadocOptions.txt" />
<echo message="Preparing temporary options file ${tmp.options.file}" />
<echo level="info" message="Preparing temporary options file ${tmp.options.file}" />
<replaceregexp file="${project.build.directory}/${tmp.options.file}" flags="g" match="(\r\n?|\n);" replace="${args.list.delimiter}" />
<replace file="${project.build.directory}/${tmp.options.file}" token="@context@" value="${api.context.libs.classpath}" />
<replace file="${project.build.directory}/${tmp.options.file}" token="@rt@" value="${bootclasspath}" />
<replace file="${project.build.directory}/${tmp.options.file}" token="@args.list.delimiter@" value="${args.list.delimiter}" />
<replace file="${project.build.directory}/${tmp.options.file}" token="@linkoffline-target@" value="${linkoffline-target}" />
<echo message="Done." />
<echo level="info" message="Done." />

<echo message="Generating javadoc..." />
<echo level="info" message="Generating javadoc..." />
<exec dir="." executable="${javadoc}" output="doc.bin.log">
<arg line="@${project.build.directory}/${tmp.options.file} -J-Xmx1000M" />
</exec>
<echo message="Done." />
<echo level="info" message="Done." />
</target>

</project>
Expand Down
28 changes: 14 additions & 14 deletions org.eclipse.gef.doc.isv/buildDoc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
</target>

<target name="generateJavadoc">
<echo message="Cleaning reference/api..." />
<echo level="info" message="Cleaning reference/api..." />
<delete dir="reference/api" />
<mkdir dir="reference/api" />
<echo message="Done." />
<echo level="info" message="Done." />

<echo message="Determining path to javadoc executable, using home dir ${java.home}..." />
<echo level="info" message="Determining path to javadoc executable, using home dir ${java.home}..." />
<available file="${java.home}/bin/javadoc.exe" property="javadoc" value="${java.home}/bin/javadoc.exe" />
<available file="${java.home}/../bin/javadoc" property="javadoc" value="${java.home}/../bin/javadoc" />
<available file="${java.home}/bin/javadoc" property="javadoc" value="${java.home}/bin/javadoc" />
<echo message="Done: ${javadoc}" />
<echo level="info" message="Done: ${javadoc}" />

<echo message="Determining args list delimiter..." />
<echo level="info" message="Determining args list delimiter..." />
<condition property="args.list.delimiter" value=":">
<or>
<os family="unix" />
Expand All @@ -28,9 +28,9 @@
<condition property="args.list.delimiter" value=";">
<os family="windows" />
</condition>
<echo message="Done: ${args.list.delimiter}" />
<echo level="info" message="Done: ${args.list.delimiter}" />

<echo message="Determining context libs for javadoc generation ..." />
<echo level="info" message="Determining context libs for javadoc generation ..." />
<path id="api.context.libs">
<fileset dir="api-context-libs">
<include name="*.jar" />
Expand All @@ -39,27 +39,27 @@
<pathconvert property="api.context.libs.classpath" pathsep="${args.list.delimiter}">
<path refid="api.context.libs" />
</pathconvert>
<echo message="Done: ${api.context.libs.classpath}" />
<echo level="info" message="Done: ${api.context.libs.classpath}" />

<echo message="Preparing offline link target" />
<echo level="info" message="Preparing offline link target" />
<property name="linkoffline-target" value="linkoffline-target" />
<unzip src="${linkoffline-target}/org.eclipse.platform.doc.isv.jar" dest="${linkoffline-target}/org.eclipse.platform.doc.isv/" />
<echo message="Done: ${linkoffline-target} contains unzipped offline link target." />
<echo level="info" message="Done: ${linkoffline-target} contains unzipped offline link target." />

<property name="tmp.options.file" value="javadocOptions.txt" />
<echo message="Preparing temporary options file ${tmp.options.file}" />
<echo level="info" message="Preparing temporary options file ${tmp.options.file}" />
<replaceregexp file="${project.build.directory}/${tmp.options.file}" flags="g" match="(\r\n?|\n);" replace="${args.list.delimiter}" />
<replace file="${project.build.directory}/${tmp.options.file}" token="@context@" value="${api.context.libs.classpath}" />
<replace file="${project.build.directory}/${tmp.options.file}" token="@rt@" value="${bootclasspath}" />
<replace file="${project.build.directory}/${tmp.options.file}" token="@args.list.delimiter@" value="${args.list.delimiter}" />
<replace file="${project.build.directory}/${tmp.options.file}" token="@linkoffline-target@" value="${linkoffline-target}" />
<echo message="Done." />
<echo level="info" message="Done." />

<echo message="Generating javadoc..." />
<echo level="info" message="Generating javadoc..." />
<exec dir="." executable="${javadoc}" output="doc.bin.log">
<arg line="@${project.build.directory}/${tmp.options.file} -J-Xmx1000M" />
</exec>
<echo message="Done." />
<echo level="info" message="Done." />
</target>

</project>
Expand Down
28 changes: 14 additions & 14 deletions org.eclipse.zest.doc.isv/buildDoc.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,18 @@
</target>

<target name="generateJavadoc">
<echo message="Cleaning reference/api..." />
<echo level="info" message="Cleaning reference/api..." />
<delete dir="reference/api" />
<mkdir dir="reference/api" />
<echo message="Done." />
<echo level="info" message="Done." />

<echo message="Determining path to javadoc executable, using home dir ${java.home}..." />
<echo level="info" message="Determining path to javadoc executable, using home dir ${java.home}..." />
<available file="${java.home}/bin/javadoc.exe" property="javadoc" value="${java.home}/bin/javadoc.exe" />
<available file="${java.home}/../bin/javadoc" property="javadoc" value="${java.home}/../bin/javadoc" />
<available file="${java.home}/bin/javadoc" property="javadoc" value="${java.home}/bin/javadoc" />
<echo message="Done: ${javadoc}" />
<echo level="info" message="Done: ${javadoc}" />

<echo message="Determining args list delimiter..." />
<echo level="info" message="Determining args list delimiter..." />
<condition property="args.list.delimiter" value=":">
<or>
<os family="unix" />
Expand All @@ -28,9 +28,9 @@
<condition property="args.list.delimiter" value=";">
<os family="windows" />
</condition>
<echo message="Done: ${args.list.delimiter}" />
<echo level="info" message="Done: ${args.list.delimiter}" />

<echo message="Determining context libs for javadoc generation ..." />
<echo level="info" message="Determining context libs for javadoc generation ..." />
<path id="api.context.libs">
<fileset dir="api-context-libs">
<include name="*.jar" />
Expand All @@ -39,27 +39,27 @@
<pathconvert property="api.context.libs.classpath" pathsep="${args.list.delimiter}">
<path refid="api.context.libs" />
</pathconvert>
<echo message="Done: ${api.context.libs.classpath}" />
<echo level="info" message="Done: ${api.context.libs.classpath}" />

<echo message="Preparing offline link target" />
<echo level="info" message="Preparing offline link target" />
<property name="linkoffline-target" value="linkoffline-target"/>
<unzip src="${linkoffline-target}/org.eclipse.platform.doc.isv.jar" dest="${linkoffline-target}/org.eclipse.platform.doc.isv/" />
<echo message="Done: ${linkoffline-target} contains unzipped offline link target." />
<echo level="info" message="Done: ${linkoffline-target} contains unzipped offline link target." />

<property name="tmp.options.file" value="javadocOptions.txt" />
<echo message="Preparing temporary options file ${tmp.options.file}" />
<echo level="info" message="Preparing temporary options file ${tmp.options.file}" />
<replaceregexp file="${project.build.directory}/${tmp.options.file}" flags="g" match="(\r\n?|\n);" replace="${args.list.delimiter}" />
<replace file="${project.build.directory}/${tmp.options.file}" token="@context@" value="${api.context.libs.classpath}" />
<replace file="${project.build.directory}/${tmp.options.file}" token="@rt@" value="${bootclasspath}" />
<replace file="${project.build.directory}/${tmp.options.file}" token="@args.list.delimiter@" value="${args.list.delimiter}" />
<replace file="${project.build.directory}/${tmp.options.file}" token="@linkoffline-target@" value="${linkoffline-target}" />
<echo message="Done." />
<echo level="info" message="Done." />

<echo message="Generating javadoc..." />
<echo level="info" message="Generating javadoc..." />
<exec dir="." executable="${javadoc}" output="doc.bin.log">
<arg line="@${project.build.directory}/${tmp.options.file} -J-Xmx1000M" />
</exec>
<echo message="Done." />
<echo level="info" message="Done." />
</target>

</project>
Expand Down
10 changes: 5 additions & 5 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,10 +133,10 @@
<if>
<available file="about.mappings" />
<then>
<echo message="Creating backup of about.mappings." />
<echo level="info" message="Creating backup of about.mappings." />
<copy file="about.mappings" tofile="about.mappings.backup"
overwrite="true" />
<echo
<echo level="info"
message="Replacing @build@ token within about.mappings with build id." />
<replace file="about.mappings">
<replacefilter token="@build@" value="${buildQualifier}" />
Expand All @@ -148,7 +148,7 @@
<then>
<copy file="javadocOptions.txt" tofile="${project.build.directory}/javadocOptions.txt"
overwrite="true" />
<echo message="Creating backup of javadocOptions.txt" />
<echo level="info" message="Creating backup of javadocOptions.txt" />
<replace file="${project.build.directory}/javadocOptions.txt">
<replacefilter token="@build@"
value="${unqualifiedVersion}.${buildQualifier}" />
Expand All @@ -171,7 +171,7 @@
<if>
<available file="about.mappings.backup" />
<then>
<echo message="Replacing back modified about.mappings with backup." />
<echo level="info" message="Replacing back modified about.mappings with backup." />
<copy file="about.mappings.backup" tofile="about.mappings"
overwrite="true" />
<delete file="about.mappings.backup" />
Expand All @@ -180,7 +180,7 @@
<if>
<available file="javadocOptions.txt.backup" />
<then>
<echo
<echo level="info"
message="Replacing back modified javadocOptions.txt with backup." />
<copy file="javadocOptions.txt.backup" tofile="javadocOptions.txt"
overwrite="true" />
Expand Down

0 comments on commit 134336d

Please sign in to comment.