m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix build from an extracted grafx2-2.5.*-src.tgz

Browse Source 
we check if we are in a GIT working tree and load revision
from version.c if we are not.

also includes grafx2-2.5*-src.tgz in artifacts
This commit is contained in:
Thomas Bernard 2018-05-15 12:14:40 +02:00
parent 0890c4490d
commit d85e5ee893
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -11,6 +11,7 @@ job_linux:
artifacts: artifacts:
paths: paths:
- "*.zip" - "*.zip"
- "*.tgz"
job_win32: job_win32:
stage: build stage: build

11
src/Makefile
View File

@ -34,6 +34,7 @@
STRIP = strip STRIP = strip
# Detect GIT revision # Detect GIT revision
ifeq (true,$(shell git rev-parse --is-inside-work-tree))
GIT_REVISION = $(shell git rev-list --count 1af8c74f53110e349d8f0d19b14599281913f71f..) GIT_REVISION = $(shell git rev-list --count 1af8c74f53110e349d8f0d19b14599281913f71f..)
ifneq (,$(CI_COMMIT_REF_NAME)) ifneq (,$(CI_COMMIT_REF_NAME))
GIT_BRANCH = $(CI_COMMIT_REF_NAME) GIT_BRANCH = $(CI_COMMIT_REF_NAME)
@ -43,6 +44,10 @@
ifneq (master,$(GIT_BRANCH)) ifneq (master,$(GIT_BRANCH))
GIT_REVISION := "$(GIT_REVISION)-$(GIT_BRANCH)" GIT_REVISION := "$(GIT_REVISION)-$(GIT_BRANCH)"
endif endif
else
# outside git repository : get version stored in version.c
GIT_REVISION := $(shell cat version.c | cut -f 2 -d '"')
endif
REVISION_CACHE = .revision.cache REVISION_CACHE = .revision.cache
RES := $(shell if [ ! -f $(REVISION_CACHE) ] || [ "`cat $(REVISION_CACHE)`" != "$(GIT_REVISION)" ] ; then echo "$(GIT_REVISION)" > $(REVISION_CACHE) ; fi ) RES := $(shell if [ ! -f $(REVISION_CACHE) ] || [ "`cat $(REVISION_CACHE)`" != "$(GIT_REVISION)" ] ; then echo "$(GIT_REVISION)" > $(REVISION_CACHE) ; fi )
@ -737,15 +742,15 @@ RES := $(shell if [ ! -f $(CFLAGS_CACHE) ] || [ "`cat $(CFLAGS_CACHE)`" != "$(CO
ifndef NORECOIL ifndef NORECOIL
recoil.c: ../3rdparty/recoil-$(RECOILVER)/recoil.c recoil.c: ../3rdparty/recoil-$(RECOILVER)/recoil.c
$(CP) $< $@ if [ -f $< ] ; then $(CP) $< $@ ; fi
$(CP) $(subst .c,.h,$< $@) if [ -f $(subst .c,.h,$<) ] ; then $(CP) $(subst .c,.h,$< $@) ; fi
recoil.h: recoil.c recoil.h: recoil.c
$(OBJDIR)/loadrecoil.o: recoil.c recoil.h $(OBJDIR)/loadrecoil.o: recoil.c recoil.h
../3rdparty/recoil-$(RECOILVER)/recoil.c: ../3rdparty/recoil-$(RECOILVER)/recoil.c:
$(MAKE) -C ../3rdparty recoil if [ -d ../3rdparty ] ; then $(MAKE) -C ../3rdparty recoil ; fi
endif endif
$(OBJ): $(CFLAGS_CACHE) $(OBJ): $(CFLAGS_CACHE)