Changeset 18635

Timestamp:

10/14/14 14:05:32 (10 years ago)

Author:

Mathieu Morlighem

Message:

CHG: trying to fix windows

Location:

issm/trunk-jpl/jenkins

Files:

• jenkins.sh (modified) (1 diff)
• windows (modified) (2 diffs)

issm/trunk-jpl/jenkins/jenkins.sh

@@ -197 +197 @@
 #wait until matlab closes
 if [ "$OS" = "win7" ]; then
+        echo "HERE"
+        ps aux -W | grep MATLAB
         pid=$(ps aux -W | grep MATLAB | awk '{printf("%s\n",MATLAB);}')
 

issm/trunk-jpl/jenkins/windows

@@ -44 +44 @@
 
 #List of external pakages to be installed and their installation scripts
-EXTERNALPACKAGES="cccl      install-win7.sh
-                                                cmake     install.sh                
-                                                petsc     install-3.1-win7.sh
-                                                triangle  install-win7.sh        
-                                                matlab install.sh
+EXTERNALPACKAGES="cccl        install-win7.sh
+                                                cmake       install.sh                
+                                                petsc       install-3.1-win7.sh
+                                                triangle    install-win7.sh        
+                                                matlab      install.sh
                                                 shell2junit install.sh"
 
@@ -58 +58 @@
 # - "yes" compile ISSM
 # - "no"  do not compile ISSM
-ISSM_COMPILATION="yes"
+ISSM_COMPILATION="no"
 
 #------------------------#