Changeset 14047


Ignore:
Timestamp:
Nov 13, 2019 2:26:53 PM (3 weeks ago)
Author:
randersson
Message:

#5819 Updated echo of artifacts and added copy for wheel into correct directory. Should be enough to correctly archive the artifacts

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-5819/external/build_externals/docker/src/components/utils/docker_targets.mk

    r14045 r14047  
    1010    @docker run -v $(PATH_TO_MOUNT):$(JM_HOME_IN_DOCKER) ${DOCKER_ID} sh -c \
    1111        "cd ${DOCKER_CONFIG_HOME} && make $(subst docker_,,$@) OS=$(OS) JM_HOME=$(JM_HOME_IN_DOCKER) USER_CONFIG=$(USER_CONFIG)"
    12     @echo $(DISTRO)/$(TARGET)$(BITNESS)/$(subst test_,,$(subst docker_,,$@))/** > $(ARTIFACT_FILE)
     12    @echo $(DISTRO)/$(TARGET)$(BITNESS)/$(subst install_,,$(subst test_,,$(subst docker_,,$@)))/** > $(ARTIFACT_FILE)
    1313
    1414wheel folder test_wheel test_folder:
     
    1717
    1818install_folder: find_folder
    19     echo "(DEBUG): Finished searching"
     19    echo "(DEBUG): Finished installing"
    2020
    2121install_wheel: find_wheel
    22     echo "(DEBUG): Finished searching"
     22    echo "(DEBUG): Finished installing"
    2323
    2424find_wheel:
    25     find $(DOCKER_BUILD_DIR) -type f -name "*.whl"
     25    mkdir -p $(DISTRO)/$(TARGET)$(BITNESS)/$(subst find_,,$@)
     26    find $(DOCKER_BUILD_DIR) -type f -name "*.whl" -exec cp -r {} $(DISTRO)/$(TARGET)$(BITNESS)/$(subst find_,,$@)/ \;
     27    ls -la $(DISTRO)/$(TARGET)$(BITNESS)/$(subst find_,,$@)
    2628
    2729find_folder:
    28     find $(DOCKER_BUILD_DIR)/../ -type d -name assimulo
    29     find $(DOCKER_BUILD_DIR)/../ -type f -name "test_kinsol.pyc"
    30     find $(DOCKER_BUILD_DIR)/../ -type d -name "solvers"
    3130    mkdir -p $(DISTRO)/$(TARGET)$(BITNESS)/$(subst find_,,$@)
    3231    find $(PREINSTALL_DIR) -type d -name assimulo -exec cp -r {} $(DISTRO)/$(TARGET)$(BITNESS)/$(subst find_,,$@)/ \;
Note: See TracChangeset for help on using the changeset viewer.