rpms/eclipse-findbugs/F-10 eclipsePlugin-1.3.8-build.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 eclipse-findbugs.spec, 1.2, 1.3 sources, 1.2, 1.3 eclipsePlugin-1.3.7-build.patch, 1.1, NONE

Jerry James jjames at fedoraproject.org
Wed Mar 18 05:30:42 UTC 2009 

Author: jjames

Update of /cvs/pkgs/rpms/eclipse-findbugs/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25208/F-10

Modified Files:
	.cvsignore eclipse-findbugs.spec sources 
Added Files:
	eclipsePlugin-1.3.8-build.patch 
Removed Files:
	eclipsePlugin-1.3.7-build.patch 
Log Message:
* Tue Mar 17 2009 Jerry James <loganjerry at gmail.com> - 1.3.8-1
- Update to 1.3.8


eclipsePlugin-1.3.8-build.patch:

--- NEW FILE eclipsePlugin-1.3.8-build.patch ---
diff -dur eclipsePlugin-1.3.8.20090315.ORIG/build.properties eclipsePlugin-1.3.8.20090315/build.properties
--- eclipsePlugin-1.3.8.20090315.ORIG/build.properties	2009-01-11 16:40:44.000000000 -0700
+++ eclipsePlugin-1.3.8.20090315/build.properties	2009-03-17 23:17:43.000000000 -0600
@@ -4,9 +4,9 @@
                about.html,\
                about.ini,\
                about.properties,\
-               annotations.jar,\
-               bcel.jar,\
-               jsr305.jar,\
+               /usr/share/java/findbugs-annotations.jar,\
+               /usr/share/java/findbugs-bcel.jar,\
+               /usr/share/java/jsr-305.jar,\
                findbugs-plugin.jar,\
                icons/,\
                plugin/,\
@@ -18,13 +18,13 @@
                welcome.xml,\
                .options,\
                META-INF/,\
-               asm-3.1.jar,\
-		               asm-commons-3.1.jar,\
-               asm-tree-3.1.jar,\
-               dom4j-1.6.1.jar,\
-               jaxen-1.1.1.jar,\
-               commons-lang-2.4.jar,\
-               jFormatString.jar,\
+               /usr/share/java/objectweb-asm/asm.jar,\
+               /usr/share/java/objectweb-asm/asm-commons.jar,\
+               /usr/share/java/objectweb-asm/asm-tree.jar,\
+               /usr/share/java/dom4j.jar,\
+               /usr/share/java/jaxen.jar,\
+               /usr/share/java/commons-lang.jar,\
+               /usr/share/java/jFormatString.jar,\
                surelogic.png,\
                umdFindbugs.png
 src.includes = .classpath,\
@@ -36,9 +36,9 @@
 			   about.html,\
 			   about.ini,\
 			   about.properties,\
-			   annotations.jar,\
-			   bcel.jar,\
-			   jsr305.jar,\
+			   /usr/share/java/findbugs-annotations.jar,\
+			   /usr/share/java/findbugs-bcel.jar,\
+			   /usr/share/java/jsr-305.jar,\
 			   findbugs-plugin.jar,\
 			   icons/,\
 			   plugin/,\
@@ -62,13 +62,13 @@
 			   plugin_feature.xml,\
 			   plugin_site.xml,\
 			   umdFindbugs.png,\
-			   asm-3.1.jar,\
-			   asm-commons-3.1.jar,\
-			   asm-tree-3.1.jar,\
-			   dom4j-1.6.1.jar,\
-			   jaxen-1.1.1.jar,\
-			   commons-lang-2.4.jar,\
-			   jFormatString.jar,\
+			   /usr/share/java/objectweb-asm/asm.jar,\
+			   /usr/share/java/objectweb-asm/asm-commons.jar,\
+			   /usr/share/java/objectweb-asm/asm-tree.jar,\
+			   /usr/share/java/dom4j.jar,\
+			   /usr/share/java/jaxen.jar,\
+			   /usr/share/java/commons-lang.jar,\
+			   /usr/share/java/jFormatString.jar,\
 			   surelogic.png
 jars.compile.order = findbugs-plugin.jar
 source.findbugs-plugin.jar = src/,buildtools/
diff -dur eclipsePlugin-1.3.8.20090315.ORIG/build.xml eclipsePlugin-1.3.8.20090315/build.xml
--- eclipsePlugin-1.3.8.20090315.ORIG/build.xml	2009-03-01 17:31:54.000000000 -0700
+++ eclipsePlugin-1.3.8.20090315/build.xml	2009-03-17 23:17:43.000000000 -0600
@@ -55,16 +55,16 @@
     <property name="lib.dir" value="lib"/>
 
     <!-- list of required libraries, copied from FB core project -->
-	<property name="jars.required" value="jsr305.jar,
-		bcel.jar,
-		annotations.jar,
+	<property name="jars.required" value="jsr-305.jar,
+		findbugs-bcel.jar,
+		findbugs-annotations.jar,
 		jFormatString.jar,
-		commons-lang-2.4.jar,
-		asm-3.1.jar,
-		asm-tree-3.1.jar,
-		asm-commons-3.1.jar,
-		dom4j-1.6.1.jar,
-		jaxen-1.1.1.jar" />
+		commons-lang.jar,
+		objectweb-asm/asm.jar,
+		objectweb-asm/asm-tree.jar,
+		objectweb-asm/asm-commons.jar,
+		dom4j.jar,
+		jaxen.jar" />
 
     <!-- list of all libraries, copied from FB core project, plus old libraries not more used -->
 	<property name="jars.cleanup" value="${jars.required},
@@ -72,11 +72,18 @@
 		findbugs-ant.jar" />
 
 	<path id="plugin.classpath">
-		<fileset dir="${lib.dir}" includes="${jars.required}"/>
+		<fileset dir="/usr/share/java" includes="${jars.required}"/>
 		<fileset dir="${eclipsePlugin.dir}">
 			<include name="**/*.jar"/>
 			<exclude name="edu.umd.cs.findbugs.**/*.jar"/>
 		</fileset>
+		<fileset dir="${eclipseJdtPlugin.dir}">
+			<include name="**/*.jar"/>
+		</fileset>
+		<fileset dir="${eclipseSdkPlugin.dir}">
+			<include name="**/*.jar"/>
+		</fileset>
+		<fileset file="@SWT_JAR@"/>
 	</path>
 
 	<!-- Need these jars for ant target 'srcdist', which uses subversion.  Grab them at:
@@ -110,7 +117,7 @@
         </delete>
 	</target>
 
-	<target name="classes" depends="init,fbjars" description="Compile java source files">
+	<target name="classes" depends="init" description="Compile java source files">
 		<echo message="Compiling FindBugs Eclipse plugin"/>
 	    <fail unless="eclipsePlugin.dir"
 	    	message="Please specify path to the Eclipse 3.3+ plugins folder in local.properties file, like: eclipsePlugin.dir=F:\\java\\eclipse33\\plugins"/>
@@ -131,13 +138,13 @@
 		</copy>
 	</target>
 
-	<target name="version" depends="fbjars" description="Extract the plugin id and version">
+	<target name="version" description="Extract the plugin id and version">
 		<echo message="Verifying and creating FindBugs Eclipse plugin version info"/>
 
-		<!-- 1) read FB version from ${bin.dir}/version.properties (copied from core) to ${release.base} -->
+		<!-- 1) read FB version from ${bin.dir}/version.properties (copied from core) to ${release.base}
 	    <loadproperties srcFile="${bin.dir}/version.properties" >
 	      <filterchain><linecontains><contains value="release.base"/></linecontains></filterchain>
-	    </loadproperties>
+	    </loadproperties> -->
 
 		<!-- 2) read plugin base version from META-INF/MANIFEST.MF to ${eclipse.release.base} -->
 		<loadfile srcFile="META-INF/MANIFEST.MF" property="eclipse.release.base">
@@ -178,7 +185,7 @@
 	<target name="dist" depends="clean,classes,version"
 		description="Build a plugin distributable">
 		<echo message="Creating FindBugs Eclipse plugin binary distribution"/>
-		<jar destfile="${dist.dir}/findbugs-plugin.jar" >
+		<jar destfile="${dist.dir}/findbugs-plugin.jar" manifest="${dist.dir}/META-INF/MANIFEST.MF">
 			<fileset dir="${bin.dir}" excludes="de/tobject/findbugs/tools/**" />
 		</jar>
 		<copy todir="${dist.dir}" >
diff -dur eclipsePlugin-1.3.8.20090315.ORIG/META-INF/MANIFEST.MF eclipsePlugin-1.3.8.20090315/META-INF/MANIFEST.MF
--- eclipsePlugin-1.3.8.20090315.ORIG/META-INF/MANIFEST.MF	2009-03-07 22:19:38.000000000 -0700
+++ eclipsePlugin-1.3.8.20090315/META-INF/MANIFEST.MF	2009-03-17 23:17:53.000000000 -0600
@@ -4,16 +4,17 @@
 Bundle-SymbolicName: edu.umd.cs.findbugs.plugin.eclipse; singleton:=true
 Bundle-Version: 1.3.8.qualifier
 Bundle-ClassPath: findbugs-plugin.jar,
- lib/jsr305.jar,
- lib/annotations.jar,
- lib/bcel.jar,
- lib/dom4j-1.6.1.jar,
- lib/jaxen-1.1.1.jar,
- lib/jFormatString.jar,
- lib/asm-tree-3.1.jar,
- lib/asm-3.1.jar,
- lib/asm-commons-3.1.jar,
- lib/commons-lang-2.4.jar
+ jsr-305.jar,
+ findbugs-annotations.jar,
+ findbugs-bcel.jar,
+ findbugs.jar,
+ dom4j.jar,
+ jaxen.jar,
+ jFormatString.jar,
+ asm-tree.jar,
+ asm.jar,
+ asm-commons.jar,
+ commons-lang.jar
 Bundle-Activator: de.tobject.findbugs.FindbugsPlugin
 Bundle-Vendor: FindBugs Project
 Bundle-Localization: plugin


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-findbugs/F-10/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	11 Mar 2009 20:16:12 -0000	1.2
+++ .cvsignore	18 Mar 2009 05:30:12 -0000	1.3
@@ -1 +1 @@
-eclipsePlugin-1.3.7.20081230-source.zip
+eclipsePlugin-1.3.8.20090315-source.zip


Index: eclipse-findbugs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-findbugs/F-10/eclipse-findbugs.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- eclipse-findbugs.spec	11 Mar 2009 22:21:46 -0000	1.2
+++ eclipse-findbugs.spec	18 Mar 2009 05:30:12 -0000	1.3
@@ -1,9 +1,9 @@
 %global eclipse_base %{_libdir}/eclipse
-%global pkg_date     20081230
+%global pkg_date     20090315
 
 Name:           eclipse-findbugs
-Version:        1.3.7
-Release:        4%{?dist}
+Version:        1.3.8
+Release:        1%{?dist}
 Summary:        Eclipse plugin for FindBugs
 
 Group:          Development/Languages
@@ -33,19 +33,19 @@
 %setup -q -n eclipsePlugin-%{version}.%{pkg_date}
 %patch0 -p1
 
-# Set up the eclipse paths
+# Set up the eclipse path
 sed -i -e 's|@SWT_JAR@|%{eclipse_base}/swt.jar|' build.xml
 
 # Make sure we don't use retroweaver
 rm -fr tools
 
 %build
-# If we don't specify plugin.version, it becomes the current date!
 ant -DeclipsePlugin.dir=%{eclipse_base}/plugins \
     -DeclipseJdtPlugin.dir=%{eclipse_base}/dropins/jdt/plugins \
     -DeclipseSdkPlugin.dir=%{eclipse_base}/dropins/sdk/plugins \
-    -Dplugin.version=%{version}.%{pkg_date} \
-  dist
+    -Dplugin.date=%{pkg_date} \
+    -Drelease.base=%{version} \
+    -Dfindbugs.dir=`pwd`
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -69,8 +69,9 @@
 ln -s %{javalink}/objectweb-asm/asm.jar $RPM_BUILD_ROOT%{plugin_dir}
 ln -s %{javalink}/objectweb-asm/asm-commons.jar $RPM_BUILD_ROOT%{plugin_dir}
 
-# Remove one unnecessary file (used at build-time only)
+# Remove unnecessary files (used at build-time only)
 rm -f $RPM_BUILD_ROOT%{plugin_dir}/.options
+rm -fr $RPM_BUILD_ROOT%{plugin_dir}/doc
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -81,6 +82,9 @@
 %{plugin_dir}
 
 %changelog
+* Tue Mar 17 2009 Jerry James <loganjerry at gmail.com> - 1.3.8-1
+- Update to 1.3.8
+
 * Wed Mar 11 2009 Jerry James <loganjerry at gmail.com> - 1.3.7-4
 - Require OpenJDK to compile due to use of Sun-specific classes.
 - Require eclipse-jdt


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/eclipse-findbugs/F-10/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	11 Mar 2009 20:16:12 -0000	1.2
+++ sources	18 Mar 2009 05:30:12 -0000	1.3
@@ -1 +1 @@
-42e28f0fef9ebd6ae1e827ddec05a26a  eclipsePlugin-1.3.7.20081230-source.zip
+0ca464650b02ce4eca331d4a97812200  eclipsePlugin-1.3.8.20090315-source.zip


--- eclipsePlugin-1.3.7-build.patch DELETED ---

More information about the fedora-extras-commits mailing list