Changeset 2316 for palm

Timestamp:

Jul 20, 2017 7:53:42 AM (7 years ago)

Author:

maronga

Message:

new mrungui version based on python

Location:

palm/trunk

Files:

• SCRIPTS/mbuild (modified) (2 diffs)
• SCRIPTS/mrungui (modified) (2 diffs)
• SCRIPTS/mrungui.py (added)
• SCRIPTS/mrungui_files (added)
• SCRIPTS/mrungui_files/about.ui (added)
• SCRIPTS/mrungui_files/help.ui (added)
• SCRIPTS/mrungui_files/mainwindow.ui (added)
• UTIL/mrungui (deleted)

palm/trunk/SCRIPTS/mbuild

@@ -27 +27 @@
 # -----------------
 # $Id$
+# Removed qmake block as mrungui now runs as a python script
+# 
+# 2257 2017-06-07 14:07:05Z witha
 # adjustments for lceddy, removed lcflow-specific code
 # 
@@ -1456 +1459 @@
           eval init_cmds=$init_cmds
           make  $make_options  BLOCK=$block  F90=$compiler_name  F90_SER=$compiler_name_ser  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$loader_options"
-
-             # CHECK IF QMAKE IS AVAILABLE AND COMPILE MRUNGUI
-          if [[ $util_compiled_localhost == false ]]
-          then
-             printf "\n\n"
-             echo "  *** compiling the mrun GUI"
-             if which qmake >/dev/null; then
-                cd mrungui
-                touch *
-                qmake
-                make
-                make clean
-                rm Makefile
-                cd ..
-             else
-                echo "  +++ no qmake found. The (optional) GUI will not be compiled."
-             fi
-          else
-             cd $check_depository_path
-             printf "\n\n"
-             echo "  *** skipped compilation of mrun GUI."            
-          fi
-
        fi
     fi

palm/trunk/SCRIPTS/mrungui

@@ -25 +25 @@
 # -----------------
 # $Id$
+# Modified for python version of mrungui
+# 
+# 1842 2016-04-07 19:24:16Z raasch
 #
 # 1841 2016-04-07 19:14:06Z raasch
@@ -40 +43 @@
 #------------------------------------------------------------------------------#
 
-if which mrungui.x >/dev/null; then
-   mrungui.x
+if which mrungui.py >/dev/null; then
+   mrungui.py > /dev/null 2>&1
 else
    echo "  +++ mrungui not found."