From 5ff1bbddf78ba6ce0a57250e84a74a895f120d7d Mon Sep 17 00:00:00 2001
From: Thorsten von Eicken <tve@rightscale.com>
Date: Thu, 22 Sep 2016 23:35:58 -0700
Subject: [PATCH] fix travis #6

---
 .travis.yml | 8 ++++++--
 Makefile    | 5 ++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6f10a16..e8b8f47 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@ language: c
 
 before_install:
   - curl -Ls http://s3.voneicken.com/xtensa-lx106-elf-20160330.tgx | tar Jxf -
-  - curl -Ls http://s3.voneicken.com/esp_iot_sdk_v2.0.0.p1.tgx | tar Jxf -
+  - curl -Ls http://s3.voneicken.com/esp_iot_sdk_v2.0.0.p1.tgx | tar -C .. Jxf -
 
 after_script:
  # upload to an S3 bucket, requires S3_BUCKET, AWS_ACCESS_KEY_ID and AWS_SECRET_KEY to be set
@@ -23,7 +23,11 @@ env:
 
 script:
   - export XTENSA_TOOLS_ROOT=$PWD/xtensa-lx106-elf/bin/
-  - export SDK_BASE=$PWD/esp_iot_sdk_v2.0.0.p1
+  - export BRANCH=$TRAVIS_BRANCH
+    #- export SDK_BASE=$PWD/esp_iot_sdk_v2.0.0.p1
+  - ls
+  - ls ..
+  - echo $PWD
   - make release
 
 notifications:
diff --git a/Makefile b/Makefile
index e43d471..92d0ac7 100644
--- a/Makefile
+++ b/Makefile
@@ -186,15 +186,12 @@ endif
 # Steps to release: create release on github, git pull, git describe --tags to verify you're
 # on the release tag, make release, upload esp-link.tgz into the release files
 #VERSION ?= "esp-link custom version"
-$(warning Hello 1)
 DATE    := $(shell date '+%F %T')
 BRANCH  ?= $(shell if git diff --quiet HEAD; then git describe --tags; \
                    else git symbolic-ref --short HEAD; fi)
-$(warning Hello 2)
 SHA     := $(shell if git diff --quiet HEAD; then git rev-parse --short HEAD | cut -d"/" -f 3; \
                    else echo "development"; fi)
 VERSION ?=esp-link $(BRANCH) - $(DATE) - $(SHA)
-$(warning Hello 3)
 
 # Output directors to store intermediate compiled files
 # relative to the project directory
@@ -257,6 +254,7 @@ SDK_LDDIR	= ld
 SDK_INCDIR	= include include/json
 SDK_TOOLSDIR	= tools
 
+$(warning Hello 1)
 # select which tools to use as compiler, librarian and linker
 CC		:= $(XTENSA_TOOLS_ROOT)xtensa-lx106-elf-gcc
 AR		:= $(XTENSA_TOOLS_ROOT)xtensa-lx106-elf-ar
@@ -341,6 +339,7 @@ $1/%.o: %.c
 	$(vecho) "CC $$<"
 	$(Q)$(CC) $(INCDIR) $(MODULE_INCDIR) $(EXTRA_INCDIR) $(SDK_INCDIR) $(CFLAGS)  -c $$< -o $$@
 endef
+$(warning Hello 2)
 
 .PHONY: all checkdirs clean webpages.espfs wiflash