Changeset 1933

Timestamp:

Oct 26, 2010, 7:51:50 AM (14 years ago)

Author:

gah

Message:

 

Location:

branches/blt4

Files:

• examples/app-fermi/wrapper/cee/fermi.c (modified) (2 diffs)
• gui/scripts/bugreport.tcl (modified) (1 diff)
• packages/vizservers/nanovis/Makefile.in (modified) (1 diff)

branches/blt4/examples/app-fermi/wrapper/cee/fermi.c

@@ -73 +73 @@
     err = system("octave --silent fermi.m < indeck");
 
-    if (err == 1) {
+    if (err != 0) {
         fprintf(stderr,"%s: calling octave science program failed",prog);
         exit(err);
@@ -96 +96 @@
     fp = fopen("out.dat","r");
     if (fp == NULL) {
-        fprintf(stderr,"%s: Error while writing to out.dat",prog);
+        fprintf(stderr,"%s: Error while writing to out.dat", prog);
         exit(1);
     }

branches/blt4/gui/scripts/bugreport.tcl

@@ -432 +432 @@
         type $settings(type) \
     ]
-    
     set url [Rappture::Tool::resources -huburl]
+    if { $url == "" } {
+        set url "http://hubzero.org"
+    }
     if {[string index $url end] == "/"} {
         append url "index.php"

branches/blt4/packages/vizservers/nanovis/Makefile.in

@@ -38 +38 @@
 # might also need -lavutil
 GL_INC_SPEC     = -I/usr/include/GL
-GL_LIB_SPEC     = -lGL -lglut -lGLEW
+GL_LIB_SPEC     = -lGL -lglut -lGLEW -lGLU
 IMG_DIR         = ./imgLoaders
 IMG_INC_SPEC    = -I$(srcdir)/$(IMG_DIR)