Update

StatisKit · Jan 14, 2019 · 3268bdc · 3268bdc
1 parent bdc5675
commit 3268bdc
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 8 deletions.
diff --git a/bin/conda/libstatiskit_stl-dev/bld.bat → etc/conda/libstatiskit_stl-dev/bld.bat b/bin/conda/libstatiskit_stl-dev/bld.bat → etc/conda/libstatiskit_stl-dev/bld.bat
diff --git a/bin/conda/libstatiskit_stl-dev/build.sh → etc/conda/libstatiskit_stl-dev/build.sh b/bin/conda/libstatiskit_stl-dev/build.sh → etc/conda/libstatiskit_stl-dev/build.sh
diff --git a/bin/conda/libstatiskit_stl-dev/meta.yaml → etc/conda/libstatiskit_stl-dev/meta.yaml b/bin/conda/libstatiskit_stl-dev/meta.yaml → etc/conda/libstatiskit_stl-dev/meta.yaml
@@ -16,6 +16,10 @@ about:
 
 requirements:
   build:
+    - {{ compiler('c') }}
+    - {{ compiler('cxx') }}
     - libtoolchain
     - libtoolchain-dev
+    - autowig-toolchain
+  host:
     - python
diff --git a/bin/conda/libstatiskit_stl/bld.bat → etc/conda/libstatiskit_stl/bld.bat b/bin/conda/libstatiskit_stl/bld.bat → etc/conda/libstatiskit_stl/bld.bat
diff --git a/bin/conda/libstatiskit_stl/build.sh → etc/conda/libstatiskit_stl/build.sh b/bin/conda/libstatiskit_stl/build.sh → etc/conda/libstatiskit_stl/build.sh
diff --git a/bin/conda/libstatiskit_stl/meta.yaml → etc/conda/libstatiskit_stl/meta.yaml b/bin/conda/libstatiskit_stl/meta.yaml → etc/conda/libstatiskit_stl/meta.yaml
@@ -15,5 +15,8 @@ about:
 
 requirements:
   build:
+    - {{ compiler('c') }}
+    - {{ compiler('cxx') }}
     - libtoolchain
+  host:
     - libstatiskit_stl-dev
diff --git a/bin/conda/python-statiskit_stl/bld.bat → etc/conda/python-statiskit_stl/bld.bat b/bin/conda/python-statiskit_stl/bld.bat → etc/conda/python-statiskit_stl/bld.bat
diff --git a/bin/conda/python-statiskit_stl/build.sh → etc/conda/python-statiskit_stl/build.sh b/bin/conda/python-statiskit_stl/build.sh → etc/conda/python-statiskit_stl/build.sh
diff --git a/bin/conda/python-statiskit_stl/meta.yaml → etc/conda/python-statiskit_stl/meta.yaml b/bin/conda/python-statiskit_stl/meta.yaml → etc/conda/python-statiskit_stl/meta.yaml
@@ -15,9 +15,13 @@ about:
 
 requirements:
   build:
+    - {{ compiler('c') }}
+    - {{ compiler('cxx') }}
     - libtoolchain
     - python-toolchain
-    - libboost_python-dev
+  host:
+    - libboost-dev
+    - libboost_python
     - libstatiskit_stl
     - python
   run:

diff --git a/travis.yml b/travis.yml
@@ -7,17 +7,14 @@ language: cpp
 os:
   - linux
   - osx
+  - windows
 
 sudo: required
 
 env:
-  - CONDA_RECIPE=bin/conda/libstatiskit_stl-dev
-    CONDA_VERSION=3
-  - CONDA_RECIPE=bin/conda/libstatiskit_stl
-  - CONDA_RECIPE=bin/conda/python-statiskit_stl
-    CONDA_VERSION=2
-  - CONDA_RECIPE=bin/conda/python-statiskit_stl
-    CONDA_VERSION=3
+  - CONDA_RECIPE=etc/conda/libstatiskit_stl-dev
+  - CONDA_RECIPE=etc/conda/libstatiskit_stl
+  - CONDA_RECIPE=etc/conda/python-statiskit_stl
 
 install:
   - git clone --depth=1 https://github.com/StatisKit/travis-ci.git travis-ci