From: notaz Date: Sun, 23 Jan 2022 20:57:06 +0000 (+0200) Subject: always describe to get git hash in log messages X-Git-Tag: r24l~531 X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=08700dbe7f13957c3c0c9793315c06ceb3a06886;p=pcsx_rearmed.git always describe to get git hash in log messages --- diff --git a/Makefile b/Makefile index 3f33bd37..f21b8232 100644 --- a/Makefile +++ b/Makefile @@ -366,7 +366,7 @@ libpcsxcore/gte_nf.o: libpcsxcore/gte.c $(CC) -c -o $@ $^ $(CFLAGS) -DFLAGLESS frontend/revision.h: FORCE - @(git describe || echo) | sed -e 's/.*/#define REV "\0"/' > $@_ + @(git describe --always || echo) | sed -e 's/.*/#define REV "\0"/' > $@_ @diff -q $@_ $@ > /dev/null 2>&1 || cp $@_ $@ @rm $@_ @@ -410,7 +410,7 @@ endif # ----------- release ----------- -VER ?= $(shell git describe HEAD) +VER ?= $(shell git describe --always HEAD) ifeq "$(PLATFORM)" "generic" OUT = pcsx_rearmed_$(VER) diff --git a/jni/Android.mk b/jni/Android.mk index 50aa6969..d8fdd42e 100644 --- a/jni/Android.mk +++ b/jni/Android.mk @@ -1,6 +1,6 @@ LOCAL_PATH := $(call my-dir) -$(shell cd "$(LOCAL_PATH)" && ((git describe || echo) | sed -e 's/.*/#define REV "\0"/' > ../frontend/revision.h_)) +$(shell cd "$(LOCAL_PATH)" && ((git describe --always || echo) | sed -e 's/.*/#define REV "\0"/' > ../frontend/revision.h_)) $(shell cd "$(LOCAL_PATH)" && (diff -q ../frontend/revision.h_ ../frontend/revision.h > /dev/null 2>&1 || cp ../frontend/revision.h_ ../frontend/revision.h)) $(shell cd "$(LOCAL_PATH)" && (rm ../frontend/revision.h_))