Attachment 605326 Details for Bug 849337 – Upgrade to 4.3

[patch] Upgrade to 4.3

0001-Upgrade-to-4.3.patch (text/plain), 10.52 KB, created by gil cattaneo on 2012-08-18 14:10:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: gil cattaneo

Created: 2012-08-18 14:10:45 UTC

Size: 10.52 KB

patch

obsolete

>From 055b2ca0335a9aad765991ee95585536b3772d1c Mon Sep 17 00:00:00 2001
>From: gil <puntogil@libero.it>
>Date: Sat, 18 Aug 2012 16:09:04 +0200
>Subject: [PATCH] Upgrade to 4.3
>
>---
> .gitignore          |    1 +
> pmd-4.3-build.patch |  169 +++++++++++++++++++++++++++++++++++++++++++++++++++
> pmd.spec            |   20 +++---
> sources             |    2 +-
> 4 files changed, 181 insertions(+), 11 deletions(-)
> create mode 100644 pmd-4.3-build.patch
>
>diff --git a/.gitignore b/.gitignore
>index b76dfb1..8276193 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1 +1,2 @@
> pmd-src-4.2.5.zip
>+/pmd-src-4.3.zip
>diff --git a/pmd-4.3-build.patch b/pmd-4.3-build.patch
>new file mode 100644
>index 0000000..ff8b68b
>--- /dev/null
>+++ b/pmd-4.3-build.patch
>@@ -0,0 +1,169 @@
>+--- bin/build.xml	2011-09-19 19:42:21.000000000 +0200
>++++ bin/build.xml-gil	2012-08-18 15:40:00.891235537 +0200
>+@@ -10,12 +10,11 @@
>+ 	<property name="dir.release" value="release/" />
>+ 	<property name="dir.rulesets" value="rulesets/" />
>+ 	<property name="dir.regress" value="regress/" />
>+-	<property name="version" value="4.2.6" />
>++	<property name="version" value="4.3" />
>+ 
>+-	<property name="asm.version" value="3.2" />
>++	<property name="asm.version" value="3.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="junit.version" value="4.10" />
>+ 	<property name="javacc-home.path" value="${dir.lib}" />
>+ 
>+ 	
>+@@ -23,10 +22,10 @@
>+ 
>+ 	<path id="dependencies.path">
>+ 		<pathelement location="${dir.build}" />
>+-		<fileset dir="${dir.lib}">
>+-			<include name="jaxen-${jaxen.version}.jar" />
>+-			<include name="asm-${asm.version}.jar" />
>+-			<include name="junit-${junit.version}.jar" />
>++		<fileset dir="/usr/share/java">
>++			<include name="jaxen.jar" />
>++			<include name="objectweb-asm/asm.jar" />
>++			<include name="junit.jar" />
>+ 		</fileset>
>+ 	</path>
>+ 
>+@@ -78,7 +77,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.jar objectweb-asm/asm.jar" />
>+ 			</manifest>
>+ 		</jar>
>+ 
>+@@ -88,58 +87,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>
>+@@ -250,44 +197,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>
>+@@ -475,18 +384,20 @@
>+ 	<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}">
>+ 					<include name="*.jar" />
>+ 				</fileset>
>+ 				<pathelement location="${ant.jar}" />
>++				<path refid="dependencies.path" />
>+ 			</classpath>
>++			<link href="file:///usr/share/javadoc/objectweb-asm/" />
>+ 		</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>
>+ 
>diff --git a/pmd.spec b/pmd.spec
>index c3732c1..09b1bed 100644
>--- a/pmd.spec
>+++ b/pmd.spec
>@@ -28,8 +28,8 @@
> # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
> #
> Name:           pmd
>-Version:        4.2.5
>-Release:        14%{?dist}
>+Version:        4.3
>+Release:        1%{?dist}
> Epoch:          0
> Summary:        Scans Java source code and looks for potential problems
> License:        BSD
>@@ -38,10 +38,7 @@ Source0:        http://downloads.sourceforge.net/pmd/pmd-src-%{version}.zip
> # 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.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
>+Patch0:         pmd-4.3-build.patch
> # This patch has not been sent upstream.  It updates an ant dep in a pom file
> # to use the latest groupId for ant.
> Patch2:         pmd-4.2.5-antdep.patch
>@@ -90,10 +87,10 @@ Requires:       objectweb-asm-javadoc
> Javadoc for %{name}.
> 
> %prep
>-%setup -q
>-%patch0 -p1
>-%patch1
>+%setup -q -n %{name}-src-%{version}
>+%patch0 -p0
> %patch2
>+sed -i "s|<version>4.2.6</version>|<version>%{version}</version>|" pom.xml
> 
> # remove all binary libs
> find . -name "*.jar" -exec rm -f {} \;
>@@ -128,7 +125,7 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> 
> %files
>-%doc LICENSE.txt etc/changelog.txt etc/fr_docs etc/readme.txt
>+%doc LICENSE.txt etc/changelog.txt etc/fr_docs
> %doc etc/pmdProperties.rtf
> %{_javadir}/*.jar
> %{_datadir}/%{name}-%{version}
>@@ -141,6 +138,9 @@ cp -pr docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
> %{_javadocdir}/*
> 
> %changelog
>+* Sat Aug 18 2012 gil cattaneo <puntogil@libero.it> - 0:4.3-1
>+- Upgrade to 4.3
>+
> * Sat Jul 21 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0:4.2.5-14
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>diff --git a/sources b/sources
>index a780cb0..52b81cb 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-b0abacaeba8c51edf91c2eb7f62c2abb  pmd-src-4.2.5.zip
>+751ec776360394731ae7958c0baa87df  pmd-src-4.3.zip
>-- 
>1.7.7.6
>

Actions: View | Diff

Attachments on bug 849337: 605325 | 605326 | 605340