Changeset 14005


Ignore:
Timestamp:
Nov 11, 2019 2:28:17 PM (4 weeks ago)
Author:
randersson
Message:

#5819 Cleaned up configs and replaced all SDK_HOME with WORKSPACE. Replaced curly brackets with parenthesis

Location:
branches/dev-5819/external/build_externals
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed

  • branches/dev-5819/external/build_externals/build/assimulo/default_config

    r13802 r14005  
    11OS=win
    22TARGET=assimulo
    3 BUILD_DIR=${WORKSPACE}/build
     3BUILD_DIR=$(WORKSPACE)/build
    44BITNESS=64
    55PREINSTALL_DIR=$(BUILD_DIR)/Assimulo_install$(BITNESS)
    66
    7 JM_HOME=${WORKSPACE}/src
     7JM_HOME=$(WORKSPACE)/src
    88ASSIMULO_SRC=$(JM_HOME)/external/Assimulo
    99SUPERLU_HOME=$(BUILD_DIR)/superlu_install
    … …  
    1212LAPACK_HOME=$(BUILD_DIR)/lapack_install
    1313
    14 INSTALL_DIR_FOLDER=${SDK_HOME}/install/Python
     14INSTALL_DIR_FOLDER=$(WORKSPACE)/install/Python
    1515PLATFORM_SITE_PACKAGES=Lib/site-packages
    1616

  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win

    r11818 r14005  
    1919#SHELL := /bin/bash
    2020#rule:
    21 PLATFORM=windows
    22 DIST_VERSION=""
    23 PYTHON_VERSION=2.7.13
    24 BUILD_TARGET=PyFMI
    25 DOCKER_ENV="0"
    26 BUILD_DIR=${SDK_HOME}/build
    27 INSTALL_DIR_WHEEL=${SDK_HOME}/installPyFMI
    28 
    29 JM_HOME=${SDK_HOME}/src
    30 BUILD_ENVIRONMENT=${JM_HOME}/build_environment
    31 BUILD_EXTERNALS_DIR=${JM_HOME}/external/build_externals
    32 DOCKER_UTILS_DIR=${JM_HOME}/Docker
    33 PYFMI_SRC=${JM_HOME}/external/PyFMI
     21# default values
     22WORKSPACE=$(SDK_HOME)
     23BUILD_DIR=$(WORKSPACE)/build
     24JM_HOME=$(WORKSPACE)/src
     25BUILD_ENVIRONMENT=$(JM_HOME)/build_environment
     26BUILD_EXTERNALS_DIR=$(JM_HOME)/external/build_externals
     27SUFFIX=

  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win32_msys_py2

    r13915 r14005  
    2121mkfile_dir := $(dir $(mkfile_path))
    2222include $(mkfile_dir)/win
     23TARGET=Assimulo
     24BITNESS=32
    2325
    24 BITNESS=32
    2526EXTRA_SETUP_ARGS=--with_openmp=True --no-msvcr=true --force-32bit=true --extra-c-flags=-mincoming-stack-boundary=2
    2627
    … …  
    2930BLAS_HOME=$(BUILD_DIR)/blas_install
    3031LAPACK_HOME=$(BUILD_DIR)/lapack_install
    31 INSTALL_DIR_FOLDER=${WORKSPACE}/install/Python
     32INSTALL_DIR_FOLDER=$(WORKSPACE)/install/Python
     33SUFFIX=_py2
     34REMOVE_PREINSTALL_DIR=yes
     35PREINSTALL_DIR=$(BUILD_DIR)/$(TARGET)$(BITNESS)$(SUFFIX)
    3236# Optional variables
    33 PYTHONHOME=${SDK_HOME}/Python27/Python_32/
     37PYTHONHOME=$(WORKSPACE)/Python27/Python_32/

  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win64_msys_py2

    r13915 r14005  
    2121mkfile_dir := $(dir $(mkfile_path))
    2222include $(mkfile_dir)/win
    23 
     23TARGET=Assimulo
    2424BITNESS=64
    2525FORCE_32_BIT=false
    2626EXTRA_SETUP_ARGS=--no-msvcr=true --with_openmp=True
    2727
    28 INSTALL_DIR_FOLDER=${WORKSPACE}/install/Python_64
    2928SUPERLU_HOME=$(BUILD_DIR)/superlu_build64
    3029SUNDIALS_HOME=$(BUILD_DIR)/sundials_install64
    3130BLAS_HOME=$(BUILD_DIR)/blas_install64
    3231LAPACK_HOME=$(BUILD_DIR)/lapack_install64
    33 INSTALL_DIR_FOLDER=${WORKSPACE}/install/Python_64
     32BUILD_SUFFIX=_py2
     33INSTALL_DIR_FOLDER=$(BUILD_DIR)/$(TARGET)$(BITNESS)$(BUILD_SUFFIX)
     34REMOVE_PREINSTALL_DIR=yes
     35PREINSTALL_DIR=$(BUILD_DIR)/$(TARGET)$(BITNESS)$(BUILD_SUFFIX)
    3436
    35 PYTHONHOME=$(SDK_HOME)/Python27/Python_64/
     37PYTHONHOME=$(WORKSPACE)/Python27/Python_64/

  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win64_msys_py3

    r13915 r14005  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
    19 
    2019# mkfile_path is the path to this file
    2120mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2221mkfile_dir := $(dir $(mkfile_path))
    2322include $(mkfile_dir)/win
    24 
     23TARGET=Assimulo
    2524BITNESS=64
    26 EXTRA_SETUP_ARGS=--with_openmp=True
     25FORCE_32_BIT=false
     26EXTRA_SETUP_ARGS=--no-msvcr=true --with_openmp=True
    2727
    2828SUPERLU_HOME=$(BUILD_DIR)/superlu_build$(BITNESS)
    … …  
    3030BLAS_HOME=$(BUILD_DIR)/blas_install$(BITNESS)
    3131LAPACK_HOME=$(BUILD_DIR)/lapack_install$(BITNESS)
    32 INSTALL_DIR_FOLDER=${WORKSPACE}/install/Python
    33 PREINSTALL_DIR=$(ARTIFACTS)/assimulo
    34 PYTHONHOME=${SDK_HOME}/Python37/
     32INSTALL_DIR_FOLDER=$(BUILD_DIR)/$(TARGET)$(BITNESS)$(SUFFIX)
     33SUFFIX=_py2
     34REMOVE_PREINSTALL_DIR=yes
     35PREINSTALL_DIR=$(BUILD_DIR)/$(TARGET)$(BITNESS)$(SUFFIX)
    3536
    36 BUILD_SETUP_EXTRA=build_ext --compiler=msvc --fcompiler=intelvem
     37PYTHONHOME=$(WORKSPACE)/Python27/Python_64/
Note: See TracChangeset for help on using the changeset viewer.