fix meson build, update travis

Author: 9il

.travis.yml

@@ -1,16 +1,20 @@
+language: d
 dist: trusty
 sudo: required
 os:
  - linux
  - osx
-language: d
+packages:
+  - pkg-config
 d:
  - ldc
  - ldc-beta
  - dmd-nightly
  - dmd-beta
  - dmd
- - gdc
+branches:
+  only:
+    - master
 env:
  - ARCH="x86_64"
 matrix:
@@ -23,13 +27,21 @@ matrix:
     - {d: dmd-nightly}
     - {d: ldc-beta}
     - {d: gdc}
-branches:
-  only:
-    - master
+install:
+  - pyenv global system 3.6
+  - pip3 install 'meson>=0.45'
+  - mkdir .ntmp
+  - curl -L https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip -o .ntmp/ninja-linux.zip
+  - unzip .ntmp/ninja-linux.zip -d .ntmp
+before_script:
+  - export PATH=$PATH:$PWD/.ntmp
 script:
  - travis_wait 100 dub test --arch "$ARCH"
  - ./test_examples.sh
  - travis_wait 100 dub test --arch "$ARCH" --build=unittest-cov
  - travis_wait 100 dub test --arch "$ARCH" --build=unittest-release
+ - meson build && ninja -j8 -C build # TODO: 32bit meson test
+ - ninja -j8 -C build test -v
+
 after_success:
  - bash <(curl -s https://codecov.io/bash)

meson.build

@@ -1,10 +1,19 @@
 project('mir-algorithm', 'd', version : '2.0.0')
 
-pversion = meson.project_version()
-name = meson.project_name()
-vname = name + '-' + pversion
 
-the_src = [
+install_subdir('include/',
+    strip_directory :true,
+    install_dir: 'include/',
+)
+
+install_subdir('source/',
+    strip_directory : true,
+    install_dir: 'include/d/' + meson.project_name(),
+)
+
+mir_algorithm_dir = include_directories('source/')
+
+mir_algorithm_src = [
     'source/mir/algorithm/iteration.d',
     'source/mir/algorithm/setops.d',
     'source/mir/array/allocation.d',
@@ -55,27 +64,27 @@ the_src = [
     'source/std/backdoor.d',
 ]
 
-mir_algorithm_lib = library(name,
-    [the_src],
-    install: true,
-    version: pversion,
-    include_directories: [include_directories('source')],
+mir_algorithm_test_exe = executable(meson.project_name() + '-test',
+    mir_algorithm_src,
+    include_directories: mir_algorithm_dir,
+    d_unittest: true,
+    d_module_versions: ['mir_test'],
+    link_args: '-main',
 )
 
-install_subdir('include/',
-    strip_directory :true,
-    install_dir: 'include/',
-)
+test(meson.project_name() + '-test', mir_algorithm_test_exe)
 
-install_subdir('source/',
-    strip_directory : true,
-    install_dir: 'include/d/' + vname,
+mir_algorithm_lib = library(meson.project_name(),
+    mir_algorithm_src,
+    include_directories: mir_algorithm_dir,
+    install: true,
+    version: meson.project_version(),
 )
 
 import('pkgconfig').generate(
-    name: name,
-    description: 'Mir Algorithm - Dlang Core Library for math and finance.',
-    subdirs: 'd/' + vname,
+    name: meson.project_name(),
+    description: 'Mir Algorithm - Dlang Core Library for Math and Finance.',
+    subdirs: 'd/' + meson.project_name(),
     libraries: [mir_algorithm_lib],
-    version: pversion,
+    version: meson.project_version(),
 )