Changeset 3275

Timestamp:

Feb 4, 2013, 11:07:13 AM (12 years ago)

Author:

gah

Message:

fix java search, fix error message for logger

Location:

trunk

Files:

• cf/rpLangJava.m4 (modified) (1 diff)
• gui/scripts/tool.tcl (modified) (2 diffs)

trunk/cf/rpLangJava.m4

@@ -30 +30 @@
    ${JAVA_HOME} \
    /apps/java/jdk1.6* \
-   /usr/lib/jvm/java-6-openjdk \
-   /usr/lib/jvm/icedtea-6 \
-   /usr/lib/jvm/*sun-1.6* \
    /opt/sun-jdk-1.6* \
-   /usr/lib/jvm/icedtea-7 \
    /opt/icedtea6-* \
    /opt/sun-jdk-1.5* \
-   /usr/lib/jvm/*sun-1.5* 
+   /usr/lib/jvm/*sun* \
+   /usr/lib/jvm/*icedtea* \
+   /usr/lib/jvm/*openjdk*
   do
     if test -r "${d}/include/jni.h" ; then

trunk/gui/scripts/tool.tcl

@@ -202 +202 @@
         } else {
             set status [catch {
+                set ::Rappture::Tool::job(control) ""
                 eval blt::bgexec \
                     ::Rappture::Tool::job(control) \
@@ -214 +215 @@
             if { $status != 0 } {
                 # We're here because the exec-ed program failed 
+                set logmesg $result
                 if { $::Rappture::Tool::job(control) != "" } {
                     foreach { token pid code mesg } \