From 8b427d82acfaeb4671484bc459343c5e2e412736 Mon Sep 17 00:00:00 2001
From: Edoardo Pasca <edo.paskino@gmail.com>
Date: Thu, 19 Oct 2017 17:01:55 +0100
Subject: Initial revision of build environment made with CMake

Initial revision of build environment made with CMake

First commit of CMakeLists.txt

attempt to use CMake to create the build environment

First commit of CMakeLists.txt

attempting to locate conda python environment

Added a few files for CMake

Many changes for the CMake compilation.

Tested CMake build

Bugfixes
---
 src/Python/conda-recipe/bld.bat   | 14 ++++++++++++++
 src/Python/conda-recipe/build.sh  | 14 ++++++++++++++
 src/Python/conda-recipe/meta.yaml | 30 ++++++++++++++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 src/Python/conda-recipe/bld.bat
 create mode 100644 src/Python/conda-recipe/build.sh
 create mode 100644 src/Python/conda-recipe/meta.yaml

(limited to 'src/Python/conda-recipe')

diff --git a/src/Python/conda-recipe/bld.bat b/src/Python/conda-recipe/bld.bat
new file mode 100644
index 0000000..69491de
--- /dev/null
+++ b/src/Python/conda-recipe/bld.bat
@@ -0,0 +1,14 @@
+IF NOT DEFINED CIL_VERSION (
+ECHO CIL_VERSION Not Defined.
+exit 1
+)
+
+mkdir "%SRC_DIR%\ccpi"
+xcopy /e "%RECIPE_DIR%\..\.." "%SRC_DIR%\ccpi"
+
+cd %SRC_DIR%\ccpi\Python
+
+%PYTHON% setup.py build_ext
+if errorlevel 1 exit 1
+%PYTHON% setup.py install
+if errorlevel 1 exit 1
diff --git a/src/Python/conda-recipe/build.sh b/src/Python/conda-recipe/build.sh
new file mode 100644
index 0000000..855047f
--- /dev/null
+++ b/src/Python/conda-recipe/build.sh
@@ -0,0 +1,14 @@
+
+if [ -z "$CIL_VERSION" ]; then
+    echo "Need to set CIL_VERSION"
+    exit 1
+fi  
+mkdir "$SRC_DIR/ccpi"
+cp -r "$RECIPE_DIR/../.." "$SRC_DIR/ccpi"
+
+cd $SRC_DIR/ccpi/Python
+
+$PYTHON setup.py build_ext
+$PYTHON setup.py install
+
+
diff --git a/src/Python/conda-recipe/meta.yaml b/src/Python/conda-recipe/meta.yaml
new file mode 100644
index 0000000..c5b7a89
--- /dev/null
+++ b/src/Python/conda-recipe/meta.yaml
@@ -0,0 +1,30 @@
+package:
+  name: ccpi-fista
+  version: {{ environ['CIL_VERSION'] }}
+
+
+build:
+  preserve_egg_dir: False
+  script_env:
+    - CIL_VERSION   
+#  number: 0
+  
+requirements:
+  build:
+    - python
+    - numpy
+    - setuptools
+    - boost ==1.64
+    - boost-cpp ==1.64
+    - cython
+
+  run:
+    - python
+    - numpy
+    - boost ==1.64
+
+	
+about:
+  home: http://www.ccpi.ac.uk
+  license:  BSD license
+  summary: 'CCPi Core Imaging Library Quantification Toolbox'
-- 
cgit v1.2.3


From 4fd4f187a70c0e4f56d5194b09ab4a528d20ee51 Mon Sep 17 00:00:00 2001
From: Edoardo Pasca <edo.paskino@gmail.com>
Date: Tue, 24 Oct 2017 10:38:37 +0100
Subject: Builds 2 packages fista and regularizers

---
 src/Python/conda-recipe/meta.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/Python/conda-recipe')

diff --git a/src/Python/conda-recipe/meta.yaml b/src/Python/conda-recipe/meta.yaml
index c5b7a89..7068e9d 100644
--- a/src/Python/conda-recipe/meta.yaml
+++ b/src/Python/conda-recipe/meta.yaml
@@ -1,5 +1,5 @@
 package:
-  name: ccpi-fista
+  name: ccpi-regularizers
   version: {{ environ['CIL_VERSION'] }}
 
 
-- 
cgit v1.2.3