pig-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rd...@apache.org
Subject svn commit: r1051285 - in /pig/trunk: build.xml ivy.xml
Date Mon, 20 Dec 2010 20:53:20 GMT
Author: rding
Date: Mon Dec 20 20:53:20 2010
New Revision: 1051285

URL: http://svn.apache.org/viewvc?rev=1051285&view=rev
Log:
fix checkstyle build target

Modified:
    pig/trunk/build.xml
    pig/trunk/ivy.xml

Modified: pig/trunk/build.xml
URL: http://svn.apache.org/viewvc/pig/trunk/build.xml?rev=1051285&r1=1051284&r2=1051285&view=diff
==============================================================================
--- pig/trunk/build.xml (original)
+++ pig/trunk/build.xml Mon Dec 20 20:53:20 2010
@@ -977,8 +977,8 @@
     <!--target name="checkstyle" depends="checkstyle.check, set-checkstyle-classpath"
if="checkstyle.home"  -->
     <target name="checkstyle" depends="ivy-checkstyle" description="Run optional third-party
tool targets">
     	<taskdef resource="checkstyletask.properties">
-       		<classpath refid="checkstyle.classpath"/>
-       <!-- 	<classpath refid="checkstyle-classpath"/> -->
+       <!--	<classpath refid="checkstyle.classpath"/> -->
+        	<classpath refid="checkstyle-classpath"/> 
         </taskdef>
         <mkdir dir="${test.build.dir}"/>
         <checkstyle config="${test.src.dir}/checkstyle.xml" failOnViolation="false">
@@ -994,13 +994,19 @@
 		to Ant on the command-line." />
     </target>
     
+    <!--
     <target name="set-checkstyle-classpath">
     	<path id="checkstyle-classpath">
         	<fileset dir="${checkstyle.home}">
 			<include name="**/*.jar"/>
          	</fileset>
  	</path>
-    </target>	
+    </target>
+    -->
+    <path id="checkstyle-classpath">
+	<path refid="checkstyle.classpath"/>	
+    	<fileset file="${lib.dir}/${antlr.jar}"/>
+    </path>
 
     <target name="findbugs.check" depends="check-for-findbugs" unless="findbugs.present">
     	<fail message="'findbugs.home' is not defined. Please pass -Dfindbugs.home=&lt;base
of Findbugs installation&gt; 

Modified: pig/trunk/ivy.xml
URL: http://svn.apache.org/viewvc/pig/trunk/ivy.xml?rev=1051285&r1=1051284&r2=1051285&view=diff
==============================================================================
--- pig/trunk/ivy.xml (original)
+++ pig/trunk/ivy.xml Mon Dec 20 20:53:20 2010
@@ -44,8 +44,8 @@
   <dependencies>
     <dependency org="checkstyle" name="checkstyle" rev="${checkstyle.version}"
       conf="checkstyle->master"/>
-    <dependency org="antlr" name="antlr" rev="${antlr.version}"
-      conf="checkstyle->master"/>
+    <!-- <dependency org="antlr" name="antlr" rev="${antlr.version}"
+      conf="checkstyle->master"/> -->
     <dependency org="commons-beanutils" name="commons-beanutils-core" rev="${commons-beanutils.version}"
       conf="checkstyle->master"/>
     <dependency org="commons-el" name="commons-el" rev="${commons-el.version}"



Mime
View raw message