Codebase list findbugs / b671d2f debian / patches / 0001-FixLibraryDependency-RemoveAppleGUI.patch
b671d2f

Tree @b671d2f (Download .tar.gz)

0001-FixLibraryDependency-RemoveAppleGUI.patch @b671d2fraw · history · blame

Index: findbugs-2.0.3/build.properties
===================================================================
--- findbugs-2.0.3.orig/build.properties	2013-12-17 19:44:08.738200004 +0800
+++ findbugs-2.0.3/build.properties	2013-12-17 19:51:27.826196570 +0800
@@ -8,10 +8,12 @@
                       src/gui/,\
                       etc
 
+sys.jar.dir   =/usr/share/java
+
 # Set this to the directory containing the DocBook Modular XSL Stylesheets
 #  from http://docbook.sourceforge.net/projects/xsl/
 
-xsl.stylesheet.home	=${local.software.home}/docbook-xsl-1.76.1
+xsl.stylesheet.home	=/usr/share/xml/docbook/stylesheet/docbook-xsl
 
 # Set this to the directory containing the svnant Ant jars.  These are
 # needed for the srcdist target and to get the svn revision number
@@ -23,7 +25,7 @@
 # Set this to the directory where Saxon (http://saxon.sourceforge.net/)
 # is installed.
 
-saxon.home		=${local.software.home}/saxon-6.5.5
+saxon.home		=${sys.jar.dir}
 
 # Set this to the directory where FOP (http://xml.apache.org/fop/)
 # is installed.  (Note: this is disabled for now.)
Index: findbugs-2.0.3/build.xml
===================================================================
--- findbugs-2.0.3.orig/build.xml	2013-12-17 19:44:08.738200004 +0800
+++ findbugs-2.0.3/build.xml	2013-12-17 19:51:27.830196570 +0800
@@ -60,24 +60,23 @@
     <property name="version.props.file" value="${build.dir}/classes/edu/umd/cs/findbugs/version.properties"/>
 
     <path id="findbugs.classpath">
-        <pathelement location="${jar.dir}/bcel.jar"/>
-        <pathelement location="${jar.dir}/dom4j-1.6.1.jar"/>
-        <pathelement location="${jar.dir}/AppleJavaExtensions.jar"/>
-        <pathelement location="${jar.dir}/junit.jar"/>
-        <pathelement location="${jar.dir}/asm-3.3.jar"/>
-        <pathelement location="${jar.dir}/asm-commons-3.3.jar"/>
-        <pathelement location="${jar.dir}/asm-tree-3.3.jar"/>
-        <pathelement location="${jar.dir}/jaxen-1.1.6.jar"/>
-        <pathelement location="${jar.dir}/jsr305.jar"/>
-        <pathelement location="${jar.dir}/jFormatString.jar"/>
-        <pathelement location="${jar.dir}/commons-lang-2.6.jar"/>
-        <pathelement location="${jar.dir}/jcip-annotations.jar"/>
+        <pathelement location="${sys.jar.dir}/findbugs-bcel.jar"/>
+        <pathelement location="${sys.jar.dir}/dom4j.jar"/>
+        <pathelement location="${sys.jar.dir}/junit4.jar"/>
+        <pathelement location="${sys.jar.dir}/asm3.jar"/>
+        <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="${sys.jar.dir}/jsr305.jar"/>
+        <pathelement location="${sys.jar.dir}/jFormatString.jar"/>
+        <pathelement location="${sys.jar.dir}/commons-lang.jar"/>
+        <pathelement location="${sys.jar.dir}/jcip.jar"/>
     </path>
 
     <path id="tools.classpath">
         <pathelement location="${classes.dir}"/>
         <pathelement location="${jar.dir}/findbugs.jar"/>
-        <pathelement location="${jar.dir}/jdepend-2.9.jar"/>
+        <pathelement location="${sys.jar.dir}/jdepend.jar"/>
         <path refid="findbugs.classpath"/>
     </path>
 
@@ -124,17 +123,16 @@
     <target name="mondo" depends="jars">
     <jar destfile="build/mondo.jar"
         manifest="etc/MANIFEST-findbugs-mondo.MF">
-        <zipfileset src="${jar.dir}/bcel.jar"/>
-        <zipfileset src="${jar.dir}/dom4j-1.6.1.jar"/>
-        <zipfileset src="${jar.dir}/AppleJavaExtensions.jar"/>
-        <zipfileset src="${jar.dir}/junit.jar"/>
-        <zipfileset src="${jar.dir}/asm-3.3.jar"/>
-        <zipfileset src="${jar.dir}/asm-commons-3.3.jar"/>
-        <zipfileset src="${jar.dir}/asm-tree-3.3.jar"/>
-        <zipfileset src="${jar.dir}/jaxen-1.1.6.jar"/>
-        <zipfileset src="${jar.dir}/jsr305.jar"/>
-        <zipfileset src="${jar.dir}/jFormatString.jar"/>
-        <zipfileset src="${jar.dir}/commons-lang-2.6.jar"/>
+        <zipfileset src="${sys.jar.dir}/findbugs-bcel.jar"/>
+        <zipfileset src="${sys.jar.dir}/dom4j.jar"/>
+        <zipfileset src="${sys.jar.dir}/junit4.jar"/>
+        <zipfileset src="${sys.jar.dir}/asm3.jar"/>
+        <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="${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>
     </target>
@@ -329,8 +327,8 @@
             <fileset dir="${src.dir}">
                 <include name="**/annotations/*.java"/>
             </fileset>
-            <zipfileset src="${jar.dir}/jcip-annotations.jar" excludes="META-INF/**,**/*.html"/>
-            <zipfileset src="${jar.dir}/jsr305.jar" excludes="META-INF/**,**/*.html"/>
+            <zipfileset src="${sys.jar.dir}/jcip.jar" excludes="META-INF/**,**/*.html"/>
+            <zipfileset src="${sys.jar.dir}/jsr305.jar" excludes="META-INF/**,**/*.html"/>
         </jar>
     </target>
 
@@ -362,20 +360,20 @@
                 <include name="messages*.xml"/>
             </fileset>
 
-            <zipfileset src="${jar.dir}/bcel.jar" excludes="META-INF/**"/>
+            <zipfileset src="${sys.jar.dir}/findbugs-bcel.jar" excludes="META-INF/**"/>
 
-            <zipfileset src="${jar.dir}/asm-3.3.jar" excludes="META-INF/**"/>
-            <zipfileset src="${jar.dir}/asm-analysis-3.3.jar" excludes="META-INF/**"/>
-            <zipfileset src="${jar.dir}/asm-commons-3.3.jar" excludes="META-INF/**"/>
-            <zipfileset src="${jar.dir}/asm-tree-3.3.jar" excludes="META-INF/**"/>
-            <zipfileset src="${jar.dir}/asm-util-3.3.jar" excludes="META-INF/**"/>
-            <zipfileset src="${jar.dir}/asm-xml-3.3.jar" excludes="META-INF/**"/>
-
-            <zipfileset src="${jar.dir}/dom4j-1.6.1.jar" excludes="META-INF/**"/>
-            <zipfileset src="${jar.dir}/jaxen-1.1.6.jar" excludes="META-INF/**"/>
-            <zipfileset src="${jar.dir}/jsr305.jar" excludes="META-INF/**"/>
-            <zipfileset src="${jar.dir}/jFormatString.jar" excludes="META-INF/**"/>
-            <zipfileset src="${jar.dir}/commons-lang-2.6.jar" excludes="META-INF/**"/>
+            <zipfileset src="${sys.jar.dir}/asm3.jar" excludes="META-INF/**"/>
+            <zipfileset src="${sys.jar.dir}/asm3-analysis.jar" excludes="META-INF/**"/>
+            <zipfileset src="${sys.jar.dir}/asm3-commons.jar" excludes="META-INF/**"/>
+            <zipfileset src="${sys.jar.dir}/asm3-tree.jar" excludes="META-INF/**"/>
+            <zipfileset src="${sys.jar.dir}/asm3-util.jar" excludes="META-INF/**"/>
+            <zipfileset src="${sys.jar.dir}/asm3-xml.jar" excludes="META-INF/**"/>
+
+            <zipfileset src="${sys.jar.dir}/dom4j.jar" excludes="META-INF/**"/>
+            <zipfileset src="${sys.jar.dir}/jaxen.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>
 
@@ -511,7 +509,7 @@
               projectName="Byte code Engineering Library (BCEL)"
               outputFile="${sampleoutput.dir}/bcel.xml"
             >
-      <class location="${jar.dir}/bcel.jar" />
+      <class location="${sys.jar.dir}/findbugs-bcel.jar" />
     </findbugs>
     <findbugs home="."
               output="xml:withMessages"
@@ -519,7 +517,7 @@
               jvmargs="-ea -Xmx1200m"
               projectName="Byte code Engineering Library (BCEL)"
               outputFile="${sampleoutput.dir}/bcel-cloud-appengine.xml" >
-      <class location="${jar.dir}/bcel.jar" />
+      <class location="${jar.dir}/findbugs-bcel.jar" />
     </findbugs>
 <!--
     <findbugs home="."
@@ -1029,16 +1027,15 @@
     <!-- Generate jnlp jars -->
     <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="${jar.dir}/asm-3.3.jar"/>
-        <copy todir="${jnlp.dir}" file="${jar.dir}/asm-commons-3.3.jar"/>
-        <copy todir="${jnlp.dir}" file="${jar.dir}/asm-tree-3.3.jar"/>
-        <copy todir="${jnlp.dir}" file="${jar.dir}/dom4j-1.6.1.jar"/>
-        <copy todir="${jnlp.dir}" file="${jar.dir}/jaxen-1.1.6.jar"/>
-        <copy todir="${jnlp.dir}" file="${jar.dir}/jFormatString.jar"/>
-        <copy todir="${jnlp.dir}" file="${jar.dir}/commons-lang-2.6.jar"/>
-        <copy todir="${jnlp.dir}" file="${jar.dir}/AppleJavaExtensions.jar"/>
+        <copy todir="${jnlp.dir}" file="${sys.jar.dir}/findbugs-bcel.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="${sys.jar.dir}/jFormatString.jar"/>
+        <copy todir="${jnlp.dir}" file="${sys.jar.dir}/commons-lang.jar"/>
         <copy todir="${jnlp.dir}" file="${docsrc.dir}/buggy-sm.png"/>
         <copy todir="${jnlp.dir}">
             <fileset refid="plugin.jars"/>
@@ -1310,7 +1307,7 @@
 
     <target name="annotationJavadoc">
       <javadoc access="public"
-       classpath="lib/bcel.jar:lib/junit.jar:lib/dom4j-1.6.1.jar:lib/jsr305.jar:lib/AppleJavaExtensions.jar"
+          classpath="${sys.jar.dir}/findbugs-bcel.jar:${sys.jar.dir}/junit4.jar:${sys.jar.dir}/dom4j.jar:${sys.jar.dir}/jsr305.jar"
         destdir="${annotationDoc.dir}"
         packagenames="edu.umd.cs.findbugs.annotations"
         doctitle="FindBugs Annotation Documentation"
Index: findbugs-2.0.3/.classpath
===================================================================
--- findbugs-2.0.3.orig/.classpath	2013-12-17 19:51:22.710196610 +0800
+++ findbugs-2.0.3/.classpath	2013-12-17 20:10:22.934187697 +0800
@@ -15,32 +15,19 @@
 			<accessrule kind="nonaccessible" pattern="com/apple/**"/>
 		</accessrules>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/AppleJavaExtensions.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/bcel.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="http://jakarta.apache.org/bcel/apidocs/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/dom4j-1.6.1.jar">
-		<attributes>
-			<attribute name="javadoc_location" value="http://dom4j.org/apidocs/"/>
-		</attributes>
-	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="lib/junit.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/commons-lang-2.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jcip-annotations.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/yjp-controller-api-redist.jar"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry exported="true" kind="lib" path="lib/jsr305.jar" sourcepath="lib/jsr305.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jaxen-1.1.6.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/jFormatString.jar"/>	
-	<classpathentry exported="true" kind="lib" path="lib/jdepend-2.9.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/asm-3.3.jar" sourcepath="lib/asm-src-3.3.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/asm-commons-3.3.jar" sourcepath="lib/asm-src-3.3.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/asm-tree-3.3.jar" sourcepath="lib/asm-src-3.3.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/ant.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/asm-analysis-3.3.jar" sourcepath="lib/asm-src-3.3.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/asm-util-3.3.jar" sourcepath="lib/asm-src-3.3.zip"/>
-	<classpathentry exported="true" kind="lib" path="lib/asm-xml-3.3.jar" sourcepath="lib/asm-src-3.3.zip"/>
+	<classpathentry kind="lib" path="/usr/share/java/junit4.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/asm3.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/asm3-tree.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/findbugs-bcel.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/dom4j.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/asm3-commons.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/jaxen.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/jsr305.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/jFormatString.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/commons-lang.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/jcip.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/ant.jar"/>
+	<classpathentry kind="lib" path="/usr/share/java/jdepend.jar"/>
 	<classpathentry kind="output" path="classesEclipse"/>
 </classpath>
Index: findbugs-2.0.3/src/gui/edu/umd/cs/findbugs/gui2/OSXAdapter.java
===================================================================
--- findbugs-2.0.3.orig/src/gui/edu/umd/cs/findbugs/gui2/OSXAdapter.java	2010-09-18 15:46:28.000000000 +0800
+++ findbugs-2.0.3/src/gui/edu/umd/cs/findbugs/gui2/OSXAdapter.java	2013-12-17 20:04:48.778190308 +0800
@@ -19,9 +19,6 @@
 
 package edu.umd.cs.findbugs.gui2;
 
-import com.apple.eawt.ApplicationAdapter;
-import com.apple.eawt.ApplicationEvent;
-
 /*
  * Based on sample code from Apple.
  *
@@ -29,91 +26,8 @@
  * This class should only ever be referenced via reflection after
  * checking that we are running on Mac OS X.
  */
-public class OSXAdapter extends ApplicationAdapter {
-
-    // pseudo-singleton model; no point in making multiple instances
-    // of the EAWT application or our adapter
-    private static OSXAdapter theAdapter = new OSXAdapter();
-
-    private static final com.apple.eawt.Application theApplication = new com.apple.eawt.Application();
-
-    // reference to the app where the existing quit, about, prefs code is
-    private static MainFrame mainApp;
-
-    private OSXAdapter() {
-    }
-
-    // implemented handler methods. These are basically hooks into
-    // existing functionality from the main app, as if it came
-    // over from another platform.
-
-    @Override
-    public void handleAbout(ApplicationEvent ae) {
-        if (mainApp != null) {
-            ae.setHandled(true);
-            // We need to invoke modal About Dialog asynchronously
-            // otherwise the Application queue is locked for the duration
-            // of the about Dialog, which results in a deadlock if a URL is
-            // selected, and we get a ReOpenApplication event when user
-            // switches back to Findbugs.
-            javax.swing.SwingUtilities.invokeLater(new Runnable() {
-                public void run() {
-                    mainApp.about();
-                }
-            });
-        } else {
-            throw new IllegalStateException("handleAbout: " + "MyApp instance detached from listener");
-        }
-    }
-
-    @Override
-    public void handlePreferences(ApplicationEvent ae) {
-        if (mainApp != null) {
-            mainApp.preferences();
-            ae.setHandled(true);
-        } else {
-            throw new IllegalStateException("handlePreferences: MyApp instance " + "detached from listener");
-        }
-    }
-
-    @Override
-    public void handleQuit(ApplicationEvent ae) {
-        if (mainApp != null) {
-
-            /*
-             * You MUST setHandled(false) if you want to delay or cancel the
-             * quit. This is important for cross-platform development -- have a
-             * universal quit routine that chooses whether or not to quit, so
-             * the functionality is identical on all platforms. This example
-             * simply cancels the AppleEvent-based quit and defers to that
-             * universal method.
-             */
-
-            ae.setHandled(false);
-            mainApp.callOnClose();
-        } else {
-            throw new IllegalStateException("handleQuit: MyApp instance detached " + "from listener");
-        }
-    }
-
-    // The main entry-point for this functionality. This is the only method
-    // that needs to be called at runtime, and it can easily be done using
-    // reflection (see MyApp.java)
-    public static void registerMacOSXApplication(MainFrame inApp) {
-        if (mainApp != null)
-            throw new IllegalStateException("application already set");
-
-        mainApp = inApp;
-
-        theApplication.addApplicationListener(theAdapter);
-
-        theApplication.addPreferencesMenuItem();
-    }
-
-    // Another static entry point for EAWT functionality. Enables the
-    // "Preferences..." menu item in the application menu.
-    public static void enablePrefs(boolean enabled) {
-
-        theApplication.setEnabledPreferencesMenu(enabled);
+public class OSXAdapter {
+    public OSXAdapter() throws Exception {
+        throw new Exception("No support for apple in debian.");
     }
 }