Changeset 13902


Ignore:
Timestamp:
Oct 29, 2019 4:38:30 PM (2 weeks ago)
Author:
aramle
Message:

#5819 Updates after review.

Location:
branches/dev-5819
Files:
10 edited

Legend:

Unmodified
Added
Removed
  • branches/dev-5819/Makefile.am

    r13802 r13902  
    7171    case $(build) in \
    7272    *-cygwin*) \
    73     make install USER_CONFIG=../../configurations/Assimulo/windows/win32_cygwin_py2 JM_HOME=$(abs_top_srcdir) BUILD_DIR=$(abs_builddir);; \
     73    ASSIMULO_USER_CONFIG=../../configurations/Assimulo/windows/win32_cygwin_py2;; \
    7474    *-mingw*) \
    75     make install USER_CONFIG=../../configurations/Assimulo/windows/$(ASSIMULO_CONFIG) JM_HOME=$(abs_top_srcdir) BUILD_DIR=$(abs_builddir) ;; \
     75    ASSIMULO_USER_CONFIG=../../configurations/Assimulo/windows/$(ASSIMULO_CONFIG);; \
    7676    *) \
    77     make install USER_CONFIG=../../configurations/Assimulo/unix/config JM_HOME=$(abs_top_srcdir) BUILD_DIR=$(abs_builddir);; \
     77    ASSIMULO_USER_CONFIG=../../configurations/Assimulo/unix/config;; \
    7878    esac
     79    make install USER_CONFIG=$(ASSIMULO_USER_CONFIG) JM_HOME=$(abs_top_srcdir) BUILD_DIR=$(abs_builddir)
    7980if JM_WIN64
    8081if WITH_PYTHON64
  • branches/dev-5819/Makefile.in

    r13802 r13902  
    10771077@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ case $(build) in \
    10781078@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ *-cygwin*) \
    1079 @PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ make install USER_CONFIG=../../configurations/Assimulo/windows/win32_cygwin_py2 JM_HOME=$(abs_top_srcdir) BUILD_DIR=$(abs_builddir);; \
     1079@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ ASSIMULO_USER_CONFIG=../../configurations/Assimulo/windows/win32_cygwin_py2;; \
    10801080@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ *-mingw*) \
    1081 @PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ make install USER_CONFIG=../../configurations/Assimulo/windows/$(ASSIMULO_CONFIG) JM_HOME=$(abs_top_srcdir) BUILD_DIR=$(abs_builddir) ;; \
     1081@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ ASSIMULO_USER_CONFIG=../../configurations/Assimulo/windows/$(ASSIMULO_CONFIG);; \
    10821082@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ *) \
    1083 @PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ make install USER_CONFIG=../../configurations/Assimulo/unix/config JM_HOME=$(abs_top_srcdir) BUILD_DIR=$(abs_builddir);; \
     1083@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ ASSIMULO_USER_CONFIG=../../configurations/Assimulo/unix/config;; \
    10841084@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@ esac
     1085@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@    make install USER_CONFIG=$(ASSIMULO_USER_CONFIG) JM_HOME=$(abs_top_srcdir) BUILD_DIR=$(abs_builddir)
    10851086@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@  mkdir -p $(assimulo_build_dir64); \
    10861087@JM_WIN64_TRUE@@PYTHON_ENABLED_TRUE@@WITH_OPENMP_TRUE@@WITH_PYTHON64_TRUE@  cd $(assimulo_src_dir)/..; \
  • branches/dev-5819/external/build_externals/configurations/Assimulo/unix/config

    r13809 r13902  
    1 -with_openmp=True --superlu-home=$(abs_builddir)/superlu_build/ --sundials-home=$(SUNDIALS_HOME) --sundials-with-superlu=True --blas-home=$(abs_builddir)/blas_install/ --lapack-home=$(abs_builddir)/lapack_install/ --prefix=$(assimulo_install_dir)
    2 
    31BITNESS=64
    42FORCE_32_BIT=false
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win32

    r13802 r13902  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
     19# mkfile_path is the path to this file
    1920mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2021mkfile_dir := $(dir $(mkfile_path))
    2122include $(mkfile_dir)/win
     23
    2224BITNESS=32
    2325EXTRA_SETUP_ARGS=--with_openmp=True --no-msvcr=true --force-32bit=true --extra-c-flags=-mincoming-stack-boundary=2
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win32_cygwin_py2

    r13808 r13902  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
     19# mkfile_path is the path to this file
    1920mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2021mkfile_dir := $(dir $(mkfile_path))
    2122include $(mkfile_dir)/win
     23
    2224BITNESS=32
    2325EXTRA_SETUP_ARGS=--with_openmp=True --force-32bit=true --extra-c-flags=-mincoming-stack-boundary=2
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win32_msys_py2

    r13810 r13902  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
     19# mkfile_path is the path to this file
    1920mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2021mkfile_dir := $(dir $(mkfile_path))
    2122include $(mkfile_dir)/win
     23
    2224BITNESS=32
    2325EXTRA_SETUP_ARGS=--with_openmp=True --no-msvcr=true --force-32bit=true --extra-c-flags=-mincoming-stack-boundary=2
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win64

    r12090 r13902  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
     19# mkfile_path is the path to this file
    1920mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2021mkfile_dir := $(dir $(mkfile_path))
    2122include $(mkfile_dir)/win
     23
    2224BITNESS=64
    2325FORCE_32_BIT=false
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win64_msys_py2

    r13810 r13902  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
     19# mkfile_path is the path to this file
    1920mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2021mkfile_dir := $(dir $(mkfile_path))
    2122include $(mkfile_dir)/win
     23
    2224BITNESS=64
    2325FORCE_32_BIT=false
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win64_msys_py3

    r13810 r13902  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
     19
     20# mkfile_path is the path to this file
    1921mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2022mkfile_dir := $(dir $(mkfile_path))
    2123include $(mkfile_dir)/win
    22 BITNESS=64
    23 EXTRA_SETUP_ARGS=--with_openmp=True
     24
     25BITNESS:=64
     26EXTRA_SETUP_ARGS:=--with_openmp=True
    2427
    2528SUPERLU_HOME=$(BUILD_DIR)/superlu_build$(BITNESS)
  • branches/dev-5819/external/build_externals/configurations/Assimulo/windows/win64py3

    r13802 r13902  
    1717#   <http://www.ibm.com/developerworks/library/os-cpl.html/> respectively.
    1818
     19# mkfile_path is the path to this file
    1920mkfile_path := $(abspath $(lastword $(MAKEFILE_LIST)))
    2021mkfile_dir := $(dir $(mkfile_path))
    2122include $(mkfile_dir)/win
     23
    2224BITNESS=64
    2325FORCE_32_BIT=false
    24 EXTRA_SETUP_ARGS=--with_openmp=True 
     26EXTRA_SETUP_ARGS=--with_openmp=True
    2527
    26 SUPERLU_HOME=$(BUILD_DIR)/superlu_install64
    27 SUNDIALS_HOME=$(BUILD_DIR)/sundials_install64
    28 BLAS_HOME=$(BUILD_DIR)/blas_install64
    29 LAPACK_HOME=$(BUILD_DIR)/lapack_install64
     28SUPERLU_HOME=$(BUILD_DIR)/superlu_install64msvs
     29SUNDIALS_HOME=$(BUILD_DIR)/sundials_install64msvs
     30BLAS_HOME=
     31LAPACK_HOME=
     32MKL_HOME=
    3033INSTALL_DIR_FOLDER=${WORKSPACE}/install/Python
    3134
Note: See TracChangeset for help on using the changeset viewer.