Changeset 26094

Timestamp:

03/14/21 19:20:24 (4 years ago)

Author:

jdquinn

Message:

CHG: Fix for bad control; clean up

Location:

issm/trunk-jpl

Files:

• externalpackages/petsc/install-3.14-win-msys2-mingw-msmpi.sh (modified) (1 diff)
• jenkins/jenkins.sh (modified) (1 diff)

issm/trunk-jpl/externalpackages/petsc/install-3.14-win-msys2-mingw-msmpi.sh ¶

@@ -83 +83 @@
 make
 make install
-
-# # NOTE:
-# # - Hack to recover from failed installation (appears to happen only on Windows 
-# #     when reproducing symbolic links in destination directory) rather than 
-# #     trying to patch src/config/install.py
-# #
-# if [ $? -ne 0 ]; then
-#       make install
-# fi

issm/trunk-jpl/jenkins/jenkins.sh ¶

@@ -369 +369 @@
                 done
                 echo "DONE!"
-        elif [[ "${OS}" == MINGW* ]]; then
+        elif [[ ${MINGW} -eq 1 ]]; then
                 # NOTE: The PID query used here may work as well on Cygwin. If so, combine the two conditional blocks.
                 sleep 5;