Changeset View
Changeset View
Standalone View
Standalone View
head/devel/java-findbugs/files/patch-findbugs2
| --- bin/findbugs2.orig 2010-12-26 13:57:04.000000000 -0800 | --- bin/findbugs2.orig 2009-08-21 20:39:53 UTC | ||||
| +++ bin/findbugs2 2010-12-26 14:00:48.000000000 -0800 | +++ bin/findbugs2 | ||||
| @@ -27,27 +27,11 @@ | @@ -27,27 +27,11 @@ done | ||||
| dir=`dirname "$program"` | dir=`dirname "$program"` | ||||
| findbugs_home="$dir/.." | findbugs_home="$dir/.." | ||||
| -# Handle FHS-compliant installations (e.g., Fink) | -# Handle FHS-compliant installations (e.g., Fink) | ||||
| -if [ -d "$findbugs_home/share/findbugs" ]; then | -if [ -d "$findbugs_home/share/findbugs" ]; then | ||||
| - findbugs_home="$findbugs_home/share/findbugs" | - findbugs_home="$findbugs_home/share/findbugs" | ||||
| -fi | -fi | ||||
| - | - | ||||
| Show All 11 Lines | |||||
| -# Handle MKS, courtesy of Kelly O'Hair | -# Handle MKS, courtesy of Kelly O'Hair | ||||
| -if [ "${fb_osname}" = "Windows_NT" ]; then | -if [ "${fb_osname}" = "Windows_NT" ]; then | ||||
| - fb_pathsep=';' | - fb_pathsep=';' | ||||
| -fi | -fi | ||||
| - | - | ||||
| if [ ! -d "$findbugs_home" ]; then | if [ ! -d "$findbugs_home" ]; then | ||||
| echo "The path $findbugs_home," | echo "The path $findbugs_home," | ||||
| echo "which is where I think FindBugs is located," | echo "which is where I think FindBugs is located," | ||||
| @@ -56,14 +40,7 @@ | @@ -56,14 +40,7 @@ if [ ! -d "$findbugs_home" ]; then | ||||
| fi | fi | ||||
| # Choose default java binary | # Choose default java binary | ||||
| -fb_javacmd=java | -fb_javacmd=java | ||||
| -if [ ! -z "$JAVA_HOME" ] && [ -x "$JAVA_HOME/bin/java" ]; then | -if [ ! -z "$JAVA_HOME" ] && [ -x "$JAVA_HOME/bin/java" ]; then | ||||
| - if [ `expr "$fb_osname" : CYGWIN` -ne 0 ]; then | - if [ `expr "$fb_osname" : CYGWIN` -ne 0 ]; then | ||||
| - fb_javacmd=`cygpath --mixed "$JAVA_HOME"`/bin/java | - fb_javacmd=`cygpath --mixed "$JAVA_HOME"`/bin/java | ||||
| - else | - else | ||||
| - fb_javacmd="$JAVA_HOME/bin/java" | - fb_javacmd="$JAVA_HOME/bin/java" | ||||
| - fi | - fi | ||||
| -fi | -fi | ||||
| +fb_javacmd="%%LOCALBASE%%/bin/java" | +fb_javacmd="%%LOCALBASE%%/bin/java" | ||||
| # Default UI is GUI2 | # Default UI is GUI2 | ||||
| fb_launchui="2" | fb_launchui="2" | ||||
| @@ -133,7 +110,7 @@ | @@ -133,7 +110,7 @@ while [ $# -gt 0 ] && [ "$finishedArgs" = "false" ]; d | ||||
| jvm_user_props="-D$1 $jvm_user_props" | jvm_user_props="-D$1 $jvm_user_props" | ||||
| shift | shift | ||||
| ;; | ;; | ||||
| - | - | ||||
| + | + | ||||
| -D*=*) | -D*=*) | ||||
| jvm_user_props="$1 $user_props" | jvm_user_props="$1 $user_props" | ||||
| shift | shift | ||||
| @@ -158,17 +135,9 @@ | @@ -158,18 +135,10 @@ while [ $# -gt 0 ] && [ "$finishedArgs" = "false" ]; d | ||||
| done | done | ||||
| -# Extra JVM args for MacOSX. | -# Extra JVM args for MacOSX. | ||||
| -if [ $fb_osname = "Darwin" ]; then | -if [ $fb_osname = "Darwin" ]; then | ||||
| - fb_jvmargs="$fb_jvmargs \ | - fb_jvmargs="$fb_jvmargs \ | ||||
| - -Xdock:name=FindBugs -Xdock:icon=${findbugs_home}/lib/buggy.icns \ | - -Xdock:name=FindBugs -Xdock:icon=${findbugs_home}/lib/buggy.icns \ | ||||
| - -Dapple.laf.useScreenMenuBar=true" | - -Dapple.laf.useScreenMenuBar=true" | ||||
| -fi | -fi | ||||
| - | - | ||||
| # | # | ||||
| # Launch JVM | # Launch JVM | ||||
| # | # | ||||
| -exec "$fb_javacmd" \ | exec "$fb_javacmd" \ | ||||
| - -classpath "$fb_appjar$fb_pathsep$CLASSPATH" \ | - -classpath "$fb_appjar$fb_pathsep$CLASSPATH" \ | ||||
| +JAVA_VERSION="1.6+" exec "$fb_javacmd" \ | |||||
| -Dfindbugs.home="$findbugs_home" \ | -Dfindbugs.home="$findbugs_home" \ | ||||
| $jvm_debug $jvm_maxheap $jvm_ea $jvm_conservespace $jvm_user_props \ | $jvm_debug $jvm_maxheap $jvm_ea $jvm_conservespace $jvm_user_props \ | ||||
| -Dfindbugs.launchUI=$fb_launchui \ | -Dfindbugs.launchUI=$fb_launchui \ | ||||