summaryrefslogtreecommitdiff
authorwimpie <wimpie>2004-04-02 18:36:29 (UTC)
committer wimpie <wimpie>2004-04-02 18:36:29 (UTC)
commit12bf0c3a0e7082aa53794b28055c21c51648ec07 (patch) (side-by-side diff)
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
@@ -34,49 +34,49 @@ endif
ifdef CONFIG_TARGET_YOPY
PLATFORM=yopy-linux
endif
ifdef CONFIG_TARGET_MACOSX
PLATFORM=macx-darwin
endif
export QMAKE:=$(OPIEDIR)/qmake/qmake
export QMAKESPECSDIR=$(OPIEDIR)/mkspecs
ifeq ($(QPE_VERSION),)
VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h))
VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h))
VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h))
QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT)
ifeq ($(QPE_VERSION),..)
QPE_VERSION=1.1.2
endif
endif
export QPE_VERSION
SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h))
ifeq ($(VERSION_CVS),)
- VERSION_CVS:=$(shell date +%Y%m%d)
+ VERSION_CVS:=$(shell date +%s)
endif
ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),)
SUB_VERSION:=$(VERSION_CVS)
endif
export SUB_VERSION
ifneq ($(strip $(SUB_VERSION)),)
EXTRAVERSION=-$(SUB_VERSION)
endif
ifeq ($(QTE_REVISION),)
QTE_REVISION=6
endif
export QTE_REVISION
export DEB_VERSION=2.0
ifeq ($(QTE_BASEVERSION),)
ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),)
QTE_BASEVERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION'|grep -v STR|sed -e 's/\#define QT_VERSION\t*//; s/.*\([0-9]\)\([0-9]\)\([0-9]\).*/\1.\2.\3/;')
else
QTE_BASEVERSION=2.3.7
endif
endif