author | kergoth <kergoth> | 2003-08-09 19:43:03 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 19:43:03 (UTC) |
commit | 102a00422a155cef204977f6bb7b3f530b7b8c19 (patch) (unidiff) | |
tree | c4add67d773b27cad52c719cc032431cb687c3f9 /Vars.make | |
parent | 3a53173f75c21417bf7601b60a791f72fbb4631d (diff) | |
download | opie-102a00422a155cef204977f6bb7b3f530b7b8c19.zip opie-102a00422a155cef204977f6bb7b3f530b7b8c19.tar.gz opie-102a00422a155cef204977f6bb7b3f530b7b8c19.tar.bz2 |
Merges.
-rw-r--r-- | Vars.make | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -34,48 +34,52 @@ endif | |||
34 | export QMAKE:=$(OPIEDIR)/qmake/qmake | 34 | export QMAKE:=$(OPIEDIR)/qmake/qmake |
35 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs | 35 | export QMAKESPECSDIR=$(OPIEDIR)/mkspecs |
36 | 36 | ||
37 | ifeq ($(QPE_VERSION),) | 37 | ifeq ($(QPE_VERSION),) |
38 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) | 38 | VERSION_MAJ:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
39 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) | 39 | VERSION_MIN:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$(OPIEDIR)/library/version.h)) |
40 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) | 40 | VERSION_PAT:=$(shell echo $$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$(OPIEDIR)/library/version.h)) |
41 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) | 41 | QPE_VERSION:=$(VERSION_MAJ).$(VERSION_MIN).$(VERSION_PAT) |
42 | 42 | ||
43 | ifeq ($(QPE_VERSION),..) | 43 | ifeq ($(QPE_VERSION),..) |
44 | QPE_VERSION=0.9.3 | 44 | QPE_VERSION=0.9.3 |
45 | endif | 45 | endif |
46 | endif | 46 | endif |
47 | export QPE_VERSION | 47 | export QPE_VERSION |
48 | 48 | ||
49 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) | 49 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
50 | ifeq ($(VERSION_CVS),) | 50 | ifeq ($(VERSION_CVS),) |
51 | VERSION_CVS:=$(shell date +%Y%m%d) | 51 | VERSION_CVS:=$(shell date +%Y%m%d) |
52 | endif | 52 | endif |
53 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) | 53 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
54 | SUB_VERSION:=$(VERSION_CVS) | 54 | SUB_VERSION:=$(VERSION_CVS) |
55 | endif | 55 | endif |
56 | export SUB_VERSION | 56 | export SUB_VERSION |
57 | 57 | ||
58 | ifneq ($(strip $(SUB_VERSION)),) | ||
59 | EXTRAVERSION=-$(SUB_VERSION) | ||
60 | endif | ||
61 | |||
58 | ifeq ($(QTE_REVISION),) | 62 | ifeq ($(QTE_REVISION),) |
59 | QTE_REVISION=5 | 63 | QTE_REVISION=5 |
60 | endif | 64 | endif |
61 | export QTE_REVISION | 65 | export QTE_REVISION |
62 | 66 | ||
63 | export DEB_VERSION=2.0 | 67 | export DEB_VERSION=2.0 |
64 | 68 | ||
65 | ifeq ($(QTE_BASEVERSION),) | 69 | ifeq ($(QTE_BASEVERSION),) |
66 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) | 70 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
67 | 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/;') | 71 | 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/;') |
68 | else | 72 | else |
69 | QTE_BASEVERSION=2.3.5 | 73 | QTE_BASEVERSION=2.3.5 |
70 | endif | 74 | endif |
71 | endif | 75 | endif |
72 | export QTE_BASEVERSION | 76 | export QTE_BASEVERSION |
73 | 77 | ||
74 | ifeq ($(QTE_VERSION),) | 78 | ifeq ($(QTE_VERSION),) |
75 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) | 79 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
76 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') | 80 | QTE_VERSION:=$(shell cat $(QTDIR)/include/qglobal.h|grep '^\#define QT_VERSION_STR'|sed -e 's/\#define QT_VERSION_STR\t*//;' -e 's/.*"\([^"]*\)".*/\1/;') |
77 | else | 81 | else |
78 | QTE_VERSION=2.3.5 | 82 | QTE_VERSION=2.3.5 |
79 | endif | 83 | endif |
80 | endif | 84 | endif |
81 | export QTE_VERSION | 85 | export QTE_VERSION |