Package list findbugs / f8e9cf1
take in account the bcel mess in the repack script Sylvestre Ledru 8 years ago
2 changed file(s) with 22 addition(s) and 34 deletion(s). Raw diff Collapse all Expand all
66 # clean up the upstream tarball
77 unzip -x $3
88 cd $DIR
9 #Remove shipped jar + doc without sources
910 rm -rf lib/ src/doc/pressRelease.pdf doc/pressRelease.pdf build-lib/
11 mkdir build/
12 # Upstream is using a patched version of bcel ...
13 # https://sourceforge.net/p/findbugs/support-requests/24/
14 patch -p1 < ../debian/patches/bcel-package.diff
15 ant patchbcel
16 rm build/bcel-5.2-src.zip
17 patch -R -p1 < ../debian/patches/bcel-package.diff
1018 cd ..
1119 tar jcvf ../$TAR $DIR
1220 rm -rf $DIR $3
0 Index: findbugs/build.xml
0 Index: findbugs-2.0.2/build.xml
11 ===================================================================
2 --- findbugs.orig/build.xml 2013-08-29 15:48:36.000000000 +0200
3 +++ findbugs/build.xml 2013-08-29 17:02:00.000000000 +0200
4 @@ -59,7 +59,7 @@
5 <property name="version.props.file" value="${build.dir}/classes/edu/umd/cs/findbugs/version.properties"/>
6
7 <path id="findbugs.classpath">
8 - <pathelement location="${jar.dir}/bcel.jar"/>
9 + <pathelement location="${sys.jar.dir}/bcel.jar"/>
10 <pathelement location="${sys.jar.dir}/dom4j.jar"/>
11 <!-- <pathelement location="${jar.dir}/AppleJavaExtensions.jar"/> -->
12 <pathelement location="${sys.jar.dir}/junit4.jar"/>
2 --- findbugs-2.0.2.orig/build.xml 2013-08-29 17:52:51.000000000 +0200
3 +++ findbugs-2.0.2/build.xml 2013-08-29 17:54:27.000000000 +0200
134 @@ -67,8 +67,9 @@
145 <pathelement location="${sys.jar.dir}/asm3-commons.jar"/>
156 <pathelement location="${sys.jar.dir}/asm3-tree.jar"/>
2213 <pathelement location="${sys.jar.dir}/commons-lang.jar"/>
2314 <pathelement location="${sys.jar.dir}/jcip.jar"/>
2415 </path>
25 @@ -125,7 +126,7 @@
26 <target name="mondo" depends="jars">
27 <jar destfile="build/mondo.jar"
28 manifest="etc/MANIFEST-findbugs-mondo.MF">
29 - <zipfileset src="${jar.dir}/bcel.jar"/>
30 + <zipfileset src="${sys.jar.dir}/bcel.jar"/>
31 <zipfileset src="${sys.jar.dir}/dom4j.jar"/>
32 <!-- <zipfileset src="${jar.dir}/AppleJavaExtensions.jar"/> -->
33 <zipfileset src="${sys.jar.dir}/junit4.jar"/>
3416 @@ -133,8 +134,8 @@
3517 <zipfileset src="${sys.jar.dir}/asm3-commons.jar"/>
3618 <zipfileset src="${sys.jar.dir}/asm3-tree.jar"/>
4224 <zipfileset src="${sys.jar.dir}/commons-lang.jar"/>
4325 <zipfileset src="${jar.dir}/findbugs.jar"/>
4426 </jar>
45 @@ -346,7 +347,7 @@
46 <include name="messages*.xml"/>
47 </fileset>
48
49 - <zipfileset src="${jar.dir}/bcel.jar" excludes="META-INF/**"/>
50 + <zipfileset src="${sys.jar.dir}/bcel.jar" excludes="META-INF/**"/>
51
52 <zipfileset src="${sys.jar.dir}/asm3.jar" excludes="META-INF/**"/>
53 <zipfileset src="${sys.jar.dir}/asm3-analysis.jar" excludes="META-INF/**"/>
5427 @@ -357,8 +358,8 @@
5528
5629 <zipfileset src="${sys.jar.dir}/dom4j.jar" excludes="META-INF/**"/>
6235 <zipfileset src="${sys.jar.dir}/commons-lang.jar" excludes="META-INF/**"/>
6336 </jar>
6437 </target>
65 @@ -994,14 +995,14 @@
66 <!-- Generate jnlp jars -->
38 @@ -512,7 +513,7 @@
39 jvmargs="-ea -Xmx1200m"
40 projectName="Byte code Engineering Library (BCEL)"
41 outputFile="${sampleoutput.dir}/bcel-cloud.xml" >
42 - <class location="${sys.jar.dir}/bcel.jar" />
43 + <class location="${jar.dir}/bcel.jar" />
44 </findbugs>
45 -->
46
47 @@ -995,13 +996,13 @@
6748 <target name="jnlp" depends="jars">
6849 <copy todir="${jnlp.dir}" file="${engine.jar}"/>
69 - <copy todir="${jnlp.dir}" file="${jar.dir}/bcel.jar"/>
50 <copy todir="${jnlp.dir}" file="${jar.dir}/bcel.jar"/>
7051 - <copy todir="${jnlp.dir}" file="${jar.dir}/jsr305.jar"/>
71 + <copy todir="${jnlp.dir}" file="${sys.jar.dir}/bcel.jar"/>
7252 + <copy todir="${jnlp.dir}" file="${sys.jar.dir}/jsr305.jar"/>
7353 <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3.jar"/>
7454 <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3-commons.jar"/>