From 48eae9568fdfdc419e98da4a74bc4979de64ec52 Mon Sep 17 00:00:00 2001 From: Jürgen Knödlseder Date: Tue, 21 Nov 2017 23:05:20 +0100 Subject: [PATCH] Rename dev/conda-recipes to dev/conda.recipe --- .gitignore | 2 +- configure.ac | 2 +- dev/conda-recipe/build.sh | 16 ---------------- dev/conda-recipe/conda_build_config.yaml | 4 ---- dev/conda-recipe/meta.yaml.in | 30 ------------------------------ dev/conda.recipe/build.sh | 16 ++++++++++++++++ dev/conda.recipe/conda_build_config.yaml | 4 ++++ dev/conda.recipe/meta.yaml.in | 30 ++++++++++++++++++++++++++++++ 8 files changed, 52 insertions(+), 52 deletions(-) delete mode 100755 dev/conda-recipe/build.sh delete mode 100644 dev/conda-recipe/conda_build_config.yaml delete mode 100644 dev/conda-recipe/meta.yaml.in create mode 100755 dev/conda.recipe/build.sh create mode 100644 dev/conda.recipe/conda_build_config.yaml create mode 100644 dev/conda.recipe/meta.yaml.in diff --git a/.gitignore b/.gitignore index d25da12..d4b61fe 100644 --- a/.gitignore +++ b/.gitignore @@ -20,7 +20,7 @@ inst/mwl/test/*.trs pyext/gammalib/*.py pyext/gammalib/*.cpp pyext/setup.py -dev/conda-recipe/meta.yaml +dev/conda.recipe/meta.yaml m4/libtool.m4 m4/ltoptions.m4 m4/ltsugar.m4 diff --git a/configure.ac b/configure.ac index aef47ed..bfa76ef 100644 --- a/configure.ac +++ b/configure.ac @@ -1444,7 +1444,7 @@ AC_CONFIG_FILES([Makefile pyext/Makefile pyext/setup.py pyext/gammalib/__init__.py - dev/conda-recipes/meta.yaml + dev/conda.recipe/meta.yaml examples/Makefile examples/cpp/Makefile gammalib.pc diff --git a/dev/conda-recipe/build.sh b/dev/conda-recipe/build.sh deleted file mode 100755 index 67e4a05..0000000 --- a/dev/conda-recipe/build.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -# Set Mac OS X minimum deployment target -if [ `uname` == Darwin ]; then - export CXXFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" - export LDFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" -fi - -# Configure GammaLib -./configure --prefix="$PREFIX" - -# Build -make - -# Install -make install diff --git a/dev/conda-recipe/conda_build_config.yaml b/dev/conda-recipe/conda_build_config.yaml deleted file mode 100644 index 21ce93b..0000000 --- a/dev/conda-recipe/conda_build_config.yaml +++ /dev/null @@ -1,4 +0,0 @@ -python: - - 2.7 - - 3.5 - - 3.6 diff --git a/dev/conda-recipe/meta.yaml.in b/dev/conda-recipe/meta.yaml.in deleted file mode 100644 index 3f32616..0000000 --- a/dev/conda-recipe/meta.yaml.in +++ /dev/null @@ -1,30 +0,0 @@ -package: - name: gammalib - version: "@VERSION@" - - -source: - fn: gammalib-@VERSION@.tar.gz - url: http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-@VERSION@.tar.gz - #md5: a2751da55f7b97d48db57156e8096792 - -build: - number: 1 - binary_relocation: True - detect_binary_files_with_prefix: True - -requirements: - build: - - python - - setuptools - - cfitsio - - readline - - ncurses - - swig - run: - - python - - cfitsio - -about: - home: http://cta.irap.omp.eu/gammalib - license: GPL3 diff --git a/dev/conda.recipe/build.sh b/dev/conda.recipe/build.sh new file mode 100755 index 0000000..67e4a05 --- /dev/null +++ b/dev/conda.recipe/build.sh @@ -0,0 +1,16 @@ +#!/bin/bash + +# Set Mac OS X minimum deployment target +if [ `uname` == Darwin ]; then + export CXXFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" + export LDFLAGS="-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET}" +fi + +# Configure GammaLib +./configure --prefix="$PREFIX" + +# Build +make + +# Install +make install diff --git a/dev/conda.recipe/conda_build_config.yaml b/dev/conda.recipe/conda_build_config.yaml new file mode 100644 index 0000000..21ce93b --- /dev/null +++ b/dev/conda.recipe/conda_build_config.yaml @@ -0,0 +1,4 @@ +python: + - 2.7 + - 3.5 + - 3.6 diff --git a/dev/conda.recipe/meta.yaml.in b/dev/conda.recipe/meta.yaml.in new file mode 100644 index 0000000..3f32616 --- /dev/null +++ b/dev/conda.recipe/meta.yaml.in @@ -0,0 +1,30 @@ +package: + name: gammalib + version: "@VERSION@" + + +source: + fn: gammalib-@VERSION@.tar.gz + url: http://cta.irap.omp.eu/ctools/releases/gammalib/gammalib-@VERSION@.tar.gz + #md5: a2751da55f7b97d48db57156e8096792 + +build: + number: 1 + binary_relocation: True + detect_binary_files_with_prefix: True + +requirements: + build: + - python + - setuptools + - cfitsio + - readline + - ncurses + - swig + run: + - python + - cfitsio + +about: + home: http://cta.irap.omp.eu/gammalib + license: GPL3 -- libgit2 0.21.4