Changeset 25900


Ignore:
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:
8 edited

Legend:

Unmodified
Added
Removed

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

    r25896 r25900  
    6969if [ ${build} -eq 1 ]; then
    7070        ./jenkins/jenkins.sh ./jenkins/ross-debian_linux-binaries-matlab
     71
     72        if [ $? -ne 0 ]; then
     73                echo 'Build failed'
     74                exit 1
     75        fi
    7176fi
    7277

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

    r25896 r25900  
    6969if [ ${build} -eq 1 ]; then
    7070        ./jenkins/jenkins.sh ./jenkins/ross-debian_linux-binaries-python
     71
     72        if [ $? -ne 0 ]; then
     73                echo 'Build failed'
     74                exit 1
     75        fi
    7176fi
    7277

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

    r25896 r25900  
    4545
    4646skip_tests=0
    47 while [ $# -gt 0 ]; do
    48     case $1 in
    49         -s|--skiptests) skip_tests=1;                                   ;;
    50         *) echo "Unknown parameter passed: $1"; exit 1  ;;
    51     esac
    52     shift
     47
     48if [ $# -eq 1 ]; then
     49        case $1 in
     50                -s|--skiptests) skip_tests=1;                                   ;;
     51                *) echo "Unknown parameter passed: $1"; exit 1  ;;
     52        esac
    5353done
    5454
    … …  
    6565mkdir ${PKG}
    6666
    67 # Add/modify required binaries and libraries
     67# Add required binaries and libraries to package and modify them where needed
    6868cd ${ISSM_DIR}/bin
    6969
    … …  
    153153svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
    154154echo "Copying assets to package: ${PKG}"
    155 cp -rf bin examples lib scripts test ${PKG}/
     155cp -rf bin examples lib scripts test ${PKG}
    156156mkdir ${PKG}/execution
    157157echo "Cleaning up unneeded/unwanted files"

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

    r25896 r25900  
    4444
    4545skip_tests=0
    46 while [ $# -gt 0 ]; do
    47     case $1 in
    48         -s|--skiptests) skip_tests=1;                                   ;;
    49         *) echo "Unknown parameter passed: $1"; exit 1  ;;
    50     esac
    51     shift
     46
     47if [ $# -eq 1 ]; then
     48        case $1 in
     49                -s|--skiptests) skip_tests=1;                                   ;;
     50                *) echo "Unknown parameter passed: $1"; exit 1  ;;
     51        esac
    5252done
    5353
    … …  
    5858mkdir ${PKG}
    5959
    60 # Add/modify required binaries and libraries
     60# Add required binaries and libraries to package and modify them where needed
    6161cd ${ISSM_DIR}/bin
    6262
    … …  
    152152svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
    153153echo "Copying assets to package: ${PKG}"
    154 cp -rf bin examples lib scripts test ${PKG}/
     154cp -rf bin examples lib scripts test ${PKG}
    155155mkdir ${PKG}/execution
    156156${ISSM_DIR}/scripts/py_to_pyc.sh ${PKG}/bin # Compile Python source files

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

    r25896 r25900  
    9898if [ ${build} -eq 1 ]; then
    9999        ./jenkins/jenkins.sh ./jenkins/pine_island-mac-binaries-matlab
     100
     101        if [ $? -ne 0 ]; then
     102                echo 'Build failed'
     103                exit 1
     104        fi
    100105fi
    101106

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

    r25896 r25900  
    9898if [ ${build} -eq 1 ]; then
    9999        ./jenkins/jenkins.sh ./jenkins/pine_island-mac-binaries-python
     100
     101        if [ $? -ne 0 ]; then
     102                echo 'Build failed'
     103                exit 1
     104        fi
    100105fi
    101106

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

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

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

    r25896 r25900  
    105105fi
    106106
     107# Clean up from previous packaging
     108echo "Cleaning up existing assets"
     109cd ${ISSM_DIR}
     110rm -rf ${PKG} ${COMPRESSED_PKG}
     111mkdir ${PKG}
     112
    107113# Add required binaries and libraries to package and modify them where needed
    108114cd ${ISSM_DIR}/bin
    … …  
    195201svn cleanup --remove-ignored --remove-unversioned test # Clean up test directory (before copying to package)
    196202echo "Copying assets to package: ${PKG}"
    197 cp -rf bin examples lib scripts test ${PKG}/
     203cp -rf bin examples lib scripts test ${PKG}
    198204mkdir ${PKG}/execution
    199 cp packagers/mac/issm-executable_entitlements.plist ${PKG}/bin/entitlements.plist
    200205${ISSM_DIR}/scripts/py_to_pyc.sh ${PKG}/bin # Compile Python source files
    201206echo "Cleaning up unneeded/unwanted files"
Note: See TracChangeset for help on using the changeset viewer.