Changeset 14025


Ignore:
Timestamp:
Nov 12, 2019 11:23:44 AM (3 weeks ago)
Author:
randersson
Message:

#5819 Modified configs and added new target in order to get the build artifact in the correct place for unix

Location:
branches/dev-5819/external/build_externals
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-5819/external/build_externals/build/assimulo/default_config

    r14005 r14025  
    33BUILD_DIR=$(WORKSPACE)/build
    44BITNESS=64
    5 PREINSTALL_DIR=$(BUILD_DIR)/Assimulo_install$(BITNESS)
     5PREINSTALL_DIR=$(BUILD_DIR)/$(TARGET)_install$(BITNESS)
    66
    77JM_HOME=$(WORKSPACE)/src
  • branches/dev-5819/external/build_externals/docker/src/components/utils/docker_targets.mk

    r12079 r14025  
    1414wheel folder test_wheel test_folder:
    1515    @cd $(BUILD_EXTERNALS)/$(TARGET) && \
    16     make $@ USER_CONFIG=$(BUILD_DIR)/$(USER_CONFIG) BUILD_DIR=$(DOCKER_BUILD_DIR) INSTALL_DIR_FOLDER=$(DOCKER_BUILD_DIR)
     16    make $@ USER_CONFIG=$(BUILD_DIR)/$(USER_CONFIG) BUILD_DIR=$(DOCKER_BUILD_DIR) PREINSTALL_DIR=$(DOCKER_BUILD_DIR)
     17
     18install_wheel install_folder:
     19    echo "(DEBUG): Finding in docker"
     20    find $(DOCKER_BUILD_DIR) -type d -name assimulo
     21    find $(DOCKER_BUILD_DIR)/$(TARGET)_install$(BITNESS) -type d -name assimulo -exec cp -r {} $(DISTRO)/$(TARGET)$(BITNESS)/$(subst install_,,$@)/ \;
    1722
    1823docker_$(TARGET)_dependencies: docker_base_$(TARGET)
Note: See TracChangeset for help on using the changeset viewer.