From 06e87bf5923cdde8c9821cc5e8c72c4e4853ac9a Mon Sep 17 00:00:00 2001 From: Snaipe Date: Thu, 3 Sep 2015 18:00:37 +0200 Subject: [PATCH] Added dyncall dependency installation --- .ci/install-dependencies.sh | 4 ++++ .ci/install-dyncall.sh | 12 ++++++++++++ .gitignore | 1 + .travis.yml | 2 +- appveyor.yml | 3 ++- 5 files changed, 20 insertions(+), 2 deletions(-) create mode 100755 .ci/install-dependencies.sh create mode 100755 .ci/install-dyncall.sh diff --git a/.ci/install-dependencies.sh b/.ci/install-dependencies.sh new file mode 100755 index 0000000..20d3273 --- /dev/null +++ b/.ci/install-dependencies.sh @@ -0,0 +1,4 @@ +#!/bin/sh + +./.ci/install-dyncall.sh +./.ci/install-libcsptr.sh diff --git a/.ci/install-dyncall.sh b/.ci/install-dyncall.sh new file mode 100755 index 0000000..142da7d --- /dev/null +++ b/.ci/install-dyncall.sh @@ -0,0 +1,12 @@ +#!/bin/bash +repo="https://github.com/Snaipe/dyncall.git" +tag="master" + +mkdir -p dependencies +git clone --branch ${tag} --depth 1 ${repo} dependencies/dyncall && +( + cd dependencies/dyncall && + ./configure --prefix=$LOCAL_INSTALL + make && + make install +) diff --git a/.gitignore b/.gitignore index 8dd4a19..4da1b50 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ !.gitignore !.bumpversion.cfg +!.ci/* !*.c !*.h diff --git a/.travis.yml b/.travis.yml index 4df2cb7..6b8e2e4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ compiler: sudo: false before_install: - export LOCAL_INSTALL="$HOME" -- ".ci/install-libcsptr.sh" +- ".ci/install-dependencies.sh" - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$HOME/lib - export CFLAGS="-g -O0" script: diff --git a/appveyor.yml b/appveyor.yml index 1f74e15..ee761a2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -27,7 +27,8 @@ configuration: Release install: # Hack to make git think it is on the tip of the repo branch - 'git checkout -B %APPVEYOR_REPO_BRANCH%' - # Install libcsptr + # Install dependencies + - 'bash -lc "cd $APPVEYOR_BUILD_FOLDER; .ci/install-dyncall.sh; true"' - 'bash -lc "cd $APPVEYOR_BUILD_FOLDER; .ci/install-libcsptr.sh -G \"MSYS Makefiles\"; true"' # We need to manually make since the above command somehow crashes - 'cd dependencies/libcsptr/build && make && make install && cd ../../../'