HeeroYui/edn
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[dev] change the tag getting policy

Browse Source
This commit is contained in:
Edouard DUPIN 2012-11-09 01:50:36 +01:00
parent 96e2c91597
commit c6210d8c7e
5 changed files with 24 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Sources/Android.mk
View File

@ -15,9 +15,8 @@ LOCAL_MODULE := $(call convert-special-char,$(CONFIG___EWOL_APPL_NAME__))
endif endif
# get the tag of the current project : # get the tag of the current project :
LOCAL_VERSION_TAG=$(shell cd $(LOCAL_PATH) ; git describe --tags) LOCAL_VERSION=$(shell cat $(LOCAL_PATH)/../tag)
LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev=0) $(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION))
$(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG))
# name of the dependency # name of the dependency
LOCAL_LIBRARIES := ewol freetype libpng parsersvg tinyxml lua etk libzip LOCAL_LIBRARIES := ewol freetype libpng parsersvg tinyxml lua etk libzip
@ -28,16 +27,8 @@ LOCAL_SRC_FILES := $(FILE_LIST)
LOCAL_LDLIBS := -llog -landroid LOCAL_LDLIBS := -llog -landroid
ifeq ($(DEBUG),1) LOCAL_CFLAGS := -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
LOCAL_CFLAGS := -D__MODE__Touch \ -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION)-$(BUILD_DIRECTORY_MODE)\""
-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
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

33
Sources/Config.in
View File

@ -1,23 +1,16 @@
menu "General" menu "General"
if __VIDEO__OPENGL_ES_2 choice
choice prompt "Buffer text configuration"
prompt "Buffer text configuration" default APPL_BUFFER_FONT_NORMAL
default APPL_BUFFER_FONT_NORMAL help
help Buffer display mode :
Buffer display mode : 0 : Basic Sprite font mode.
0 : Basic Sprite font mode. ==> Old standard mode fast but need to reaload distint font for every size
==> Old standard mode fast but need to reaload distint font for every size 1 : Distance Field.
1 : Distance Field. ==> New theoric mode for the display of the font ==> really slow but insteresting ...
==> 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
config APPL_BUFFER_FONT_NORMAL config APPL_BUFFER_FONT_NORMAL
bool bool "0: Basic Sprite font mode"
default y config APPL_BUFFER_FONT_DISTANCE_FIELD
endif bool "1: Distance Field"
endchoice
endmenu endmenu

14
Sources/Linux.mk
View File

@ -14,9 +14,8 @@ else
LOCAL_MODULE := $(call convert-special-char,$(CONFIG___EWOL_APPL_NAME__)) LOCAL_MODULE := $(call convert-special-char,$(CONFIG___EWOL_APPL_NAME__))
endif endif
# get the tag of the current project : # get the tag of the current project :
LOCAL_VERSION_TAG=$(shell cd $(LOCAL_PATH) ; git describe --tags) LOCAL_VERSION=$(shell cat $(LOCAL_PATH)/../tag)
LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev=0) $(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION))
$(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG))
# name of the dependency # name of the dependency
LOCAL_STATIC_LIBRARIES := ewol LOCAL_STATIC_LIBRARIES := ewol
@ -28,15 +27,8 @@ LOCAL_SRC_FILES := $(FILE_LIST)
LOCAL_LDLIBS := LOCAL_LDLIBS :=
ifeq ($(DEBUG),1)
LOCAL_CFLAGS := -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \ LOCAL_CFLAGS := -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
-DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\"" -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION)-$(BUILD_DIRECTORY_MODE)\""
else
LOCAL_CFLAGS := -DMODE_RELEASE \
-DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
-DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
endif
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

13
Sources/Windows.mk
View File

@ -15,9 +15,8 @@ LOCAL_MODULE := $(call convert-special-char,$(CONFIG___EWOL_APPL_NAME__))
endif endif
# get the tag of the current project : # get the tag of the current project :
LOCAL_VERSION_TAG=$(shell cd $(LOCAL_PATH) ; git describe --tags) LOCAL_VERSION=$(shell cat $(LOCAL_PATH)/../tag)
LOCAL_VERSION_TAG_SHORT=$(shell cd $(LOCAL_PATH) ; git describe --tags --abbrev=0) $(info [TAG:$(LOCAL_MODULE)] $(LOCAL_VERSION))
$(info $(LOCAL_MODULE) version TAG : $(LOCAL_VERSION_TAG))
# name of the dependency # name of the dependency
LOCAL_STATIC_LIBRARIES := ewol LOCAL_STATIC_LIBRARIES := ewol
@ -29,13 +28,7 @@ LOCAL_SRC_FILES := $(FILE_LIST)
LOCAL_LDLIBS := LOCAL_LDLIBS :=
ifeq ($(DEBUG),1)
LOCAL_CFLAGS := -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \ LOCAL_CFLAGS := -DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
-DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\"" -DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION)-$(BUILD_DIRECTORY_MODE)\""
else
LOCAL_CFLAGS := -DMODE_RELEASE \
-DPROJECT_NAME="\"$(LOCAL_MODULE)\"" \
-DAPPL_VERSION_TAG_NAME="\"$(LOCAL_VERSION_TAG_SHORT)-$(BUILD_DIRECTORY_MODE)\""
endif
include $(BUILD_EXECUTABLE) include $(BUILD_EXECUTABLE)

1
tag Normal file
View File

@ -0,0 +1 @@
0.3.8