From b9fafd363d1d181a4a8b42ea4038924097207913 Mon Sep 17 00:00:00 2001
From: Daniil Kazantsev <dkazanc@hotmail.com>
Date: Mon, 9 Apr 2018 13:41:06 +0100
Subject: major renaming and new  3D demos for Matlab

---
 recipes/regularisers/bld.bat   | 21 +++++++++++++++++++++
 recipes/regularisers/build.sh  | 19 +++++++++++++++++++
 recipes/regularisers/meta.yaml | 40 ++++++++++++++++++++++++++++++++++++++++
 recipes/regularizers/bld.bat   | 21 ---------------------
 recipes/regularizers/build.sh  | 19 -------------------
 recipes/regularizers/meta.yaml | 40 ----------------------------------------
 6 files changed, 80 insertions(+), 80 deletions(-)
 create mode 100644 recipes/regularisers/bld.bat
 create mode 100644 recipes/regularisers/build.sh
 create mode 100644 recipes/regularisers/meta.yaml
 delete mode 100644 recipes/regularizers/bld.bat
 delete mode 100644 recipes/regularizers/build.sh
 delete mode 100644 recipes/regularizers/meta.yaml

(limited to 'recipes')

diff --git a/recipes/regularisers/bld.bat b/recipes/regularisers/bld.bat
new file mode 100644
index 0000000..6f2f7e7
--- /dev/null
+++ b/recipes/regularisers/bld.bat
@@ -0,0 +1,21 @@
+IF NOT DEFINED CIL_VERSION (
+ECHO CIL_VERSION Not Defined.
+exit 1
+)
+
+mkdir "%SRC_DIR%\build"
+ROBOCOPY /E "%RECIPE_DIR%\..\..\Core" "%SRC_DIR%\build"
+::ROBOCOPY /E "%RECIPE_DIR%\..\..\Wrappers\python\src" "%SRC_DIR%\build\module"
+cd "%SRC_DIR%\build"
+
+echo "we should be in %SRC_DIR%\build"
+
+cmake -G "NMake Makefiles" -DLIBRARY_LIB="%CONDA_PREFIX%\lib" -DLIBRARY_INC="%CONDA_PREFIX%" -DCMAKE_INSTALL_PREFIX="%PREFIX%\Library" "%SRC_DIR%\build"
+
+::-DBOOST_LIBRARYDIR="%CONDA_PREFIX%\Library\lib" -DBOOST_INCLUDEDIR="%CONDA_PREFIX%\Library\include" -DBOOST_ROOT="%CONDA_PREFIX%\Library\lib"
+
+:: Build C library
+nmake install
+if errorlevel 1 exit 1
+
+:: Install step
diff --git a/recipes/regularisers/build.sh b/recipes/regularisers/build.sh
new file mode 100644
index 0000000..0b8bce2
--- /dev/null
+++ b/recipes/regularisers/build.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+echo $CIL_VERSION
+#if [ -z "$CIL_VERSION" ]; then
+#    echo "Need to set CIL_VERSION"
+#    exit 1
+#fi  
+#export CIL_VERSION=0.9.1
+
+
+
+mkdir ${SRC_DIR}/build
+cp -rv ${RECIPE_DIR}/../../Core/ ${SRC_DIR}/build
+mkdir ${SRC_DIR}/build/build
+cd ${SRC_DIR}/build/build
+cmake -G "Unix Makefiles" -DLIBRARY_LIB="${CONDA_PREFIX}/lib" -DLIBRARY_INC="${CONDA_PREFIX}" -DCMAKE_INSTALL_PREFIX="${PREFIX}" ../Core
+
+make -j2 VERBOSE=1
+make install
diff --git a/recipes/regularisers/meta.yaml b/recipes/regularisers/meta.yaml
new file mode 100644
index 0000000..f204a6b
--- /dev/null
+++ b/recipes/regularisers/meta.yaml
@@ -0,0 +1,40 @@
+package:
+  name: cil_regulariser
+  version: {{ environ['CIL_VERSION'] }}
+
+#source:
+ # path: ../
+
+build:
+  preserve_egg_dir: False
+  script_env: 
+    - CIL_VERSION
+
+requirements:
+  build:
+    - boost ==1.64.0	
+    - boost-cpp ==1.64.0 
+#    - toolchain
+    - python 3.5 # [py35]
+    - python 2.7 # [py27]
+    - cmake >=3.1
+#    - zlib 1.2.11
+    - vc 14 # [win and py35] 
+    - vc 9  # [win and py27]
+#    - libtiff    
+    - numpy
+
+  run:
+    - boost ==1.64.0
+#    - libtiff
+    - vc 14 # [win and py35]
+    - vc 9  # [win and py27]
+    - python 3.5 # [py35]
+    - python 2.7 # [py27]
+    - numpy
+
+
+about:
+  home: http://www.ccpi.ac.uk
+  license: Apache v2.0
+  summary: Regulariser package from CCPi
diff --git a/recipes/regularizers/bld.bat b/recipes/regularizers/bld.bat
deleted file mode 100644
index 6f2f7e7..0000000
--- a/recipes/regularizers/bld.bat
+++ /dev/null
@@ -1,21 +0,0 @@
-IF NOT DEFINED CIL_VERSION (
-ECHO CIL_VERSION Not Defined.
-exit 1
-)
-
-mkdir "%SRC_DIR%\build"
-ROBOCOPY /E "%RECIPE_DIR%\..\..\Core" "%SRC_DIR%\build"
-::ROBOCOPY /E "%RECIPE_DIR%\..\..\Wrappers\python\src" "%SRC_DIR%\build\module"
-cd "%SRC_DIR%\build"
-
-echo "we should be in %SRC_DIR%\build"
-
-cmake -G "NMake Makefiles" -DLIBRARY_LIB="%CONDA_PREFIX%\lib" -DLIBRARY_INC="%CONDA_PREFIX%" -DCMAKE_INSTALL_PREFIX="%PREFIX%\Library" "%SRC_DIR%\build"
-
-::-DBOOST_LIBRARYDIR="%CONDA_PREFIX%\Library\lib" -DBOOST_INCLUDEDIR="%CONDA_PREFIX%\Library\include" -DBOOST_ROOT="%CONDA_PREFIX%\Library\lib"
-
-:: Build C library
-nmake install
-if errorlevel 1 exit 1
-
-:: Install step
diff --git a/recipes/regularizers/build.sh b/recipes/regularizers/build.sh
deleted file mode 100644
index 0b8bce2..0000000
--- a/recipes/regularizers/build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-echo $CIL_VERSION
-#if [ -z "$CIL_VERSION" ]; then
-#    echo "Need to set CIL_VERSION"
-#    exit 1
-#fi  
-#export CIL_VERSION=0.9.1
-
-
-
-mkdir ${SRC_DIR}/build
-cp -rv ${RECIPE_DIR}/../../Core/ ${SRC_DIR}/build
-mkdir ${SRC_DIR}/build/build
-cd ${SRC_DIR}/build/build
-cmake -G "Unix Makefiles" -DLIBRARY_LIB="${CONDA_PREFIX}/lib" -DLIBRARY_INC="${CONDA_PREFIX}" -DCMAKE_INSTALL_PREFIX="${PREFIX}" ../Core
-
-make -j2 VERBOSE=1
-make install
diff --git a/recipes/regularizers/meta.yaml b/recipes/regularizers/meta.yaml
deleted file mode 100644
index 37e447e..0000000
--- a/recipes/regularizers/meta.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-package:
-  name: cil_regularizer
-  version: {{ environ['CIL_VERSION'] }}
-
-#source:
- # path: ../
-
-build:
-  preserve_egg_dir: False
-  script_env: 
-    - CIL_VERSION
-
-requirements:
-  build:
-    - boost ==1.64.0	
-    - boost-cpp ==1.64.0 
-#    - toolchain
-    - python 3.5 # [py35]
-    - python 2.7 # [py27]
-    - cmake >=3.1
-#    - zlib 1.2.11
-    - vc 14 # [win and py35] 
-    - vc 9  # [win and py27]
-#    - libtiff    
-    - numpy
-
-  run:
-    - boost ==1.64.0
-#    - libtiff
-    - vc 14 # [win and py35]
-    - vc 9  # [win and py27]
-    - python 3.5 # [py35]
-    - python 2.7 # [py27]
-    - numpy
-
-
-about:
-  home: http://www.ccpi.ac.uk
-  license: Apache v2.0
-  summary: Regularizer package from CCPi
-- 
cgit v1.2.3