rpms/pmd/devel pmd-4.2.5-build.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 pmd.spec, 1.5, 1.6 sources, 1.3, 1.4 pmd-4.2.4-build.patch, 1.1, NONE
Jerry James
jjames at fedoraproject.org
Wed Feb 11 19:48:23 UTC 2009
Author: jjames
Update of /cvs/pkgs/rpms/pmd/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv29739
Modified Files:
.cvsignore pmd.spec sources
Added Files:
pmd-4.2.5-build.patch
Removed Files:
pmd-4.2.4-build.patch
Log Message:
* Wed Feb 11 2009 Jerry James <loganjerry at gmail.com> - 0:4.2.5-1
- Upgrade to 4.2.5
pmd-4.2.5-build.patch:
--- NEW FILE pmd-4.2.5-build.patch ---
diff -dur pmd-4.2.5.ORIG/bin/build.xml pmd-4.2.5/bin/build.xml
--- pmd-4.2.5.ORIG/bin/build.xml 2009-01-27 13:24:02.000000000 -0700
+++ pmd-4.2.5/bin/build.xml 2009-02-11 12:29:52.000000000 -0700
@@ -15,7 +15,6 @@
<property name="asm.version" value="3.1" />
<property name="jaxen.version" value="1.1.1" />
<property name="junit.version" value="4.4" />
- <property name="retroweaver.version" value="2.0.5" />
<property name="javacc-home.path" value="${dir.lib}" />
<!--Settings-->
@@ -23,10 +22,12 @@
<path id="dependencies.path">
<pathelement location="${dir.build}" />
- <fileset dir="${dir.lib}">
+ <fileset dir="/usr/share/java">
<include name="jaxen-${jaxen.version}.jar" />
+ <include name="junit4-${junit.version}.jar" />
+ </fileset>
+ <fileset dir="/usr/share/java/objectweb-asm">
<include name="asm-${asm.version}.jar" />
- <include name="junit-${junit.version}.jar" />
</fileset>
</path>
@@ -78,7 +79,7 @@
<zipfileset dir="etc" includes="ruleset.dtd,ruleset_xml_schema.xsd" prefix="rulesets"/>
<manifest>
<attribute name="Main-Class" value="net.sourceforge.pmd.PMD" />
- <attribute name="Class-Path" value="jaxen-${jaxen.version}.jar asm-${asm.version}.jar" />
+ <attribute name="Class-Path" value="jaxen-${jaxen.version}.jar objectweb-asm/asm-${asm.version}.jar" />
</manifest>
</jar>
@@ -88,58 +89,6 @@
basedir="${dir.build}" />
</target>
- <taskdef name="retroweaver" classname="net.sourceforge.retroweaver.ant.RetroWeaverTask">
- <classpath>
- <pathelement location="${dir.lib14}/retroweaver-${retroweaver.version}.jar"/>
- <pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
- <pathelement location="${dir.lib14}/backport-util-concurrent.jar"/>
- <pathelement location="${dir.lib14}/asm-commons-${asm.version}.jar"/>
- <pathelement location="${dir.lib14}/asm-util-${asm.version}.jar"/>
- <pathelement location="${dir.lib}/asm-${asm.version}.jar"/>
- </classpath>
- </taskdef>
-
- <target name="weavejunit" depends="jar">
- <path id="retroweaverclasspath">
- <pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
- <pathelement location="${dir.lib14}/backport-util-concurrent.jar"/>
- <pathelement location="${dir.lib}/asm-${asm.version}.jar"/>
- <pathelement location="${jvm14.runtime}" />
- <pathelement location="${dir.lib}/jaxen-${jaxen.version}.jar" />
- <pathelement location="${dir.lib14}/junit.jar" />
- <pathelement location="${ant.jar}" />
- </path>
-
- <retroweaver inputjar="${dir.lib}/junit-${junit.version}.jar" outputjar="${dir.lib14}/junit.jar" target="1.4" failonerror="true" verify="true">
- <classpath refid="retroweaverclasspath" />
- </retroweaver>
- </target>
-
- <target name="weave" depends="jar, weavejunit">
- <fail unless="ant.jar" message="ant.jar location is not defined properly" />
- <fail unless="jvm14.runtime" message="jvm14.runtime (i.e. rt.jar) location is not defined properly" />
-
- <path id="retroweaverclasspath">
- <pathelement location="${dir.lib14}/pmd14-${version}.jar" />
- <pathelement location="${dir.lib14}/pmd14-test-${version}.jar" />
- <pathelement location="${dir.lib14}/retroweaver-rt-${retroweaver.version}.jar"/>
- <pathelement location="${dir.lib14}/backport-util-concurrent.jar"/>
- <pathelement location="${dir.lib}/asm-${asm.version}.jar"/>
- <pathelement location="${jvm14.runtime}" />
- <pathelement location="${dir.lib}/jaxen-${jaxen.version}.jar" />
- <pathelement location="${dir.lib14}/junit.jar" />
- <pathelement location="${ant.jar}" />
- </path>
-
- <retroweaver inputjar="${dir.lib}/pmd-${version}.jar" outputjar="${dir.lib14}/pmd14-${version}.jar" target="1.4" failonerror="true" verify="true">
- <classpath refid="retroweaverclasspath" />
- </retroweaver>
-
- <retroweaver inputjar="${dir.lib}/pmd-test-${version}.jar" outputjar="${dir.lib14}/pmd14-test-${version}.jar" target="1.4" failonerror="true" verify="true">
- <classpath refid="retroweaverclasspath" />
- </retroweaver>
- </target>
-
<target name="jarsrc" depends="copy,compile" description="Jars up the source directory">
<jar jarfile="${dir.lib}/pmd-src-${version}.jar" basedir="${dir.src}" />
</target>
@@ -249,44 +198,6 @@
</concat>
</target>
- <path id="dependencies14.path">
- <fileset dir="${dir.lib14}">
- <include name="backport-util-concurrent.jar" />
- <include name="pmd14-${version}.jar" />
- <include name="pmd14-test-${version}.jar" />
- <include name="retroweaver-rt-${retroweaver.version}.jar" />
- <include name="junit.jar" />
- </fileset>
- <fileset dir="${dir.lib}">
- <include name="jaxen-${jaxen.version}.jar" />
- <include name="asm-${asm.version}.jar" />
- </fileset>
- </path>
-
- <target name="test14" depends="requires-junit,compile,copy,weavejunit,weave" description="Runs the unit tests with 1.4 jvm">
- <fail unless="jvm14.exe" message="jvm14.exe location is not defined properly" />
-
- <antcall target="test-execute">
- <param name="test.outputdir" value="${dir.build}/reports14"/>
- <param name="test.jvm" value="${jvm14.exe}"/>
- <param name="test.dependencies" value="dependencies14.path"/>
- <param name="test.regression" value="false"/>
- <param name="test.printsummary" value="true"/>
- </antcall>
- </target>
-
- <target name="regress14" depends="requires-junit,compile,copy,weavejunit,weave" description="Runs the regression unit tests with 1.4 jvm">
- <fail unless="jvm14.exe" message="jvm14.exe location is not defined properly" />
-
- <antcall target="test-execute">
- <param name="test.outputdir" value="${dir.build}/reports14"/>
- <param name="test.jvm" value="${jvm14.exe}"/>
- <param name="test.dependencies" value="dependencies14.path"/>
- <param name="test.regression" value="true"/>
- <param name="test.printsummary" value="false"/>
- </antcall>
- </target>
-
<target name="symtabtest" depends="compile" description="Runs the unit tests for the symboltable package">
<junit printsummary="yes" haltonfailure="yes">
<classpath>
@@ -424,7 +335,7 @@
<target name="clean" depends="delete,compile,copy" description="Does a complete recompile" />
- <target name="dist" depends="clean,jar,weave" description="Preps things for a release" />
+ <target name="dist" depends="clean,jar" description="Preps things for a release" />
<target name="cpdjnlp" depends="dist" description="Uploads a new CPD JNLP thingy to the PMD web site">
<signjar jar="${dir.lib}/pmd-${version}.jar" storetype="${keystore.type}" alias="${keystore.alias}" keystore="${keystore.path}" storepass="${keystore.password}" />
@@ -466,7 +377,7 @@
<target name="javadoc" description="Generates Javadocs">
<mkdir dir="docs/api" />
- <javadoc packagenames="com.*, net.*, org.*" sourcepath="${dir.src}" destdir="docs/api" doctitle="PMD ${version} API" failonerror="yes">
+ <javadoc packagenames="com.*, net.*, org.*" sourcepath="${dir.src}" destdir="docs/api" doctitle="PMD ${version} API" failonerror="yes" Encoding="latin1">
<tag name="todo" enabled="false"/>
<classpath>
<fileset dir="${dir.lib}">
@@ -477,7 +388,7 @@
</javadoc>
</target>
- <target name="qa" depends="dist, regress, regress14, pmdOnPmd, cpdOnPmd, symtabtest, dfatest, cpdtest, javadoc" description="Runs all tests (used for continuous integration tests with cruise control)"/>
+ <target name="qa" depends="dist, regress, pmdOnPmd, cpdOnPmd, symtabtest, dfatest, cpdtest, javadoc" description="Runs all tests (used for continuous integration tests with cruise control)"/>
</project>
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/pmd/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 14 Jan 2009 23:39:06 -0000 1.3
+++ .cvsignore 11 Feb 2009 19:47:53 -0000 1.4
@@ -1 +1 @@
-pmd-src-4.2.4.zip
+pmd-src-4.2.5.zip
Index: pmd.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pmd/devel/pmd.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pmd.spec 14 Jan 2009 23:39:06 -0000 1.5
+++ pmd.spec 11 Feb 2009 19:47:53 -0000 1.6
@@ -28,7 +28,7 @@
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
Name: pmd
-Version: 4.2.4
+Version: 4.2.5
Release: 1%{?dist}
Epoch: 0
Summary: Scans Java source code and looks for potential problems
@@ -38,9 +38,9 @@
# This patch has not been sent upstream. It causes the build to use installed
# jars for dependencies rather than use those distributed with the source. It
# also kills retroweaver dead, dead, dead so it won't interfere with the build.
-Patch0: pmd-4.2.4-build.patch
-# This patch has not been sent upstream yet. It fixes a null pointer exception
-# when using the nicehtml output format.
+Patch0: pmd-4.2.5-build.patch
+# This patch was sent upstream on 11 Feb 2009. It fixes a null pointer
+# exception when using the nicerhtml output format.
Patch1: pmd-4.2.4-nicerhtml.patch
Url: http://pmd.sourceforge.net/
@@ -138,6 +138,9 @@
%{_javadocdir}/*
%changelog
+* Wed Feb 11 2009 Jerry James <loganjerry at gmail.com> - 0:4.2.5-1
+- Upgrade to 4.2.5
+
* Wed Jan 14 2009 Jerry James <loganjerry at gmail.com> - 0:4.2.4-1
- Upgrade to 4.2.4
- Drop unnecessary scripts/files in etc
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/pmd/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 14 Jan 2009 23:39:06 -0000 1.3
+++ sources 11 Feb 2009 19:47:53 -0000 1.4
@@ -1 +1 @@
-b030b3a265b612d980a339996d52f723 pmd-src-4.2.4.zip
+b0abacaeba8c51edf91c2eb7f62c2abb pmd-src-4.2.5.zip
--- pmd-4.2.4-build.patch DELETED ---
More information about the scm-commits
mailing list