Merge pull request #24 from pfernique/master

Update repository architecture
StatisKit · Jul 27, 2017 · 9f62217 · 9f62217
2 parents 312b6aa + 07136dc
commit 9f62217
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 5 deletions.
diff --git a/SConstruct b/SConstruct
@@ -10,6 +10,6 @@ VariantDir(os.path.join('build', 'test'), 'test')
 SConscript(os.path.join('build', 'src', 'cpp', 'SConscript'), exports="env")
 SConscript(os.path.join('build', 'src', 'py', 'wrapper', 'SConscript'), exports="env")
 SConscript(os.path.join('build', 'test', 'SConscript'), exports="env")
-SConscript(os.path.join('conda', 'SConscript'), exports="env")
+SConscript(os.path.join('bin', 'conda', 'SConscript'), exports="env")
 
 Default("install")
diff --git a/appveyor.yml b/appveyor.yml
@@ -4,8 +4,8 @@ platform:
 
 environment:
   matrix:
-    - RECIPE: libstatiskit_stl
-    - RECIPE: python-statiskit_stl
+    - CONDA_RECIPE: libstatiskit_stl
+    - CONDA_RECIPE: python-statiskit_stl
 
 install:
   - git clone https://github.com/StatisKit/appveyor-ci.git appveyor-ci

diff --git a/conda/SConscript → bin/conda/SConscript b/conda/SConscript → bin/conda/SConscript
diff --git a/conda/libstatiskit_stl/bld.bat → bin/conda/libstatiskit_stl/bld.bat b/conda/libstatiskit_stl/bld.bat → bin/conda/libstatiskit_stl/bld.bat
diff --git a/conda/libstatiskit_stl/build.sh → bin/conda/libstatiskit_stl/build.sh b/conda/libstatiskit_stl/build.sh → bin/conda/libstatiskit_stl/build.sh
diff --git a/conda/libstatiskit_stl/meta.yaml → bin/conda/libstatiskit_stl/meta.yaml b/conda/libstatiskit_stl/meta.yaml → bin/conda/libstatiskit_stl/meta.yaml
diff --git a/conda/python-statiskit_stl/bld.bat → bin/conda/python-statiskit_stl/bld.bat b/conda/python-statiskit_stl/bld.bat → bin/conda/python-statiskit_stl/bld.bat
diff --git a/conda/python-statiskit_stl/build.sh → bin/conda/python-statiskit_stl/build.sh b/conda/python-statiskit_stl/build.sh → bin/conda/python-statiskit_stl/build.sh
diff --git a/conda/python-statiskit_stl/meta.yaml → bin/conda/python-statiskit_stl/meta.yaml b/conda/python-statiskit_stl/meta.yaml → bin/conda/python-statiskit_stl/meta.yaml
diff --git a/travis.yml b/travis.yml
@@ -10,8 +10,8 @@ services:
   - docker
 
 env:
-  - RECIPE=libstatiskit_stl
-  - RECIPE=python-statiskit_stl
+  - CONDA_RECIPE=libstatiskit_stl
+  - CONDA_RECIPE=python-statiskit_stl
 
 install:
   - git clone https://github.com/StatisKit/travis-ci.git travis-ci