pull/193/head
Thorsten von Eicken 8 years ago
parent ebb91ef00c
commit 5ff1bbddf7
  1. 8
      .travis.yml
  2. 5
      Makefile

@ -4,7 +4,7 @@ language: c
before_install: before_install:
- curl -Ls http://s3.voneicken.com/xtensa-lx106-elf-20160330.tgx | tar Jxf - - 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: after_script:
# upload to an S3 bucket, requires S3_BUCKET, AWS_ACCESS_KEY_ID and AWS_SECRET_KEY to be set # 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: script:
- export XTENSA_TOOLS_ROOT=$PWD/xtensa-lx106-elf/bin/ - 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 - make release
notifications: notifications:

@ -186,15 +186,12 @@ endif
# Steps to release: create release on github, git pull, git describe --tags to verify you're # 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 # on the release tag, make release, upload esp-link.tgz into the release files
#VERSION ?= "esp-link custom version" #VERSION ?= "esp-link custom version"
$(warning Hello 1)
DATE := $(shell date '+%F %T') DATE := $(shell date '+%F %T')
BRANCH ?= $(shell if git diff --quiet HEAD; then git describe --tags; \ BRANCH ?= $(shell if git diff --quiet HEAD; then git describe --tags; \
else git symbolic-ref --short HEAD; fi) 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; \ SHA := $(shell if git diff --quiet HEAD; then git rev-parse --short HEAD | cut -d"/" -f 3; \
else echo "development"; fi) else echo "development"; fi)
VERSION ?=esp-link $(BRANCH) - $(DATE) - $(SHA) VERSION ?=esp-link $(BRANCH) - $(DATE) - $(SHA)
$(warning Hello 3)
# Output directors to store intermediate compiled files # Output directors to store intermediate compiled files
# relative to the project directory # relative to the project directory
@ -257,6 +254,7 @@ SDK_LDDIR = ld
SDK_INCDIR = include include/json SDK_INCDIR = include include/json
SDK_TOOLSDIR = tools SDK_TOOLSDIR = tools
$(warning Hello 1)
# select which tools to use as compiler, librarian and linker # select which tools to use as compiler, librarian and linker
CC := $(XTENSA_TOOLS_ROOT)xtensa-lx106-elf-gcc CC := $(XTENSA_TOOLS_ROOT)xtensa-lx106-elf-gcc
AR := $(XTENSA_TOOLS_ROOT)xtensa-lx106-elf-ar AR := $(XTENSA_TOOLS_ROOT)xtensa-lx106-elf-ar
@ -341,6 +339,7 @@ $1/%.o: %.c
$(vecho) "CC $$<" $(vecho) "CC $$<"
$(Q)$(CC) $(INCDIR) $(MODULE_INCDIR) $(EXTRA_INCDIR) $(SDK_INCDIR) $(CFLAGS) -c $$< -o $$@ $(Q)$(CC) $(INCDIR) $(MODULE_INCDIR) $(EXTRA_INCDIR) $(SDK_INCDIR) $(CFLAGS) -c $$< -o $$@
endef endef
$(warning Hello 2)
.PHONY: all checkdirs clean webpages.espfs wiflash .PHONY: all checkdirs clean webpages.espfs wiflash

Loading…
Cancel
Save