Changeset 9664


Ignore:
Timestamp:
Feb 11, 2015, 3:05:32 PM (9 years ago)
Author:
steve
Message:

Trying to get a binary version of anuga to install on windows without mingw environment

Location:
trunk/anuga_core
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/anuga_core/.travis.yml

    r9617 r9664  
    3131  # Get GDAL from the PinguCarsti binstar channel.
    3232  - conda install -c pingucarsti gdal geos gdal-data
     33  # On Windows Get GDAl from jjhelmus binstar channel
    3334  - export GDAL_DATA=`gdal-config --datadir`
    3435

  • trunk/anuga_core/anuga/__init__.py

    r9662 r9664  
    7373    # runtime libraries
    7474    #-----------------------------------------
    75     MinGW = False
    76     GCC = False
    77     import subprocess
    78     try:
    79         output = subprocess.check_output('gcc -dumpmachine', shell=True)
    80         GCC = True
    81         MinGW = 'mingw' in output
    82     except Exception as e:
    83         print 'Error running gcc'
    84         pass
     75
    8576   
    8677    # At runtime, If mingw not installed add mingw dlls folder to path
    … …  
    8879    import os
    8980    if sys.platform == 'win32':
     81                MinGW = False
     82                import subprocess
     83                try:
     84                        output = subprocess.check_output('gcc -dumpmachine', shell=True)
     85                        MinGW = 'mingw' in output
     86                except Exception as e:
     87                        pass           
     88               
    9089        if not MinGW:
    9190            (folder, tail) = os.path.split(__file__)
    92             runtime_dir = os.path.join(os.path.abspath(folder), 'runtime_dir')
    93             sys.path = runtime_dir + sys.path
     91            runtime_dir = os.path.join(os.path.abspath(folder), 'runtime_libs')
     92            os.environ['PATH'] = runtime_dir + ';' + os.environ['PATH']
    9493   
    9594   

  • trunk/anuga_core/anuga/setup.py

    r9580 r9664  
    3333    config.add_subpackage('utilities')
    3434    config.add_subpackage('validation_utilities')
    35 
     35   
     36    config.add_data_dir('runtime_libs')
     37   
    3638    try:
    3739        import vtk

  • trunk/anuga_core/anuga/tsunami_source/setup.py

    r9641 r9664  
    1515    config.add_data_dir('tests')
    1616    config.add_data_dir(join('tests','data'))
    17 
     17   
    1818    if sys.platform != 'win32':
    19         config.add_extension('okada_tsunami_fortran',
     19                config.add_extension('okada_tsunami_fortran',
    2020                            sources=['okada_tsunami_fortran.f'])
    2121

  • trunk/anuga_core/setup.cfg

    r9588 r9664  
    1010        --ignore=user_manual
    1111        --cov-report term --cov .
     12
     13
     14[pip]
     15compiler=mingw32
     16
     17[build]
     18compiler=mingw32
     19

  • trunk/anuga_core/setup.py

    r9649 r9664  
    167167    # monkey patch distutils to use Microsoft VC++ for Python on win32
    168168    if sys.platform == 'win32':
    169         import setuptools
     169                print('win32')
     170                import setuptools
    170171
    171172    setup_package()
Note: See TracChangeset for help on using the changeset viewer.