|
diff --git a/configure b/configure index d36fd44..7824e36 100755 --- a/ configure+++ b/ configure |
|
@@ -1,48 +1,48 @@ |
1 | #!/bin/sh |
1 | #!/bin/sh |
2 | # |
2 | # |
3 | # Configures to build the Qtopia Environment |
3 | # Configures to build the Qtopia Environment |
4 | # |
4 | # |
5 | # Copyright 1999-2000 Trolltech AS. All rights reserved. |
5 | # Copyright 1999-2000 Trolltech AS. All rights reserved. |
6 | # |
6 | # |
7 | |
7 | |
8 | PLATFORM=linux-generic-g++ |
8 | PLATFORM=linux-generic-g++ |
9 | SHARING=shared |
9 | SHARING=shared |
10 | DEBUG= |
10 | DEBUG= |
11 | QCONFIGARG= |
11 | QCONFIGARG= |
12 | |
12 | |
13 | touch .test.qpe. |
13 | touch .test.qpe. |
14 | if [ '!' -f ${QPEDIR}/.test.qpe. ]; |
14 | if [ '!' -f ${OPIEDIR}/.test.qpe. ]; |
15 | then |
15 | then |
16 | rm .test.qpe. |
16 | rm .test.qpe. |
17 | echo |
17 | echo |
18 | echo |
18 | echo |
19 | echo ' The environment variable $QPEDIR is not set correctly. It is currently' |
19 | echo ' The environment variable $OPIEDIR is not set correctly. It is currently' |
20 | echo ' set to "'$QPEDIR'", but it should be set to this directory,' |
20 | echo ' set to "'$OPIEDIR'", but it should be set to this directory,' |
21 | echo ' which is "'`pwd`'".' |
21 | echo ' which is "'`pwd`'".' |
22 | echo |
22 | echo |
23 | echo ' Please read the INSTALL file for instructions on how to set $QPEDIR' |
23 | echo ' Please read the INSTALL file for instructions on how to set $OPIEDIR' |
24 | echo ' correctly. If you have set $QPEDIR in your .profile or .login, you ' |
24 | echo ' correctly. If you have set $OPIEDIR in your .profile or .login, you ' |
25 | echo ' will need to log out and log in again to make the setting effective.' |
25 | echo ' will need to log out and log in again to make the setting effective.' |
26 | echo |
26 | echo |
27 | echo |
27 | echo |
28 | exit 1 |
28 | exit 1 |
29 | fi |
29 | fi |
30 | rm .test.qpe. |
30 | rm .test.qpe. |
31 | |
31 | |
32 | mkdir -p include/qpe |
32 | mkdir -p include/qpe |
33 | ( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; ) |
33 | ( cd include/qpe && rm -f *.h; ln -s ../../library/*.h .; ln -s ../../library/backend/*.h .; rm -f *_p.h; ) |
34 | |
34 | |
35 | VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <include/qpe/version.h) |
35 | VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\.[0-9]*\.[0-9]*.*".*/\1/p' <include/qpe/version.h) |
36 | VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <include/qpe/version.h) |
36 | VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.\([0-9]\)\.[0-9]*.*".*/\1/p' <include/qpe/version.h) |
37 | VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <include/qpe/version.h) |
37 | VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION "[0-9]*\.[0-9]*\.\([0-9]*\).*".*/\1/p' <include/qpe/version.h) |
38 | |
38 | |
39 | TOMAKE= |
39 | TOMAKE= |
40 | |
40 | |
41 | if grep -q 'VERSION_STR.*"3' $QTDIR/include/qglobal.h |
41 | if grep -q 'VERSION_STR.*"3' $QTDIR/include/qglobal.h |
42 | then |
42 | then |
43 | QT3=yes |
43 | QT3=yes |
44 | else |
44 | else |
45 | QT3=no |
45 | QT3=no |
46 | fi |
46 | fi |
47 | |
47 | |
48 | # Parse the arguments, setting things to "yes" or "no". |
48 | # Parse the arguments, setting things to "yes" or "no". |
@@ -133,49 +133,49 @@ fi |
133 | if [ -f $TMAKEPATH/tmake.conf ] |
133 | if [ -f $TMAKEPATH/tmake.conf ] |
134 | then |
134 | then |
135 | # You have tmake. We'll regenerate the file for you... |
135 | # You have tmake. We'll regenerate the file for you... |
136 | echo "Makefiles will be regenerated." |
136 | echo "Makefiles will be regenerated." |
137 | fi |
137 | fi |
138 | |
138 | |
139 | H=`pwd` |
139 | H=`pwd` |
140 | if [ -z "$TOMAKE" ] |
140 | if [ -z "$TOMAKE" ] |
141 | then |
141 | then |
142 | TOMAKE=`make showcomponents` |
142 | TOMAKE=`make showcomponents` |
143 | fi |
143 | fi |
144 | |
144 | |
145 | for a in $TOMAKE ; do |
145 | for a in $TOMAKE ; do |
146 | N=$a/Makefile |
146 | N=$a/Makefile |
147 | M=$a/Makefile.in |
147 | M=$a/Makefile.in |
148 | O=$a/Makefile.add |
148 | O=$a/Makefile.add |
149 | f=`basename $a` |
149 | f=`basename $a` |
150 | |
150 | |
151 | if [ -f $TMAKEPATH/tmake.conf -a -f $a/$f.pro ] |
151 | if [ -f $TMAKEPATH/tmake.conf -a -f $a/$f.pro ] |
152 | then |
152 | then |
153 | ( cd $a; |
153 | ( cd $a; |
154 | TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ |
154 | TMAKEPATH=$QTDIR/tmake:$TMAKEPATH \ |
155 | tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ |
155 | tmake $QCONFIGARG CONFIG+=embedded $VCONFIG \ |
156 | -t $H/qt/tmake/propagate.t $f.pro | |
156 | -t $H/qt/tmake/propagate.t $f.pro | |
157 | sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$QPEDIR|\$(QPEDIR)|g" >Makefile.in; |
157 | sed -e "s|$QTDIR|\$(QTDIR)|g" -e "s|$OPIEDIR|\$(OPIEDIR)|g" >Makefile.in; |
158 | ) |
158 | ) |
159 | echo -n "." |
159 | echo -n "." |
160 | appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'` |
160 | appname=`grep '^TARGET' $a/$f.pro | sed 's/^TARGET.*=//' | sed 's/ //g'` |
161 | translation=`grep '^TRANSLATION' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` |
161 | translation=`grep '^TRANSLATION' $a/$f.pro | sed 's,^TRANSL.*=.*i18n\/.*\/,,' | sed 's/ //g' | sed 's,\.ts.*,,' | sed 's,^lib,,' ` |
162 | if [ -n "$translation" -a -n "$appname" ] |
162 | if [ -n "$translation" -a -n "$appname" ] |
163 | then |
163 | then |
164 | if [ $appname != $translation ] |
164 | if [ $appname != $translation ] |
165 | then |
165 | then |
166 | echo |
166 | echo |
167 | echo "Warning: translation and appname disagree in $a/$f.pro" |
167 | echo "Warning: translation and appname disagree in $a/$f.pro" |
168 | fi |
168 | fi |
169 | fi |
169 | fi |
170 | |
170 | |
171 | fi |
171 | fi |
172 | |
172 | |
173 | cat > $N <<EOF |
173 | cat > $N <<EOF |
174 | ############################################################################# |
174 | ############################################################################# |
175 | # Automatically generated from $M |
175 | # Automatically generated from $M |
176 | # Build options from $1 |
176 | # Build options from $1 |
177 | ############################################################################# |
177 | ############################################################################# |
178 | |
178 | |
179 | EOF |
179 | EOF |
180 | |
180 | |
181 | SED= |
181 | SED= |
|