Changeset 3312 for palm/trunk/SCRIPTS/palmbuild

Timestamp:

Oct 6, 2018 2:15:46 PM (6 years ago)

Author:

knoop

Message:

Added proper exit code to PALM and fixed exit code handling by palmbuild and palmrun

File:

• palm/trunk/SCRIPTS/palmbuild (modified) (4 diffs)

palm/trunk/SCRIPTS/palmbuild

@@ -100 +100 @@
 
 
-
-    # ERROR HANDLING
-    # IN CASE OF EXIT:
+    # ERROR HANDLING IN CASE OF EXIT
  trap 'rm -rf  ${source_path}/${configuration_identifier}_last_make_protocol
-       if [[ $locat != normal ]]
-       then
-          printf "\n\n +++ palmbuild killed \n\n"
+       if [[ $locat != normal  &&  $locat != control_c ]]
+       then
+          printf "\n\n+++ palmbuild crashed \n\n"
           exit 1
+       elif [[ $locat != normal ]]
+       then
+          printf "\n+++ palmbuild killed by \"^C\" \n\n"
+          exit 2
        else
           if [[ $silent = false ]]
           then
-             printf "\n\n *** palmbuild finished \n\n"
+            printf "\n --> palmbuild finished\n\n"
           fi
           exit 0
-       fi
-      ' exit
-
-
-    # IN CASE OF TERMINAL-BREAK:
- trap 'printf "\n\n +++ palmbuild killed by \"^C\" \n\n"
-       rm  ${source_path}/${configuration_identifier}_last_make_protocol
-       exit
+       fi' exit
+
+
+    # ACTIONS IN CASE OF TERMINAL-BREAK (CONTROL-C):
+ trap 'locat=control_c
+       exit 1
       ' 2
 
@@ -776 +776 @@
           echo "  *** creating utilities on local host"
        fi
-       make  -f Makefile_utilities  $make_options  F90=$compiler_name  F90_SER=$compiler_name_ser  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$linker_options"
-       mv agent_preprocessing $source_path/../SCRIPTS/.
+       make  -f Makefile_utilities  $make_options  F90=$compiler_name  F90_SER=$compiler_name_ser  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$linker_options" | tee ${configuration_identifier}_last_make_protocol
+
+       if [[ ${PIPESTATUS[0]} != 0 ]]
+       then
+          printf "\a\n  +++ error(s) occurred during compiling of the utilities for host configuration \"$configuration_identifier\" "
+          if [[ $silent = false ]]
+          then
+             answer=dummy
+             printf "\n"
+             while [[ "$answer" != c  &&  "$answer" != k ]]
+             do
+                printf "  >>> continue / list errors / kill palmbuild (c/l/k) ? "
+                read  answer
+                if [[ "$answer" = l ]]
+                then
+                   more ${configuration_identifier}_last_make_protocol
+                fi
+             done
+             if [[ $answer = k ]]
+             then
+                locat=user_abort; exit
+             fi
+          else
+             # ABORT ANYWAY
+             locat=user_abort; exit
+          fi
+       else
+          cp agent_preprocessing $source_path/../SCRIPTS/.
+       fi
 
 
@@ -789 +816 @@
        make  $make_options  PROG=$program_name  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$linker_options"  2>&1 | tee ${configuration_identifier}_last_make_protocol
 
-       if [[ $? != 0 ]]
+       if [[ ${PIPESTATUS[0]} != 0 ]]
        then
           printf "\a\n  +++ error(s) occurred during compiling or linking for host configuration \"$configuration_identifier\" "
@@ -885 +912 @@
           make  $make_options  PROG=$program_name  F90=$compiler_name  COPT="$cpp_options"  F90FLAGS="$compiler_options"  LDFLAGS="$linker_options"
 
-          if [[ $? != 0 ]]
+          if [[ ${PIPESTATUS[0]} != 0 ]]
           then