From db8edd7f4ed463bb251b36e73a91ecbe3faa386d Mon Sep 17 00:00:00 2001 From: Daniel Grunwald Date: Sun, 17 May 2015 21:35:04 +0200 Subject: [PATCH] Fix build --- .travis.yml | 8 ++------ Cargo.toml | 6 ++++-- Makefile | 2 +- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 65f738c4..20bd3be5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,13 +2,9 @@ language: rust env: global: - secure: g4kCg8twONwKPquuJmYrvGjo2n0lNtWTbyzFOITNn8FgCxNK2j38Qc9/UhErTR3g3rDjVzsTHZ8FTH7TJZrOK1Nzz90tJG6JHqUv77ufkcBlxgwwjilOz84uQhkDTMpLitMEeQDLEynKeWbxrjtc5LIpjEkxOPk5eiqwzKRN14c= -before_script: - - mkdir -p .cargo && echo 'paths = ["python27-sys"]' > .cargo/config script: - cargo build --verbose - cargo test --verbose - - cargo doc --verbose -after_script: - - mv target/doc doc - - curl http://www.rust-ci.org/artifacts/put?t=$RUSTCI_TOKEN | sh +# 'cargo doc' is broken due to https://github.com/rust-lang/cargo/issues/1622 +# - cargo doc --verbose diff --git a/Cargo.toml b/Cargo.toml index 85f02988..532af2b9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -17,6 +17,8 @@ license = "MIT" exclude = [ ".gitignore", ".travis.yml", + "python27-sys", + "python32-sys", ] build = "build.rs" @@ -24,6 +26,6 @@ build = "build.rs" libc="*" num="*" -# TODO: crates.io version doesn't have necessary conditional cfg flags yet [dependencies.python27-sys] -git = "https://github.com/dgrunwald/rust-cpython.git" +path="python27-sys" + diff --git a/Makefile b/Makefile index 494150ff..7245a1f3 100644 --- a/Makefile +++ b/Makefile @@ -19,7 +19,7 @@ clean: make -C extensions/ clean gh-pages: - git checkout --branch gh-pages git@github.com:dgrunwald/rust-cpython.git + git clone --branch gh-pages git@github.com:dgrunwald/rust-cpython.git gh-pages .PHONY: gh-pages-doc gh-pages-doc: doc | gh-pages