Changeset 14148


Ignore:
Timestamp:
Nov 22, 2019 3:08:12 PM (2 weeks ago)
Author:
randersson
Message:

#5819 Merged r14133-r14147 from branch to trunk [ci skip]

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/external/build_externals/Jenkins/ci/vars/buildAssimulo.groovy

    r14127 r14148  
    3333            make clean USER_CONFIG=${USER_CONFIG}${bit} BUILD_DIR=\${JENKINS_BUILD_DIR} INSTALL_DIR_FOLDER=${INSTALL_PATH_UNIX}/${bit}${msvs_suffix}
    3434            make ${TARGET} USER_CONFIG=${USER_CONFIG}${bit} JM_HOME=\${JM_HOME} BUILD_DIR=\${JENKINS_BUILD_DIR} WORKSPACE=\${JM_HOME}/.. INSTALL_DIR_FOLDER=${INSTALL_PATH_UNIX}/${bit}${msvs_suffix}
    35             """, extra_bat);
     35            """,
     36            extra_bat);
    3637            if ("${TARGET}" == "install") {
    3738                runMSYSWithEnv("""\
     
    4647                    }
    4748                    if (TARGET == "wheel") {
    48                         archiveArtifacts artifacts: "${bit}/${TARGET}/**", fingerprint: false
     49                        archiveArtifacts artifacts: "${bit}${msvs_suffix}/${TARGET}/**", fingerprint: false
    4950                    } else {
    5051                        // archiving the entire directory
    51                         if (msvs_suffix == "msvs") {
    52                             archiveArtifacts artifacts: "${bit}${msvs_suffix}/assimulo/**", fingerprint: false
    53                         } else {
    54                             archiveArtifacts artifacts: "${bit}/assimulo/**", fingerprint: false
    55                         }
     52                        archiveArtifacts artifacts: "${bit}${msvs_suffix}/assimulo/**", fingerprint: false
    5653                    }
    5754                }
Note: See TracChangeset for help on using the changeset viewer.