Changeset 13956


Ignore:
Timestamp:
Nov 5, 2019 2:51:40 PM (2 weeks ago)
Author:
aramle
Message:

#5819 Updating groovy for assimulo build.

File:
1 edited

Legend:

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

    r12102 r13956  
    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,stash=false, archive=true) {
     1def 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,stash=false, archive=true) {
    22    if (JM_CHECKOUT_PATH != null) {
    33        checkoutJM(${JM_BRANCH})
     
    2121    for (bit in bitness) {
    2222        stage ("assimulo_${TARGET} ${bit} bit") {
     23            if(USER_CONFIG == null) {
     24                USER_CONFIG="\${JM_HOME}/external/build_externals/configurations/Assimulo/windows/win${bit}"
     25            }
    2326            runMSYSWithEnv("""\
    2427            export JM_HOME="\$(pwd)/JModelica/"
     
    2730           
    2831            make clean BUILD_DIR=\${JENKINS_BUILD_DIR}/assimulo* BITNESS=${bit}
    29             make ${TARGET} USER_CONFIG=\${JM_HOME}/external/build_externals/configurations/Assimulo/windows/win${bit} 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}
     32            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}
    3033            """);
    3134            if ("${TARGET}" == "folder") {
Note: See TracChangeset for help on using the changeset viewer.