Lines 1-6
Link Here
|
1 |
--- bin/findbugs2.orig 2010-12-26 13:57:04.000000000 -0800 |
1 |
--- bin/findbugs2.orig 2009-08-21 20:39:53 UTC |
2 |
+++ bin/findbugs2 2010-12-26 14:00:48.000000000 -0800 |
2 |
+++ bin/findbugs2 |
3 |
@@ -27,27 +27,11 @@ |
3 |
@@ -27,27 +27,11 @@ done |
4 |
dir=`dirname "$program"` |
4 |
dir=`dirname "$program"` |
5 |
findbugs_home="$dir/.." |
5 |
findbugs_home="$dir/.." |
6 |
|
6 |
|
Lines 28-34
Link Here
|
28 |
if [ ! -d "$findbugs_home" ]; then |
28 |
if [ ! -d "$findbugs_home" ]; then |
29 |
echo "The path $findbugs_home," |
29 |
echo "The path $findbugs_home," |
30 |
echo "which is where I think FindBugs is located," |
30 |
echo "which is where I think FindBugs is located," |
31 |
@@ -56,14 +40,7 @@ |
31 |
@@ -56,14 +40,7 @@ if [ ! -d "$findbugs_home" ]; then |
32 |
fi |
32 |
fi |
33 |
|
33 |
|
34 |
# Choose default java binary |
34 |
# Choose default java binary |
Lines 44-50
Link Here
|
44 |
|
44 |
|
45 |
# Default UI is GUI2 |
45 |
# Default UI is GUI2 |
46 |
fb_launchui="2" |
46 |
fb_launchui="2" |
47 |
@@ -133,7 +110,7 @@ |
47 |
@@ -133,7 +110,7 @@ while [ $# -gt 0 ] && [ "$finishedArgs" = "false" ]; d |
48 |
jvm_user_props="-D$1 $jvm_user_props" |
48 |
jvm_user_props="-D$1 $jvm_user_props" |
49 |
shift |
49 |
shift |
50 |
;; |
50 |
;; |
Lines 53-59
Link Here
|
53 |
-D*=*) |
53 |
-D*=*) |
54 |
jvm_user_props="$1 $user_props" |
54 |
jvm_user_props="$1 $user_props" |
55 |
shift |
55 |
shift |
56 |
@@ -158,17 +135,9 @@ |
56 |
@@ -158,18 +135,10 @@ while [ $# -gt 0 ] && [ "$finishedArgs" = "false" ]; d |
57 |
|
57 |
|
58 |
done |
58 |
done |
59 |
|
59 |
|
Lines 67-75
Link Here
|
67 |
# |
67 |
# |
68 |
# Launch JVM |
68 |
# Launch JVM |
69 |
# |
69 |
# |
70 |
-exec "$fb_javacmd" \ |
70 |
exec "$fb_javacmd" \ |
71 |
- -classpath "$fb_appjar$fb_pathsep$CLASSPATH" \ |
71 |
- -classpath "$fb_appjar$fb_pathsep$CLASSPATH" \ |
72 |
+JAVA_VERSION="1.6+" exec "$fb_javacmd" \ |
|
|
73 |
-Dfindbugs.home="$findbugs_home" \ |
72 |
-Dfindbugs.home="$findbugs_home" \ |
74 |
$jvm_debug $jvm_maxheap $jvm_ea $jvm_conservespace $jvm_user_props \ |
73 |
$jvm_debug $jvm_maxheap $jvm_ea $jvm_conservespace $jvm_user_props \ |
75 |
-Dfindbugs.launchUI=$fb_launchui \ |
74 |
-Dfindbugs.launchUI=$fb_launchui \ |