always describe to get git hash in log messages

diff --git a/Makefile b/Makefile
index 0db94f7..3dac458 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -266,7 +266,7 @@ libpcsxcore/gte_nf.o: libpcsxcore/gte.c
        $(CC) -c -o $@ $^ $(CFLAGS) -DFLAGLESS
 
 frontend/revision.h: FORCE
        $(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 $@_
 
        @diff -q $@_ $@ > /dev/null 2>&1 || cp $@_ $@
        @rm $@_
 


@@ -307,7 +307,7 @@ endif
 
 # ----------- release -----------
 
 
 # ----------- release -----------
 

-VER ?= $(shell git describe HEAD)
+VER ?= $(shell git describe --always HEAD)

 
 ifeq "$(PLATFORM)" "generic"
 OUT = pcsx_rearmed_$(VER)
 
 ifeq "$(PLATFORM)" "generic"
 OUT = pcsx_rearmed_$(VER)

diff --git a/jni/Android.mk b/jni/Android.mk
index 72c6738..da000f3 100644 (file)
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,5 +1,9 @@
 LOCAL_PATH := $(call my-dir)
 
 LOCAL_PATH := $(call my-dir)
 

+$(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_))
+

 include $(CLEAR_VARS)
 
 APP_DIR := ../../src
 include $(CLEAR_VARS)
 
 APP_DIR := ../../src


@@ -60,10 +64,6 @@ ifneq ($(TARGET_ARCH),arm)
    LOCAL_SRC_FILES += ../plugins/gpu_unai/gpulib_if.cpp
 endif
 
    LOCAL_SRC_FILES += ../plugins/gpu_unai/gpulib_if.cpp
 endif
 

-$(shell cd "$(LOCAL_PATH)" && ((git describe || 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_))
-

 LOCAL_SRC_FILES += ../libpcsxcore/cdriso.c ../libpcsxcore/cdrom.c ../libpcsxcore/cheat.c ../libpcsxcore/debug.c \
    ../libpcsxcore/decode_xa.c ../libpcsxcore/disr3000a.c ../libpcsxcore/mdec.c \
    ../libpcsxcore/misc.c ../libpcsxcore/plugins.c ../libpcsxcore/ppf.c ../libpcsxcore/psxbios.c \
 LOCAL_SRC_FILES += ../libpcsxcore/cdriso.c ../libpcsxcore/cdrom.c ../libpcsxcore/cheat.c ../libpcsxcore/debug.c \
    ../libpcsxcore/decode_xa.c ../libpcsxcore/disr3000a.c ../libpcsxcore/mdec.c \
    ../libpcsxcore/misc.c ../libpcsxcore/plugins.c ../libpcsxcore/ppf.c ../libpcsxcore/psxbios.c \