summaryrefslogtreecommitdiff
authorwimpie <wimpie>2004-04-02 18:36:29 (UTC)
committer wimpie <wimpie>2004-04-02 18:36:29 (UTC)
commit12bf0c3a0e7082aa53794b28055c21c51648ec07 (patch) (unidiff)
tree7a60d6ff7e8180ccdd69973d67cf944b330ecc5c
parent1d6b2100209fb63e737100c9f8f576bb26534e96 (diff)
downloadopie-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)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--Vars.make2
1 files changed, 1 insertions, 1 deletions
diff --git a/Vars.make b/Vars.make
index ea8fb51..f547afe 100644
--- a/Vars.make
+++ b/Vars.make
@@ -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
53endif 53endif
54export QPE_VERSION 54export QPE_VERSION
55 55
56SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) 56SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h))
57ifeq ($(VERSION_CVS),) 57ifeq ($(VERSION_CVS),)
58 VERSION_CVS:=$(shell date +%Y%m%d) 58 VERSION_CVS:=$(shell date +%s)
59endif 59endif
60ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) 60ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),)
61 SUB_VERSION:=$(VERSION_CVS) 61 SUB_VERSION:=$(VERSION_CVS)
62endif 62endif
63export SUB_VERSION 63export SUB_VERSION
64 64
65ifneq ($(strip $(SUB_VERSION)),) 65ifneq ($(strip $(SUB_VERSION)),)
66EXTRAVERSION=-$(SUB_VERSION) 66EXTRAVERSION=-$(SUB_VERSION)
67endif 67endif
68 68
69ifeq ($(QTE_REVISION),) 69ifeq ($(QTE_REVISION),)
70 QTE_REVISION=6 70 QTE_REVISION=6