From 31efbf4fb0033b9f1fdfae0054ece1717ec05b79 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Sun, 15 Mar 2015 11:51:24 +0100 Subject: [PATCH] fix(travis): incorrectly capitalized cargo.toml This caused cargo on a case-sensitive file-system not to find the cargo file, which made it to look upwards in the directory structure to find the correctly named Cargo.toml fo the 'cmn' development project. --- etc/api/shared.yaml | 2 +- src/mako/{cargo.toml.mako => Cargo.toml.mako} | 0 src/mako/deps.mako | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) rename src/mako/{cargo.toml.mako => Cargo.toml.mako} (100%) diff --git a/etc/api/shared.yaml b/etc/api/shared.yaml index 3ff0e9c0858..de09e56e341 100644 --- a/etc/api/shared.yaml +++ b/etc/api/shared.yaml @@ -24,7 +24,7 @@ api: # all output directories are relative to the one set for the respective API - source: README.md - source: LICENSE.md - - source: cargo.toml + - source: Cargo.toml - source: lib.rs output_dir: src cargo: diff --git a/src/mako/cargo.toml.mako b/src/mako/Cargo.toml.mako similarity index 100% rename from src/mako/cargo.toml.mako rename to src/mako/Cargo.toml.mako diff --git a/src/mako/deps.mako b/src/mako/deps.mako index d4eb788419a..4cff644eb5b 100644 --- a/src/mako/deps.mako +++ b/src/mako/deps.mako @@ -62,10 +62,10 @@ ${gen_root_stamp}: ${' '.join(i[0] for i in sds)} ${api_json_inputs} $(MAKO_STAN ${api_name}: ${api_common} ${api_cargo}: ${api_name} - (cd ${gen_root} && cargo $(ARGS)) + cd ${gen_root} && cargo $(ARGS) ${api_doc_index}: ${api_name} - (cd ${gen_root} && cargo doc) + cd ${gen_root} && cargo doc @echo "Docs for ${api_name} at $@" ${api_doc}: ${api_doc_index}