Changeset 6295 for trunk

Timestamp:

Apr 28, 2016 12:55:35 PM (8 years ago)

Author:

ldelgass

Message:

merge r6291 from release branch

Location:

trunk

Files:

• . (modified) (1 prop)
• builder/scripts/templates/clang.tl (modified) (1 diff)
• builder/scripts/templates/fortran77.tl (modified) (1 diff)
• builder/scripts/templates/java.tl (modified) (1 diff)
• gui/scripts/gauge.tcl (modified) (2 diffs)

trunk/builder/scripts/templates/clang.tl

@@ -180 +180 @@
         $(CC) $(CFLAGS) $(INCLUDES) $< -o $@ $(LIBS)
 
+install:
+
 clean:
         $(RM) @@FILEROOT@@c run*.xml

trunk/builder/scripts/templates/fortran77.tl

@@ -179 +179 @@
         $(FC) $(FCFLAGS) $(INCLUDES) $< -o $@ $(LIBS)
 
+install:
+
 clean:
         $(RM) @@FILEROOT@@f77 run*.xml

trunk/builder/scripts/templates/java.tl

@@ -126 +126 @@
         $(JAVAC) $(CLASSPATH) $<
 
+install: 
+
 clean:
         $(RM) @@FILEROOT@@.class run*.xml

trunk/gui/scripts/gauge.tcl

@@ -636 +636 @@
     $itk_component(spindn) configure -state $itk_option(-state)
     $itk_component(presets) configure -state $itk_option(-state)
+    if { [info exists itk_component(uq)] } {
+        $itk_component(uq) configure -state $itk_option(-state)
+    }
     _redraw  ;# fix gauge
 }
@@ -756 +759 @@
 
         $popup configure \
-        -deactivatecommand [itcl::code $this _pop_uq_deactivate]
+            -deactivatecommand [itcl::code $this _pop_uq_deactivate]
     }
     update