Codebase list findbugs / f8e9cf1 debian / patches / use-system-jar.patch
f8e9cf1

Tree @f8e9cf1 (Download .tar.gz)

use-system-jar.patch @f8e9cf1raw · history · blame

Index: findbugs-2.0.2/build.xml
===================================================================
--- findbugs-2.0.2.orig/build.xml	2013-08-29 17:52:51.000000000 +0200
+++ findbugs-2.0.2/build.xml	2013-08-29 17:54:27.000000000 +0200
@@ -67,8 +67,9 @@
         <pathelement location="${sys.jar.dir}/asm3-commons.jar"/>
         <pathelement location="${sys.jar.dir}/asm3-tree.jar"/>
         <pathelement location="${sys.jar.dir}/jaxen.jar"/>
-        <pathelement location="${jar.dir}/jsr305.jar"/>
-        <pathelement location="${jar.dir}/jFormatString.jar"/>
+        <pathelement location="${sys.jar.dir}/jsr305.jar"/>
+        <!-- need the package -->
+        <pathelement location="${sys.jar.dir}/jFormatString.jar"/>
         <pathelement location="${sys.jar.dir}/commons-lang.jar"/>
         <pathelement location="${sys.jar.dir}/jcip.jar"/>
     </path>
@@ -133,8 +134,8 @@
         <zipfileset src="${sys.jar.dir}/asm3-commons.jar"/>
         <zipfileset src="${sys.jar.dir}/asm3-tree.jar"/>
         <zipfileset src="${sys.jar.dir}/jaxen.jar"/>
-        <zipfileset src="${jar.dir}/jsr305.jar"/>
-        <zipfileset src="${jar.dir}/jFormatString.jar"/>
+        <zipfileset src="${sys.jar.dir}/jsr305.jar"/>
+        <zipfileset src="${sys.jar.dir}/jFormatString.jar"/>
         <zipfileset src="${sys.jar.dir}/commons-lang.jar"/>
         <zipfileset src="${jar.dir}/findbugs.jar"/>
     </jar>
@@ -357,8 +358,8 @@
 
             <zipfileset src="${sys.jar.dir}/dom4j.jar" excludes="META-INF/**"/>
             <zipfileset src="${sys.jar.dir}/jaxen.jar" excludes="META-INF/**"/>
-            <zipfileset src="${jar.dir}/jsr305.jar" excludes="META-INF/**"/>
-            <zipfileset src="${jar.dir}/jFormatString.jar" excludes="META-INF/**"/>
+            <zipfileset src="${sys.jar.dir}/jsr305.jar" excludes="META-INF/**"/>
+            <zipfileset src="${sys.jar.dir}/jFormatString.jar" excludes="META-INF/**"/>
             <zipfileset src="${sys.jar.dir}/commons-lang.jar" excludes="META-INF/**"/>
         </jar>
     </target>
@@ -512,7 +513,7 @@
               jvmargs="-ea -Xmx1200m"
               projectName="Byte code Engineering Library (BCEL)"
               outputFile="${sampleoutput.dir}/bcel-cloud.xml" >
-      <class location="${sys.jar.dir}/bcel.jar" />
+      <class location="${jar.dir}/bcel.jar" />
     </findbugs>
 -->
 
@@ -995,13 +996,13 @@
     <target name="jnlp" depends="jars">
         <copy todir="${jnlp.dir}" file="${engine.jar}"/>
         <copy todir="${jnlp.dir}" file="${jar.dir}/bcel.jar"/>
-        <copy todir="${jnlp.dir}" file="${jar.dir}/jsr305.jar"/>
+        <copy todir="${jnlp.dir}" file="${sys.jar.dir}/jsr305.jar"/>
         <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3.jar"/>
         <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3-commons.jar"/>
         <copy todir="${jnlp.dir}" file="${sys.jar.dir}/asm3-tree.jar"/>
         <copy todir="${jnlp.dir}" file="${sys.jar.dir}/dom4j.jar"/>
         <copy todir="${jnlp.dir}" file="${sys.jar.dir}/jaxen.jar"/>
-        <copy todir="${jnlp.dir}" file="${jar.dir}/jFormatString.jar"/>
+        <copy todir="${jnlp.dir}" file="${sys.jar.dir}/jFormatString.jar"/>
         <copy todir="${jnlp.dir}" file="${sys.jar.dir}/commons-lang.jar"/>
         <!-- <copy todir="${jnlp.dir}" file="${jar.dir}/AppleJavaExtensions.jar"/> -->
         <copy todir="${jnlp.dir}" file="${docsrc.dir}/buggy-sm.png"/>