Changeset 14007


Ignore:
Timestamp:
Nov 11, 2019 3:59:08 PM (4 weeks ago)
Author:
randersson
Message:

#5819 Updated groovy script with some changes in order to build all the different versions

File:
1 edited

Legend:

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

    r13979 r14007  
    2525    }
    2626    for (bit in bitness) {
    27         stage ("assimulo_${TARGET} ${bit}${msvs_suffix} bit") {
     27        stage ("assimulo_${TARGET} ${bit}${msvs_suffix}") {
    2828            runMSYSWithEnv("""\
    2929            export JM_HOME="\$(pwd)/JModelica/"
     
    3232           
    3333            make clean USER_CONFIG=${USER_CONFIG} BUILD_DIR=\${JENKINS_BUILD_DIR}
    34             make ${TARGET} USER_CONFIG=${USER_CONFIG} JM_HOME=\${JM_HOME} BUILD_DIR=\${JENKINS_BUILD_DIR} WORKSPACE=\${JM_HOME}/.. INSTALL_DIR_FOLDER=${INSTALL_PATH_UNIX}/assimulo/${TARGET}/Python_${bit}
     34            make ${TARGET} USER_CONFIG=${USER_CONFIG} JM_HOME=\${JM_HOME} BUILD_DIR=\${JENKINS_BUILD_DIR} WORKSPACE=\${JM_HOME}/.. INSTALL_DIR_FOLDER=${INSTALL_PATH_UNIX}/${msvs_suffix}
    3535            """, extra_bat);
    3636            if ("${TARGET}" == "folder") {
    3737                runMSYSWithEnv("""\
    3838                export JM_HOME="\$(pwd)/JModelica/"
    39                 nosetests ${INSTALL_PATH_UNIX}/assimulo/${TARGET}/Python_${bit}/folder/assimulo/tests/*.py
     39                nosetests ${INSTALL_PATH_UNIX}/assimulo/tests/*.py
    4040                """, "", false, bit);
    4141            }
    4242            if (stash || archive) {
    43                 dir("${INSTALL_PATH}/assimulo/${TARGET}") {
     43                dir("${INSTALL_PATH}") {
    4444                    if (stash) {
    4545                        stash includes: "Python_${bit}/**", name: "Python_${bit}_assimulo_${TARGET}"
    4646                    }
    47                     if (archive) {
    48                         archiveArtifacts artifacts: "Python_${bit}/**", fingerprint: false
     47                    if (msvs_suffix == "msvs") {
     48                        archiveArtifacts artifacts: "${msvs_suffix}/assimulo/**", fingerprint: false
     49                    } else {
     50                        archiveArtifacts artifacts: "assimulo/**", fingerprint: false
    4951                    }
    5052                }
Note: See TracChangeset for help on using the changeset viewer.