Ignore:
Timestamp:
Nov 7, 2019 8:03:34 AM (5 weeks ago)
Author:
randersson
Message:

#5819 Separated prefix in groovy script

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-5819/external/build_externals/Jenkins/ci/vars/buildAssimulo.groovy

    r13957 r13970  
    1 def call(JM_CHECKOUT_PATH, JM_BRANCH, INSTALL_PATH, TARGET, bitness=["32", "64"], BLAS_HOME_BASE=null, LAPACK_HOME_BASE=null, SUPERLU_HOME_BASE=null, SUNDIALS_HOME_BASE=null,USER_CONFIG=null, extra_bat="", stash=false, archive=true) {
     1def call(JM_CHECKOUT_PATH, JM_BRANCH, INSTALL_PATH, TARGET, bitness=["32", "64"], build_with_msvs=null, BLAS_HOME_BASE=null, LAPACK_HOME_BASE=null, SUPERLU_HOME_BASE=null, SUNDIALS_HOME_BASE=null,USER_CONFIG=null, extra_bat="", stash=false, archive=true) {
    22    if (JM_CHECKOUT_PATH != null) {
    33        checkoutJM(${JM_BRANCH})
     
    1919        SUNDIALS_HOME_BASE="${INSTALL_PATH_UNIX}/sundials_install"
    2020    }
     21    if (build_with_msvs) {
     22        msvs_suffix="msvs"
     23    } else {
     24        msvs_suffix=""
     25    }
    2126    for (bit in bitness) {
    22         stage ("assimulo_${TARGET} ${bit} bit") {
    23             if(USER_CONFIG == null) {
    24                 USER_CONFIG="\${JM_HOME}/external/build_externals/configurations/Assimulo/windows/win${bit}"
    25             }
     27        stage ("assimulo_${TARGET} ${bit}${msvs_suffix} bit") {
    2628            runMSYSWithEnv("""\
    2729            export JM_HOME="\$(pwd)/JModelica/"
     
    2931            cd \${JM_HOME}/external/build_externals/build/assimulo
    3032           
    31             make clean BUILD_DIR=\${JENKINS_BUILD_DIR}/assimulo* BITNESS=${bit}
     33            make clean BUILD_DIR=\${JENKINS_BUILD_DIR}/assimulo
    3234            make ${TARGET} USER_CONFIG=${USER_CONFIG} JM_HOME=\${JM_HOME} BUILD_DIR=\${JENKINS_BUILD_DIR} BLAS_HOME=${BLAS_HOME_BASE}${bit} SUNDIALS_HOME=${SUNDIALS_HOME_BASE}${bit} LAPACK_HOME=${LAPACK_HOME_BASE}${bit} SUPERLU_HOME=${SUPERLU_HOME_BASE}${bit} INSTALL_DIR_FOLDER=${INSTALL_PATH_UNIX}/assimulo/${TARGET}/Python_${bit}
    3335            """, extra_bat);
Note: See TracChangeset for help on using the changeset viewer.