Changeset 25900

Timestamp:

12/19/20 13:52:30 (4 years ago)

Author:

jdquinn

Message:

CHG: Missing clean up and directory creation

Location:

issm/trunk-jpl/packagers

Files:

• linux/complete-issm-linux-binaries-matlab.sh (modified) (1 diff)
• linux/complete-issm-linux-binaries-python.sh (modified) (1 diff)
• linux/package-issm-linux-binaries-matlab.sh (modified) (3 diffs)
• linux/package-issm-linux-binaries-python.sh (modified) (3 diffs)
• mac/complete-issm-mac-binaries-matlab.sh (modified) (1 diff)
• mac/complete-issm-mac-binaries-python.sh (modified) (1 diff)
• mac/package-issm-mac-binaries-matlab.sh (modified) (1 diff)
• mac/package-issm-mac-binaries-python.sh (modified) (2 diffs)

issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-matlab.sh ¶

@@ -69 +69 @@
 if [ ${build} -eq 1 ]; then
         ./jenkins/jenkins.sh ./jenkins/ross-debian_linux-binaries-matlab
+
+        if [ $? -ne 0 ]; then
+                echo 'Build failed'
+                exit 1
+        fi
 fi
 

issm/trunk-jpl/packagers/linux/complete-issm-linux-binaries-python.sh ¶

@@ -69 +69 @@
 if [ ${build} -eq 1 ]; then
         ./jenkins/jenkins.sh ./jenkins/ross-debian_linux-binaries-python
+
+        if [ $? -ne 0 ]; then
+                echo 'Build failed'
+                exit 1
+        fi
 fi
 

issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-matlab.sh ¶

@@ -45 +45 @@
 
 skip_tests=0
-while [ $# -gt 0 ]; do
-    case $1 in
-        -s|--skiptests) skip_tests=1;                                   ;;
-        *) echo "Unknown parameter passed: $1"; exit 1  ;;
-    esac
-    shift
+
+if [ $# -eq 1 ]; then
+        case $1 in
+                -s|--skiptests) skip_tests=1;                                   ;;
+                *) echo "Unknown parameter passed: $1"; exit 1  ;;
+        esac
 done
 
@@ -65 +65 @@
 mkdir ${PKG}
 
-# Add/modify required binaries and libraries
+# Add required binaries and libraries to package and modify them where needed
 cd ${ISSM_DIR}/bin
 
@@ -153 +153 @@
 svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
 echo "Copying assets to package: ${PKG}"
-cp -rf bin examples lib scripts test ${PKG}/
+cp -rf bin examples lib scripts test ${PKG}
 mkdir ${PKG}/execution
 echo "Cleaning up unneeded/unwanted files"

issm/trunk-jpl/packagers/linux/package-issm-linux-binaries-python.sh ¶

@@ -44 +44 @@
 
 skip_tests=0
-while [ $# -gt 0 ]; do
-    case $1 in
-        -s|--skiptests) skip_tests=1;                                   ;;
-        *) echo "Unknown parameter passed: $1"; exit 1  ;;
-    esac
-    shift
+
+if [ $# -eq 1 ]; then
+        case $1 in
+                -s|--skiptests) skip_tests=1;                                   ;;
+                *) echo "Unknown parameter passed: $1"; exit 1  ;;
+        esac
 done
 
@@ -58 +58 @@
 mkdir ${PKG}
 
-# Add/modify required binaries and libraries
+# Add required binaries and libraries to package and modify them where needed
 cd ${ISSM_DIR}/bin
 
@@ -152 +152 @@
 svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
 echo "Copying assets to package: ${PKG}"
-cp -rf bin examples lib scripts test ${PKG}/
+cp -rf bin examples lib scripts test ${PKG}
 mkdir ${PKG}/execution
 ${ISSM_DIR}/scripts/py_to_pyc.sh ${PKG}/bin # Compile Python source files

issm/trunk-jpl/packagers/mac/complete-issm-mac-binaries-matlab.sh ¶

@@ -98 +98 @@
 if [ ${build} -eq 1 ]; then
         ./jenkins/jenkins.sh ./jenkins/pine_island-mac-binaries-matlab
+
+        if [ $? -ne 0 ]; then
+                echo 'Build failed'
+                exit 1
+        fi
 fi
 

issm/trunk-jpl/packagers/mac/complete-issm-mac-binaries-python.sh ¶

@@ -98 +98 @@
 if [ ${build} -eq 1 ]; then
         ./jenkins/jenkins.sh ./jenkins/pine_island-mac-binaries-python
+
+        if [ $? -ne 0 ]; then
+                echo 'Build failed'
+                exit 1
+        fi
 fi
 

issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-matlab.sh ¶

@@ -167 +167 @@
 svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
 echo "Copying assets to package: ${PKG}"
-cp -rf bin examples lib scripts test ${PKG}/
+cp -rf bin examples lib scripts test ${PKG}
 mkdir ${PKG}/execution
 cp packagers/mac/issm-executable_entitlements.plist ${PKG}/bin/entitlements.plist

issm/trunk-jpl/packagers/mac/package-issm-mac-binaries-python.sh ¶

@@ -105 +105 @@
 fi
 
+# Clean up from previous packaging
+echo "Cleaning up existing assets"
+cd ${ISSM_DIR}
+rm -rf ${PKG} ${COMPRESSED_PKG}
+mkdir ${PKG}
+
 # Add required binaries and libraries to package and modify them where needed
 cd ${ISSM_DIR}/bin
@@ -195 +201 @@
 svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
 echo "Copying assets to package: ${PKG}"
-cp -rf bin examples lib scripts test ${PKG}/
+cp -rf bin examples lib scripts test ${PKG}
 mkdir ${PKG}/execution
-cp packagers/mac/issm-executable_entitlements.plist ${PKG}/bin/entitlements.plist
 ${ISSM_DIR}/scripts/py_to_pyc.sh ${PKG}/bin # Compile Python source files
 echo "Cleaning up unneeded/unwanted files"