[dev] change the tag getting policy
This commit is contained in:
parent
96e2c91597
commit
c6210d8c7e
@ -15,9 +15,8 @@ LOCAL_MODULE := $(call convert-special-char,$(CONFIG___EWOL_APPL_NAME__))
|
||||
endif
|
||||
|
||||
# get the tag of the current project :
|
||||
LOCAL_VERSION_TAG=$(shell cd $(LOCAL_PATH) ; git describe --tags)
|
||||
LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev=0)
|
||||
$(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG))
|
||||
LOCAL_VERSION=$(shell cat $(LOCAL_PATH)/../tag)
|
||||
$(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION))
|
||||
|
||||
# name of the dependency
|
||||
LOCAL_LIBRARIES := ewol freetype libpng parsersvg tinyxml lua etk libzip
|
||||
@ -28,16 +27,8 @@ LOCAL_SRC_FILES := $(FILE_LIST)
|
||||
|
||||
LOCAL_LDLIBS := -llog -landroid
|
||||
|
||||
ifeq ($(DEBUG),1)
|
||||
LOCAL_CFLAGS := -D__MODE__Touch \
|
||||
-DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
|
||||
-DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
|
||||
else
|
||||
LOCAL_CFLAGS := -D__MODE__Touch \
|
||||
-DMODE_RELEASE \
|
||||
-DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
|
||||
-DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
|
||||
endif
|
||||
LOCAL_CFLAGS := -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
|
||||
-DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION)-$(BUILD_DIRECTORY_MODE)\""
|
||||
|
||||
|
||||
include $(BUILD_SHARED_LIBRARY)
|
||||
|
@ -1,23 +1,16 @@
|
||||
menu "General"
|
||||
if __VIDEO__OPENGL_ES_2
|
||||
choice
|
||||
prompt "Buffer text configuration"
|
||||
default APPL_BUFFER_FONT_NORMAL
|
||||
help
|
||||
Buffer display mode :
|
||||
0 : Basic Sprite font mode.
|
||||
==> Old standard mode fast but need to reaload distint font for every size
|
||||
1 : Distance Field.
|
||||
==> New theoric mode for the display of the font ==> really slow but insteresting ...
|
||||
config APPL_BUFFER_FONT_NORMAL
|
||||
bool "0: Basic Sprite font mode"
|
||||
config APPL_BUFFER_FONT_DISTANCE_FIELD
|
||||
bool "1: Distance Field"
|
||||
endchoice
|
||||
endif
|
||||
if __VIDEO__OPENGL_ES_1
|
||||
choice
|
||||
prompt "Buffer text configuration"
|
||||
default APPL_BUFFER_FONT_NORMAL
|
||||
help
|
||||
Buffer display mode :
|
||||
0 : Basic Sprite font mode.
|
||||
==> Old standard mode fast but need to reaload distint font for every size
|
||||
1 : Distance Field.
|
||||
==> New theoric mode for the display of the font ==> really slow but insteresting ...
|
||||
config APPL_BUFFER_FONT_NORMAL
|
||||
bool
|
||||
default y
|
||||
endif
|
||||
bool "0: Basic Sprite font mode"
|
||||
config APPL_BUFFER_FONT_DISTANCE_FIELD
|
||||
bool "1: Distance Field"
|
||||
endchoice
|
||||
endmenu
|
||||
|
@ -14,9 +14,8 @@ else
|
||||
LOCAL_MODULE := $(call convert-special-char,$(CONFIG___EWOL_APPL_NAME__))
|
||||
endif
|
||||
# get the tag of the current project :
|
||||
LOCAL_VERSION_TAG=$(shell cd $(LOCAL_PATH) ; git describe --tags)
|
||||
LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev=0)
|
||||
$(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG))
|
||||
LOCAL_VERSION=$(shell cat $(LOCAL_PATH)/../tag)
|
||||
$(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION))
|
||||
|
||||
# name of the dependency
|
||||
LOCAL_STATIC_LIBRARIES := ewol
|
||||
@ -28,15 +27,8 @@ LOCAL_SRC_FILES := $(FILE_LIST)
|
||||
|
||||
LOCAL_LDLIBS :=
|
||||
|
||||
ifeq ($(DEBUG),1)
|
||||
LOCAL_CFLAGS := -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
|
||||
-DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
|
||||
else
|
||||
LOCAL_CFLAGS := -DMODE_RELEASE \
|
||||
-DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
|
||||
-DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
|
||||
endif
|
||||
|
||||
-DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION)-$(BUILD_DIRECTORY_MODE)\""
|
||||
|
||||
include $(BUILD_EXECUTABLE)
|
||||
|
||||
|
@ -15,9 +15,8 @@ LOCAL_MODULE := $(call convert-special-char,$(CONFIG___EWOL_APPL_NAME__))
|
||||
endif
|
||||
|
||||
# get the tag of the current project :
|
||||
LOCAL_VERSION_TAG=$(shell cd $(LOCAL_PATH) ; git describe --tags)
|
||||
LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev=0)
|
||||
$(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG))
|
||||
LOCAL_VERSION=$(shell cat $(LOCAL_PATH)/../tag)
|
||||
$(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION))
|
||||
|
||||
# name of the dependency
|
||||
LOCAL_STATIC_LIBRARIES := ewol
|
||||
@ -29,13 +28,7 @@ LOCAL_SRC_FILES := $(FILE_LIST)
|
||||
|
||||
LOCAL_LDLIBS :=
|
||||
|
||||
ifeq ($(DEBUG),1)
|
||||
LOCAL_CFLAGS := -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
|
||||
-DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
|
||||
else
|
||||
LOCAL_CFLAGS := -DMODE_RELEASE \
|
||||
-DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
|
||||
-DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
|
||||
endif
|
||||
-DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION)-$(BUILD_DIRECTORY_MODE)\""
|
||||
|
||||
include $(BUILD_EXECUTABLE)
|
||||
|
Loading…
x
Reference in New Issue
Block a user