FAQ
Repository: ant
Updated Branches:
   refs/heads/master 1be6cf50a -> 2d86edf69


check.xml: make Simian work again


Project: http://git-wip-us.apache.org/repos/asf/ant/repo
Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/600c69d0
Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/600c69d0
Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/600c69d0

Branch: refs/heads/master
Commit: 600c69d0add42a482ff9a40b4aff98d904e9ae50
Parents: d28974c
Author: Jan Matèrne <jhm@apache.org>
Authored: Fri May 27 15:28:17 2016 +0200
Committer: Jan Matèrne <jhm@apache.org>
Committed: Fri May 27 15:28:17 2016 +0200

----------------------------------------------------------------------
  check.xml | 95 ++++++++++++++++++++++++++++++++++++++++++++--------------
  1 file changed, 72 insertions(+), 23 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ant/blob/600c69d0/check.xml
----------------------------------------------------------------------
diff --git a/check.xml b/check.xml
index a6f6bc7..927f1d7 100644
--- a/check.xml
+++ b/check.xml
@@ -34,35 +34,48 @@
    </description>

    <import file="build.xml"/>
+
    <property name="config.dir" location="${etc.dir}/checkstyle"/>

- <property name="checkstyle.reportdir" location="${build.dir}/reports/checkstyle"/>
- <property name="checkstyle.raw" location="${checkstyle.reportdir}/raw.xml"/>
- <property name="stylesheet.html" location="${config.dir}/checkstyle-frames.xsl"/>
- <property name="stylesheet.html.sorted" location="${config.dir}/checkstyle-frames-sortby-check.xsl"/>
- <property name="stylesheet.text" location="${config.dir}/checkstyle-text.xsl"/>
- <property name="stylesheet.xdoc" location="${config.dir}/checkstyle-xdoc.xsl"/>
-
- <property name="checkstyle.basedir" location="${java.dir}"/>
-
    <!-- Ant Checkstyle report -->
- <property name="tocheck" value="**/*.java"/>
- <property name="javadoc.scope" value="public"/>
+ <property name="checkstyle.reportdir"
+ location="${build.dir}/reports/checkstyle"
+ description="Where to store Checkstyle reports"/>
+ <property name="checkstyle.raw"
+ location="${checkstyle.reportdir}/raw.xml"
+ description="Name of Checkstyle XML-Report"/>
+ <property name="stylesheet.html"
+ location="${config.dir}/checkstyle-frames.xsl"
+ description="Name of Checkstyle XSLT for generating HTML"/>
+ <property name="stylesheet.html.sorted"
+ location="${config.dir}/checkstyle-frames-sortby-check.xsl"
+ description="Name of Checkstyle XSLT for generating 2nd HTML"/>
+ <property name="stylesheet.text"
+ location="${config.dir}/checkstyle-text.xsl"
+ description="Name of Checkstyle XSLT for generating plain text"/>
+ <property name="stylesheet.xdoc"
+ location="${config.dir}/checkstyle-xdoc.xsl"
+ description="Name of Checkstyle XSLT for generating XDOC"/>
+
+ <property name="checkstyle.basedir"
+ location="${java.dir}"
+ description="Where are the Java sources to check"/>
+ <property name="tocheck"
+ value="**/*.java"
+ description="Include pattern of the files to check"/>

- <taskdef resource="simiantask.properties"/>
-
    <!-- Findbugs: Running Findbugs -->
- <property name="findbugs.reportdir"
- location="${build.dir}/reports/findbugs"
+ <property name="findbugs.reportdir"
+ location="${build.dir}/reports/findbugs"
              description="Where to store Findbugs results"/>
- <property name="findbugs.raw"
- value="raw.xml"
+ <property name="findbugs.raw"
+ value="raw.xml"
              description="Findbugs Output xml-file"/>
- <property name="findbugs.xsl"
- value="fancy.xsl"
+ <property name="findbugs.xsl"
+ value="fancy.xsl"
              description="Which XSL to use for generating Output: default, fancy, plain, summary"/>
- <property name="findbugs.jvmargs"
- value="-Xms128m -Xmx512m"
+ <property name="findbugs.jvmargs"
+ value="-Xms128m -Xmx512m"
              description="JVMArgs for invoking Findbugs"/>

    <!-- RAT Release Auditing Tool -->
@@ -76,6 +89,19 @@
              value="0.11"
              description="Which Version of RAT to use"/>

+ <!-- Simian -->
+ <property name="simian.version"
+ value="2.4.0"
+ description="Which Version of Simian to use"/>
+ <property name="simian.uri"
+ value="http://www.harukizaemon.com/simian/simian-${simian.version}.tar.gz"
+ description="Where to get Simian"/>
+ <property name="simian.lib.dir"
+ value="${build.dir}/simian-lib"
+ description="Where to store Simian resources"/>
+ <property name="simian.report.dir"
+ value="${build.dir}/simian"
+ description="Where to store Simian reports"/>


    <target name="init-ivy">
@@ -154,11 +180,34 @@
    </target>

    <target name="simiancheck" description="--> runs the check for duplicates">
- <simian>
+ <available property="simian.jar.present" file="${simian.lib.dir}/simian-${simian.version}.jar"/>
+ <sequential unless:set="simian.jar.present">
+ <mkdir dir="${simian.lib.dir}"/>
+ <get src="${simian.uri}" dest="${simian.lib.dir}"/>
+ <gunzip src="${simian.lib.dir}/simian-${simian.version}.tar.gz" dest="${simian.lib.dir}/simian-${simian.version}.tar"/>
+ <untar src="${simian.lib.dir}/simian-${simian.version}.tar" dest="${simian.lib.dir}">
+ <patternset>
+ <include name="**/simian*.jar"/>
+ <include name="**/simian*.xsl"/>
+ </patternset>
+ <flattenmapper/>
+ </untar>
+ </sequential>
+
+ <taskdef resource="simiantask.properties">
+ <classpath>
+ <fileset dir="${simian.lib.dir}" includes="*.jar"/>
+ </classpath>
+ </taskdef>
+ <mkdir dir="${simian.report.dir}"/>
+ <simian failureProperty="simian.duplicates.found">
          <fileset dir="${java.dir}" />
+ <formatter type="plain" toFile="${simian.report.dir}/simian-log.txt"/>
+ <formatter type="xml" toFile="${simian.report.dir}/simian-log.xml"/>
      </simian>
+ <xslt in="${simian.report.dir}/simian-log.xml" style="${simian.lib.dir}/simian.xsl" out="${simian.report.dir}/simian.html"/>
    </target>
-
+
    <target name="fixTS" description="--> fix checkstyle errors 'Line has trailing spaces'">
      <fail message="Define path to java file 'path'">
        <condition><not><isset property="path"/></not></condition>

Search Discussions

  • Jhm at May 27, 2016 at 2:06 pm
    Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/ant


    Project: http://git-wip-us.apache.org/repos/asf/ant/repo
    Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/2d86edf6
    Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/2d86edf6
    Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/2d86edf6

    Branch: refs/heads/master
    Commit: 2d86edf69ebeb6d6a3b1e919fcf2dbca71baf117
    Parents: d840ddb 1be6cf5
    Author: Jan Matèrne <jhm@apache.org>
    Authored: Fri May 27 16:06:16 2016 +0200
    Committer: Jan Matèrne <jhm@apache.org>
    Committed: Fri May 27 16:06:16 2016 +0200

    ----------------------------------------------------------------------
      src/main/org/apache/tools/ant/AntClassLoader.java | 5 +----
      src/main/org/apache/tools/ant/launch/Locator.java | 14 +++++---------
      src/main/org/apache/tools/ant/taskdefs/Concat.java | 2 +-
      src/main/org/apache/tools/ant/taskdefs/Jar.java | 3 +--
      .../apache/tools/ant/taskdefs/ManifestClassPath.java | 7 ++-----
      src/main/org/apache/tools/ant/taskdefs/Zip.java | 3 +--
      .../tools/ant/taskdefs/optional/unix/Symlink.java | 4 +---
      src/main/org/apache/tools/ant/util/UUEncoder.java | 2 +-
      8 files changed, 13 insertions(+), 27 deletions(-)
    ----------------------------------------------------------------------
  • Jhm at May 27, 2016 at 2:06 pm
    check.xml
    - update Ivy
    - update Findbugs


    Project: http://git-wip-us.apache.org/repos/asf/ant/repo
    Commit: http://git-wip-us.apache.org/repos/asf/ant/commit/d840ddb4
    Tree: http://git-wip-us.apache.org/repos/asf/ant/tree/d840ddb4
    Diff: http://git-wip-us.apache.org/repos/asf/ant/diff/d840ddb4

    Branch: refs/heads/master
    Commit: d840ddb4169bc6fc94197a48accab5d9322fd17f
    Parents: 600c69d
    Author: Jan Matèrne <jhm@apache.org>
    Authored: Fri May 27 16:05:26 2016 +0200
    Committer: Jan Matèrne <jhm@apache.org>
    Committed: Fri May 27 16:05:26 2016 +0200

    ----------------------------------------------------------------------
      check.xml | 6 +++---
      1 file changed, 3 insertions(+), 3 deletions(-)
    ----------------------------------------------------------------------


    http://git-wip-us.apache.org/repos/asf/ant/blob/d840ddb4/check.xml
    ----------------------------------------------------------------------
    diff --git a/check.xml b/check.xml
    index 927f1d7..92d0346 100644
    --- a/check.xml
    +++ b/check.xml
    @@ -105,7 +105,7 @@


        <target name="init-ivy">
    - <property name="ivy.version" value="2.4.0-rc1"/>
    + <property name="ivy.version" value="2.4.0"/>
          <property name="ivy.jar.url" value="http://repo1.maven.org/maven2/org/apache/ivy/ivy/${ivy.version}/ivy-${ivy.version}.jar"/>
          <property name="ivy.jar.dir" value="${build.dir}/ivy"/>
          <property name="ivy.jar.file" value="${ivy.jar.dir}/ivy.jar"/>
    @@ -221,11 +221,11 @@
          <fail message="Define path to java file 'path'">
            <condition><not><isset property="path"/></not></condition>
          </fail>
    - <fixcrlf srcdir="src/main" includes="${path}" javafiles="yes" tab="remove" tablength="4"/>
    + <fixcrlf srcdir="src/main" includes="${path}" javafiles="yes" tab="remove" tablength="4"/>
        </target>

        <target name="findbugs" description="--> checks Ant codebase with Findbugs" depends="init-ivy,build" xmlns:fb="http://findbugs.sourceforge.net/">
    - <ivy:cachepath organisation="com.google.code.findbugs" module="findbugs-ant" revision="1.3.9"
    + <ivy:cachepath organisation="com.google.code.findbugs" module="findbugs-ant" revision="3.0.0"
                         inline="true" conf="default" pathid="findbugs.real.classpath" transitive="true"/>
          <!-- Load the Findbugs AntTasks -->
          <taskdef uri="http://findbugs.sourceforge.net/" resource="edu/umd/cs/findbugs/anttask/tasks.properties" classpathref="findbugs.real.classpath" />

Related Discussions

Discussion Navigation
viewthread | post
Discussion Overview
groupnotifications @
categoriesant
postedMay 27, '16 at 2:06p
activeMay 27, '16 at 2:06p
posts3
users1
websiteant.apache.org

1 user in discussion

Jhm: 3 posts

People

Translate

site design / logo © 2018 Grokbase