deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Support setting the RELSTR

Browse source 
To build identical binaries the RELSTR must be identical, too.
This commit is contained in:
Moritz 'Morty' Strübe 2014-10-14 10:00:28 +02:00
parent 1692169138
commit 192d87fa48
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -5,6 +5,9 @@ before_script:
- WGET="travis_retry wget --continue --tries=20 --waitretry=10 --retry-connrefused --no-dns-cache --timeout 300" - WGET="travis_retry wget --continue --tries=20 --waitretry=10 --retry-connrefused --no-dns-cache --timeout 300"
- sudo apt-get -qq update - sudo apt-get -qq update
## Support building the same binary as on CI
- echo -n "Contiki will be compiled with RELSTR=" ; git --git-dir .git describe --tags --always
## Install msp430 toolchain ## Install msp430 toolchain
- sudo apt-get -qq install lib32z1 - sudo apt-get -qq install lib32z1
- $WGET http://adamdunkels.github.io/contiki-fork/mspgcc-4.7.0-compiled.tar.bz2 && - $WGET http://adamdunkels.github.io/contiki-fork/mspgcc-4.7.0-compiled.tar.bz2 &&

6
Makefile.include
View file

@ -152,8 +152,10 @@ CFLAGS += ${addprefix -I,$(SOURCEDIRS) $(CONTIKI)}
### Check for a git repo and pass version if found ### Check for a git repo and pass version if found
### git.exe in Windows cmd shells may require no stderr redirection ### git.exe in Windows cmd shells may require no stderr redirection
#RELSTR=${shell git describe --tags} ifndef RELSTR
RELSTR:=${shell git --git-dir ${CONTIKI}/.git describe --tags 2>/dev/null} RELSTR:=${shell git --git-dir ${CONTIKI}/.git describe --tags --always}
endif
ifneq ($(RELSTR),) ifneq ($(RELSTR),)
CFLAGS += -DCONTIKI_VERSION_STRING=\"Contiki-$(RELSTR)\" CFLAGS += -DCONTIKI_VERSION_STRING=\"Contiki-$(RELSTR)\"
endif endif