author | wimpie <wimpie> | 2004-04-02 18:36:29 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2004-04-02 18:36:29 (UTC) |
commit | 12bf0c3a0e7082aa53794b28055c21c51648ec07 (patch) (unidiff) | |
tree | 7a60d6ff7e8180ccdd69973d67cf944b330ecc5c | |
parent | 1d6b2100209fb63e737100c9f8f576bb26534e96 (diff) | |
download | opie-12bf0c3a0e7082aa53794b28055c21c51648ec07.zip opie-12bf0c3a0e7082aa53794b28055c21c51648ec07.tar.gz opie-12bf0c3a0e7082aa53794b28055c21c51648ec07.tar.bz2 |
Replaced VERSION variable calculation (adding date to version) with
version that addes SECONS-SINCE-EPOCH to version. Allows ipkg updates
more frequently (handy for testing)
-rw-r--r-- | Vars.make | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -46,25 +46,25 @@ ifeq ($(QPE_VERSION),) | |||
46 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) | 46 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
47 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) | 47 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
48 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) | 48 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
49 | 49 | ||
50 | ifeq ($(QPE_VERSION),..) | 50 | ifeq ($(QPE_VERSION),..) |
51 | QPE_VERSION=1.1.2 | 51 | QPE_VERSION=1.1.2 |
52 | endif | 52 | endif |
53 | endif | 53 | endif |
54 | export QPE_VERSION | 54 | export QPE_VERSION |
55 | 55 | ||
56 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) | 56 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
57 | ifeq ($(VERSION_CVS),) | 57 | ifeq ($(VERSION_CVS),) |
58 | VERSION_CVS:=$(shell date +%Y%m%d) | 58 | VERSION_CVS:=$(shell date +%s) |
59 | endif | 59 | endif |
60 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) | 60 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
61 | SUB_VERSION:=$(VERSION_CVS) | 61 | SUB_VERSION:=$(VERSION_CVS) |
62 | endif | 62 | endif |
63 | export SUB_VERSION | 63 | export SUB_VERSION |
64 | 64 | ||
65 | ifneq ($(strip $(SUB_VERSION)),) | 65 | ifneq ($(strip $(SUB_VERSION)),) |
66 | EXTRAVERSION=-$(SUB_VERSION) | 66 | EXTRAVERSION=-$(SUB_VERSION) |
67 | endif | 67 | endif |
68 | 68 | ||
69 | ifeq ($(QTE_REVISION),) | 69 | ifeq ($(QTE_REVISION),) |
70 | QTE_REVISION=6 | 70 | QTE_REVISION=6 |