Skip to content

W
White Rabbit Switch - Software
Commit 5f917e15 authored by Adam Wujek's avatar Adam Wujek 💬
Browse files
Options

print "-dirty" instead of "+" for version info 

Print "-dirty" for:
--at91boot
--startup guide
--switch's tools
Signed-off-by: Adam Wujek's avatarAdam Wujek <adam.wujek@cern.ch>
parent b9bd523c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
build/scripts/wrs_build_at91boot
View file @ 5f917e15
......@@ -17,7 +17,7 @@ wrs_download $tarname
#Export git version to the children call so that it can be use by Makefile
export WRS_GIT_USER="$(cd ${WRS_BASE_DIR} && git config --get user.name)"
export WRS_GIT_REV="$(cd ${WRS_BASE_DIR} && git describe --always --dirty=+)"
export WRS_GIT_REV="$(cd ${WRS_BASE_DIR} && git describe --always --dirty)"
mkdir -p $WRS_OUTPUT_DIR/build || wrs_die "mkdir build"
mkdir -p $WRS_OUTPUT_DIR/images || wrs_die "mkdir images"
......
doc/startup-guide/Makefile
View file @ 5f917e15
......@@ -33,7 +33,7 @@ TEMPLATEARG=--template=$(TEMPLATE)
endif
## Obtain the version
VERSION = $(shell git describe --always --dirty=+ | sed 's;^wr-switch-sw-;;')
VERSION = $(shell git describe --always --dirty | sed 's;^wr-switch-sw-;;')
DATE = $(shell date +"%d %b. %Y")
#--highlight-style=pygments (the default), kate, monochrome, espresso, haddock, and tango
......
userspace/tools/Makefile
View file @ 5f917e15
......@@ -34,7 +34,7 @@ CFLAGS = -O2 -g -Wall \
-I../ppsi/arch-wrs/include
# for wrs_version alone (but others may use this)
GIT_VER = $(shell git describe --always --dirty=+ | sed 's;^wr-switch-sw-;;')
GIT_VER = $(shell git describe --always --dirty | sed 's;^wr-switch-sw-;;')
GIT_USR = $(shell git config --get-all user.name)
CFLAGS += -D__GIT_USR__="\"${GIT_USR}\"" -D__GIT_VER__="\"${GIT_VER}\""
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment