Merged changes from Trunk up to revision 1350697

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/commons/branches/Temp_TrueTypeInPostScript@1352939 13f79535-47bb-0310-9956-ffa450edef68
apache · Jun 22, 2012 · 5fbfeb3 · 5fbfeb3
2 parents d0ab608 + b50c605
commit 5fbfeb3
Show file tree

Hide file tree

Showing 134 changed files with 2,473 additions and 474 deletions.
diff --git a/build.xml b/build.xml
@@ -19,9 +19,9 @@
 
   <!-- See build.properties and build-local.properties for overriding build settings. -->
   <!-- build-local.properties is not stored in SVN and overrides values from build.properties -->
+  <property environment="env"/>
   <property file="${basedir}/build-local.properties"/>
   <property file="${basedir}/build.properties"/>
-  <property environment="env"/>
 
   <property name="Name" value="Apache XML Graphics Commons"/>
   <property name="name" value="xmlgraphics-commons"/>
@@ -47,6 +47,7 @@
   <property name="src.java.dir" value="${src.dir}/java"/>
   <property name="src.res.dir" value="${src.dir}/resources"/>
   <property name="lib.dir" value="${basedir}/lib"/>
+  <property name="optional.lib.dir" value="${lib.dir}/build" />
 
   <property name="build.dir" value="${basedir}/build"/>
   <property name="build.classes.dir" value="${build.dir}/classes"/>
@@ -56,6 +57,7 @@
   <property name="dist.src.dir" value="${basedir}/dist-src"/>
   <property name="dist.bin.result.dir" value="${dist.bin.dir}/${name}-${version}"/>
   <property name="dist.src.result.dir" value="${dist.src.dir}/${name}-${version}"/>
+  <property name="samedir" value="${basedir}"/>
 
   <!-- .NET support (using IKVM) -->
   <property name="ikvm.dir" value="."/>
@@ -69,18 +71,13 @@
     <fileset dir="${lib.dir}">
       <include name="*.jar"/>
     </fileset>
-  </path>
-
-  <path id="libs-tools-build-classpath">
     <fileset dir="${lib.dir}/build">
       <include name="*.jar"/>
     </fileset>
   </path>
 
   <path id="libs-run-classpath">
-    <fileset dir="${lib.dir}">
-      <include name="*.jar"/>
-    </fileset>
+    <path refid="libs-build-classpath"/>
     <fileset dir="${build.dir}">
       <include name="${name}.jar"/>
     </fileset>
@@ -300,7 +297,6 @@
       <patternset refid="compile-pattern"/>
       <classpath>
         <path refid="libs-build-classpath"/>
-        <path refid="libs-tools-build-classpath"/>
         <fileset dir="${build.dir}">
           <include name="${name}-${version}.jar"/>
         </fileset>
@@ -326,7 +322,6 @@
       <classpath>
         <pathelement location="${build.dir}/test-classes"/>
         <path refid="libs-build-classpath"/>
-        <path refid="libs-tools-build-classpath"/>
         <fileset dir="build">
           <include name="${name}-${version}.jar"/>
         </fileset>
@@ -445,6 +440,45 @@ NOTE:
   <!-- =================================================================== -->
   <!-- Checkstyle                                                          -->
   <!-- =================================================================== -->
+  <property name="checkstyle.location" value="${optional.lib.dir}/checkstyle-5.5-all.jar" />
+  <property name="checkstyle.noframes.xslt" value="${basedir}/checkstyle-noframes.xsl" />
+  <property name="checkstyle.config" value="${basedir}/checkstyle-5.5.xml" />
+  <path id="checkstyle-classpath">
+    <path refid="libs-build-classpath"/>
+    <pathelement location="${checkstyle.location}"/>
+  </path>
+  <condition property="checkstyle.avail">
+    <and>
+      <available classname="com.puppycrawl.tools.checkstyle.CheckStyleTask">
+        <classpath refid="checkstyle-classpath"/>
+      </available>
+      <available file="${checkstyle.noframes.xslt}"/>
+      <available file="${checkstyle.config}"/>
+    </and>
+  </condition>
+  <target name="checkstyle-avail" unless="checkstyle.avail">
+    <echo message="Checkstyle support NOT present. Please download it from http://checkstyle.sf.net/ and"/>
+    <echo message="... please provide ${checkstyle.location}"/>
+    <echo message="... please provide ${checkstyle.noframes.xslt}"/>
+    <echo message="... please provide ${checkstyle.config}"/>
+  </target>
+  <target name="checkstyle" depends="package, checkstyle-avail" if="checkstyle.avail" description="Runs Checkstyle for a code quality report">
+    <taskdef name="checkstyle" classname="com.puppycrawl.tools.checkstyle.CheckStyleTask" classpathref="checkstyle-classpath"/>
+    <mkdir dir="${build.dir}"/>
+    <checkstyle config="${checkstyle.config}" failonviolation="false">
+      <classpath>
+        <path refid="checkstyle-classpath"/>
+        <pathelement location="${build.classes.dir}"/>
+        <pathelement location="${build.sandbox-classes.dir}"/>
+        <pathelement location="${build.codegen-classes.dir}"/>
+      </classpath>
+      <fileset dir="${src.dir}" includes="**/*.java"/>
+      <formatter type="xml" toFile="${build.dir}/report_checkstyle.xml"/>
+    </checkstyle>
+    <xslt in="${build.dir}/report_checkstyle.xml" out="${build.dir}/report_checkstyle.html" style="${checkstyle.noframes.xslt}"/>
+  </target>
+
+  <!--
   <property name="checkstyle.home.dir" value="${optional.lib.dir}"/>
   <property name="checkstyle.noframes.xslt" value="${checkstyle.home.dir}/contrib/checkstyle-noframes.xsl"/>
 
@@ -518,6 +552,7 @@ NOTE:
   </target>
 
   <target name="checkstyle" depends="checkstyle-avail, checkstyle-check, checkstyle-html" description="Runs Checkstyle for a code quality report"/>
+  -->
 
   <!-- =================================================================== -->
   <!-- Creates the documentation                                           -->