caskd/openwrt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

build: use SNAPSHOT instead of CURRENT to designate untagged branch builds

Browse Source 
Calling a build ##.##-CURRENT might mislead users into thinking that this
build is the most current release of a branch.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2016-12-02 22:11:40 +01:00
parent 98b14e0906
commit a4232cd4bf
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/version.mk
View File

@ -31,7 +31,7 @@ qstrip_escape=$(subst ','\'',$(call qstrip,$(1)))
sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1)))) sanitize = $(call tolower,$(subst _,-,$(subst $(space),-,$(1))))
VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER)) VERSION_NUMBER:=$(call qstrip_escape,$(CONFIG_VERSION_NUMBER))
VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),CURRENT) VERSION_NUMBER:=$(if $(VERSION_NUMBER),$(VERSION_NUMBER),SNAPSHOT)
VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_CODE)) VERSION_CODE:=$(call qstrip_escape,$(CONFIG_VERSION_CODE))
VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION)) VERSION_CODE:=$(if $(VERSION_CODE),$(VERSION_CODE),$(REVISION))

8
package/base-files/image-config.in
View File

@ -175,8 +175,8 @@ if VERSIONOPT
prompt "Release version number" prompt "Release version number"
help help
This is the release version number embedded in the image. This is the release version number embedded in the image.
If unspecified, it defaults to CURRENT for the master branch If unspecified, it defaults to SNAPSHOT for the master branch
or to ##.##-CURRENT on release branches. or to ##.##-SNAPSHOT on release branches.
config VERSION_CODE config VERSION_CODE
string string
@ -195,8 +195,8 @@ if VERSIONOPT
This is the repository address embedded in the image, it defaults This is the repository address embedded in the image, it defaults
to the trunk snapshot repo; the url may contain the following placeholders: to the trunk snapshot repo; the url may contain the following placeholders:
%R .. Repository revision ID %R .. Repository revision ID
%V .. Configured release version number or "CURRENT", uppercase %V .. Configured release version number or "SNAPSHOT", uppercase
%v .. Configured release version number or "current", lowercase %v .. Configured release version number or "snapshot", lowercase
%C .. Configured release revision code or value of %R, uppercase %C .. Configured release revision code or value of %R, uppercase
%c .. Configured release revision code or value of %R, lowercase %c .. Configured release revision code or value of %R, lowercase
%N .. Release name, uppercase %N .. Release name, uppercase