diff options
| author | Joerg Koenig <jck@techsat.com> | 2017-11-06 21:07:21 (GMT) |
|---|---|---|
| committer | Joerg Koenig <jck@techsat.com> | 2017-11-06 21:07:21 (GMT) |
| commit | d407e09d669cb65287816dbe99b163448452d135 (patch) | |
| tree | caf3d205732dd6bfe376630d96974ef9c26110dd | |
| parent | 1adfb669d7f5f7506a88abf6618f12b2314d885d (diff) | |
| download | crossppc-d407e09d669cb65287816dbe99b163448452d135.zip crossppc-d407e09d669cb65287816dbe99b163448452d135.tar.gz crossppc-d407e09d669cb65287816dbe99b163448452d135.tar.bz2 | |
Respect Jenkins BUILD_NUMBER
Change-Id: Ia92190f9e0bbff64ac51843ee9bc1925f06312b0
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | Makefile.7.2 | 11 |
2 files changed, 18 insertions, 3 deletions
@@ -1,4 +1,11 @@ CWD = $(shell readlink -f .) + +ifeq ($(BUILD_NUMBER),) +BUILD_NO=0 +else +BUILD_NO=$(BUILD_NUMBER) +endif + VERSION=0.4.1 SRCDIR=$(CWD)/SOURCES BUILDDIR=$(CWD)/build @@ -10,7 +17,8 @@ MASCH=$(shell uname -m) INSTDIR=$(CWD)/inst/crossppc GCC_VERSION=3.0.4 LANGUAGES=c -PACKAGE=$(CWD)/vxw55-crossppc-$(GCC_VERSION)-$(HOST).tar.gz +PACKAGE=$(CWD)/vxw55-crossppc-$(GCC_VERSION)-$(BUILD_NO)-$(HOST).tar.gz + ifeq ($(WIND_BASE),) $(error WIND_BASE not specified ) diff --git a/Makefile.7.2 b/Makefile.7.2 index 4d3a8ad..511b8fb 100644 --- a/Makefile.7.2 +++ b/Makefile.7.2 @@ -1,4 +1,11 @@ CWD = $(shell readlink -f .) + +ifeq ($(BUILD_NUMBER),) +BUILD_NO=unoffical +else +BUILD_NO=$(BUILD_NUMBER) +endif + VERSION=0.4.1 SRCDIR=$(CWD)/SOURCES BUILDDIR=$(CWD)/build @@ -7,9 +14,9 @@ GCC_TARGET=powerpc-wrs-vxworks55 MASCH=$(shell uname -m) GCC_VERSION=7.2.0 HOST=$(MASCH)-pc-linux-gnu -GCC_PKGVERSION="TechSAT VxWorks 5.5/Tornado 2.2.1 Cross-Toolchain $(MASCH) v$(VERSION)" +GCC_PKGVERSION="TechSAT VxWorks 5.5/Tornado 2.2.1 Cross-Toolchain [Build $(BUILD_NO)] $(MASCH) v$(VERSION)" INSTDIR=$(CWD)/inst/$(MASCH)/crossppc -PACKAGE=$(CWD)/vxw55-crossppc-$(GCC_VERSION)-$(HOST).tar.gz +PACKAGE=$(CWD)/vxw55-crossppc-$(GCC_VERSION)-$(BUILD_NO)-$(HOST).tar.gz ifeq ($(WIND_BASE),) |