Browse Source

Travis & gitian-osx: Use depends for ds_store and mac_alias modules

0.13
Luke Dashjr 9 years ago
parent
commit
c39a6fffd7
  1. 3
      .travis.yml
  2. 5
      contrib/gitian-descriptors/gitian-osx.yml

3
.travis.yml

@ -41,7 +41,7 @@ matrix:
- compiler: ": No wallet" - compiler: ": No wallet"
env: HOST=x86_64-unknown-linux-gnu DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports" env: HOST=x86_64-unknown-linux-gnu DEP_OPTS="NO_WALLET=1" RUN_TESTS=true GOAL="install" BITCOIN_CONFIG="--enable-glibc-back-compat --enable-reduce-exports"
- compiler: ": Cross-Mac" - compiler: ": Cross-Mac"
env: HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev python-pip" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.9 GOAL="deploy" env: HOST=x86_64-apple-darwin11 PACKAGES="cmake imagemagick libcap-dev librsvg2-bin libz-dev libbz2-dev libtiff-tools python-dev" BITCOIN_CONFIG="--enable-reduce-exports" OSX_SDK=10.9 GOAL="deploy"
exclude: exclude:
- compiler: gcc - compiler: gcc
install: install:
@ -49,7 +49,6 @@ install:
- if [ -n "$PPA" ]; then travis_retry sudo add-apt-repository "$PPA" -y; fi - if [ -n "$PPA" ]; then travis_retry sudo add-apt-repository "$PPA" -y; fi
- if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get update; fi - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get update; fi
- if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES; fi - if [ -n "$PACKAGES" ]; then travis_retry sudo apt-get install --no-install-recommends --no-upgrade -qq $PACKAGES; fi
- if [[ "$HOST" =~ apple ]]; then pip install --user mac_alias ds_store; export PATH="$HOME/.local/bin:$PATH"; ( wget 'https://bitbucket.org/al45tair/ds_store/get/c80c23706eae.tar.gz' && tar -xzvpf c80c23706eae.tar.gz && cd al45tair-ds_store-c80c23706eae/ && python setup.py install --user; ) fi
before_script: before_script:
- unset CC; unset CXX - unset CC; unset CXX
- mkdir -p depends/SDKs depends/sdk-sources - mkdir -p depends/SDKs depends/sdk-sources

5
contrib/gitian-descriptors/gitian-osx.yml

@ -22,7 +22,6 @@ packages:
- "libz-dev" - "libz-dev"
- "libbz2-dev" - "libbz2-dev"
- "python-dev" - "python-dev"
- "python-pip"
- "fonts-tuffy" - "fonts-tuffy"
reference_datetime: "2015-06-01 00:00:00" reference_datetime: "2015-06-01 00:00:00"
remotes: remotes:
@ -31,10 +30,6 @@ remotes:
files: files:
- "MacOSX10.9.sdk.tar.gz" - "MacOSX10.9.sdk.tar.gz"
script: | script: |
# FIXME: We should probably install these in some other (cachable) way, but the depends system doesn't appear to make native packages available to Core's build system itself?
pip install --user mac_alias ds_store
export PATH="$HOME/.local/bin:$PATH"
WRAP_DIR=$HOME/wrapped WRAP_DIR=$HOME/wrapped
HOSTS="x86_64-apple-darwin11" HOSTS="x86_64-apple-darwin11"
CONFIGFLAGS="--enable-reduce-exports GENISOIMAGE=$WRAP_DIR/genisoimage" CONFIGFLAGS="--enable-reduce-exports GENISOIMAGE=$WRAP_DIR/genisoimage"

Loading…
Cancel
Save