[segyio] 165/376: Merge pull request #77 from jokva/makefile-improvements

[Jørgen Kvalsvik]

This is an automated email from the git hooks/post-receive script.

jokva-guest pushed a commit to branch debian
in repository segyio.

commit 2c58565b73767191424ff83fe3973324341c5172
Merge: 4a41bd7 7a50932
Author: jokva <jokva at statoil.com>
Date:   Fri Feb 10 15:34:08 2017 +0100

    Merge pull request #77 from jokva/makefile-improvements
    
    Reorganise makefiles and CI

 .travis.yml                                        |  22 +-
 CMakeLists.txt                                     |  51 ++--
 README.md                                          |  13 +-
 applications/CMakeLists.txt                        |   8 +-
 appveyor.yml                                       |  27 +-
 cmake/matlab.cmake                                 |   4 +-
 cmake/python.cmake                                 | 148 +++++++++--
 cmake/test_runner.py                               |  48 ----
 examples/CMakeLists.txt                            |   9 -
 lib/CMakeLists.txt                                 |  74 ++++++
 {src => lib/include}/segyio/segy.h                 |  23 ++
 {src/segyio => lib/src}/segy.c                     |  35 +++
 lib/src/segy.def                                   |  49 ++++
 {src => lib/src}/segyio/util.h                     |   8 +
 tests/test_segy.c => lib/test/segy.c               |   7 +
 tests/test_segyspec.c => lib/test/spec.c           |   0
 lib/test/unittest.h                                |  43 ++++
 tests/test_utils.c => lib/test/utils.c             |   0
 mex/CMakeLists.txt                                 |  10 +
 mex/segyspec_mex.c                                 |   2 +-
 mex/segyutil.c                                     | 127 +++++++++-
 mex/segyutil.h                                     |  26 +-
 python/CMakeLists.txt                              |  63 +++--
 {examples => python/examples}/about.py             |   0
 {examples => python/examples}/copy-sub-cube.py     |   0
 {examples => python/examples}/make-file.py         |   0
 {examples => python/examples}/make-ps-file.py      |   0
 {examples => python/examples}/scan_min_max.py      |   0
 {examples => python/examples}/write.py             |   0
 python/segyio/CMakeLists.txt                       |  17 --
 .../test_test_context.py => python/test/context.py |   0
 tests/test_segy.py => python/test/segy.py          |   0
 tests/test_segyio_c.py => python/test/segyio_c.py  |   0
 tests/test_enum.py => python/test/segyioenum.py    |   0
 {tests => python/test}/test_context.py             |   0
 tests/test_tools.py => python/test/tools.py        |   0
 setup.py                                           |   7 +-
 src/spec/segyspec.c                                | 129 ----------
 src/spec/segyspec.h                                |  33 ---
 {tests/test-data => test-data}/1x1.sgy             | Bin
 {tests/test-data => test-data}/1xN.sgy             | Bin
 {tests/test-data => test-data}/Mx1.sgy             | Bin
 {tests/test-data => test-data}/small-ps.sgy        | Bin
 {tests/test-data => test-data}/small.sgy           | Bin
 {tests/test-data => test-data}/text.sgy            | Bin
 tests/CMakeLists.txt                               |  28 --
 tests/test_segy_mex.m                              | 281 ---------------------
 tests/test_segyspec_mex.m                          |  88 -------
 48 files changed, 637 insertions(+), 743 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/segyio.git