author | kergoth <kergoth> | 2003-04-23 02:31:50 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-04-23 02:31:50 (UTC) |
commit | 27af46124e121bcd87b690f9fd5a28e5766b647f (patch) (unidiff) | |
tree | 690e9fec0d2fe216ee629c0c699e513e1d5a3758 | |
parent | 43b2c74f7d32ce9c744e4d79e62a92e0181604c3 (diff) | |
download | opie-27af46124e121bcd87b690f9fd5a28e5766b647f.zip opie-27af46124e121bcd87b690f9fd5a28e5766b647f.tar.gz opie-27af46124e121bcd87b690f9fd5a28e5766b647f.tar.bz2 |
Increment qt revision per font split, to ensure upgrades occur.
-rw-r--r-- | Vars.make | 2 | ||||
-rwxr-xr-x | mkipks | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -27,33 +27,33 @@ ifeq ($(QPE_VERSION),) | |||
27 | ifeq ($(QPE_VERSION),..) | 27 | ifeq ($(QPE_VERSION),..) |
28 | QPE_VERSION=0.9.3 | 28 | QPE_VERSION=0.9.3 |
29 | endif | 29 | endif |
30 | endif | 30 | endif |
31 | export QPE_VERSION | 31 | export QPE_VERSION |
32 | 32 | ||
33 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) | 33 | SUB_VERSION=$(shell echo $$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$(OPIEDIR)/library/version.h)) |
34 | ifeq ($(VERSION_CVS),) | 34 | ifeq ($(VERSION_CVS),) |
35 | VERSION_CVS:=$(shell date +%Y%m%d) | 35 | VERSION_CVS:=$(shell date +%Y%m%d) |
36 | endif | 36 | endif |
37 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) | 37 | ifneq ($(filter %snapshot",$(shell cat $(OPIEDIR)/library/version.h|grep QPE_VERSION)),) |
38 | SUB_VERSION:=$(VERSION_CVS) | 38 | SUB_VERSION:=$(VERSION_CVS) |
39 | endif | 39 | endif |
40 | export SUB_VERSION | 40 | export SUB_VERSION |
41 | 41 | ||
42 | ifeq ($(QTE_REVISION),) | 42 | ifeq ($(QTE_REVISION),) |
43 | QTE_REVISION=4 | 43 | QTE_REVISION=5 |
44 | endif | 44 | endif |
45 | export QTE_REVISION | 45 | export QTE_REVISION |
46 | 46 | ||
47 | export DEB_VERSION=2.0 | 47 | export DEB_VERSION=2.0 |
48 | 48 | ||
49 | ifeq ($(QTE_BASEVERSION),) | 49 | ifeq ($(QTE_BASEVERSION),) |
50 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) | 50 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
51 | 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/;') | 51 | 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/;') |
52 | else | 52 | else |
53 | QTE_BASEVERSION=2.3.5 | 53 | QTE_BASEVERSION=2.3.5 |
54 | endif | 54 | endif |
55 | endif | 55 | endif |
56 | export QTE_BASEVERSION | 56 | export QTE_BASEVERSION |
57 | 57 | ||
58 | ifeq ($(QTE_VERSION),) | 58 | ifeq ($(QTE_VERSION),) |
59 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) | 59 | ifneq ($(shell ls $(QTDIR)/include/qglobal.h 2>/dev/null),) |
@@ -5,33 +5,33 @@ then | |||
5 | if [ -e $QTDIR/include/qglobal.h ] | 5 | if [ -e $QTDIR/include/qglobal.h ] |
6 | then | 6 | then |
7 | QTE_BASEVERSION=`cat $QTDIR/include/qglobal.h|grep '^#define QT_VERSION'|grep -v STR|sed -e 's,#define QT_VERSION\t*,,;' -e 's,.*\([0-9]\)\([0-9]\)\([0-9]\).*,\1.\2.\3,;'` | 7 | QTE_BASEVERSION=`cat $QTDIR/include/qglobal.h|grep '^#define QT_VERSION'|grep -v STR|sed -e 's,#define QT_VERSION\t*,,;' -e 's,.*\([0-9]\)\([0-9]\)\([0-9]\).*,\1.\2.\3,;'` |
8 | else | 8 | else |
9 | QTE_BASEVERSION=2.3.4 | 9 | QTE_BASEVERSION=2.3.4 |
10 | fi | 10 | fi |
11 | fi | 11 | fi |
12 | if [ -z "$QTE_VERSION" ] | 12 | if [ -z "$QTE_VERSION" ] |
13 | then | 13 | then |
14 | if [ -e $QTDIR/include/qglobal.h ] | 14 | if [ -e $QTDIR/include/qglobal.h ] |
15 | then | 15 | then |
16 | QTE_VERSION=`cat $QTDIR/include/qglobal.h|grep '^#define QT_VERSION_STR'|sed -e 's,#define QT_VERSION_STR\t*,,;' -e 's,.*"\([^"]*\)".*,\1,;'` | 16 | QTE_VERSION=`cat $QTDIR/include/qglobal.h|grep '^#define QT_VERSION_STR'|sed -e 's,#define QT_VERSION_STR\t*,,;' -e 's,.*"\([^"]*\)".*,\1,;'` |
17 | else | 17 | else |
18 | QTE_VERSION=2.3.4 | 18 | QTE_VERSION=2.3.4 |
19 | fi | 19 | fi |
20 | fi | 20 | fi |
21 | [ -z "$QTE_REVISION" ] && QTE_REVISION=4 | 21 | [ -z "$QTE_REVISION" ] && QTE_REVISION=5 |
22 | DEB_VERSION=2.0 | 22 | DEB_VERSION=2.0 |
23 | 23 | ||
24 | # Have to do this here, since CVS can't store symlinks | 24 | # Have to do this here, since CVS can't store symlinks |
25 | 25 | ||
26 | mkdir -p $OPIEDIR/etc/rcS.d | 26 | mkdir -p $OPIEDIR/etc/rcS.d |
27 | ln -sf ../init.d/bootsplash $OPIEDIR/etc/rcS.d/S01bootsplash | 27 | ln -sf ../init.d/bootsplash $OPIEDIR/etc/rcS.d/S01bootsplash |
28 | 28 | ||
29 | VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) | 29 | VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) |
30 | VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) | 30 | VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) |
31 | VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h) | 31 | VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h) |
32 | SUB_VERSION=$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$OPIEDIR/include/qpe/version.h) | 32 | SUB_VERSION=$(sed -n -e 's,.*SUB_VERSION \"\(.*\)\".*,\1,p' <$OPIEDIR/include/qpe/version.h) |
33 | if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h | 33 | if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h |
34 | then | 34 | then |
35 | [ -z "$VERSION_CVS" ] && VERSION_CVS="$(date +%Y%m%d)" | 35 | [ -z "$VERSION_CVS" ] && VERSION_CVS="$(date +%Y%m%d)" |
36 | SUB_VERSION=$VERSION_CVS | 36 | SUB_VERSION=$VERSION_CVS |
37 | else | 37 | else |