author | zautrix <zautrix> | 2004-10-17 20:33:08 (UTC) |
---|---|---|
committer | zautrix <zautrix> | 2004-10-17 20:33:08 (UTC) |
commit | 50470fdeb0ed62f05ff6780607cc30a8e84ef5b1 (patch) (unidiff) | |
tree | 87fbffa1db9d979dbe9c2e018cd2bdc5d833823f | |
parent | 4220d587eb43d4117e5d5a8a8f0cb6e8381b5fbe (diff) | |
download | kdepimpi-50470fdeb0ed62f05ff6780607cc30a8e84ef5b1.zip kdepimpi-50470fdeb0ed62f05ff6780607cc30a8e84ef5b1.tar.gz kdepimpi-50470fdeb0ed62f05ff6780607cc30a8e84ef5b1.tar.bz2 |
compile fixes
-rw-r--r-- | Makefile | 16 | ||||
-rw-r--r-- | Makefile.Embedded | 16 | ||||
-rw-r--r-- | libkdepim/ksyncmanager.cpp | 6 | ||||
-rw-r--r-- | version | 2 |
4 files changed, 22 insertions, 18 deletions
@@ -37,302 +37,302 @@ SUBDIRS_SHARP_PLUGIN = \ | |||
37 | SUBDIRS_LDAP_PLUGIN = \ | 37 | SUBDIRS_LDAP_PLUGIN = \ |
38 | kabc/plugins/ldap | 38 | kabc/plugins/ldap |
39 | 39 | ||
40 | SUBDIRS_MICROMAIL = \ | 40 | SUBDIRS_MICROMAIL = \ |
41 | kmicromail/libetpan \ | 41 | kmicromail/libetpan \ |
42 | kmicromail/libmailwrapper \ | 42 | kmicromail/libmailwrapper \ |
43 | kmicromail | 43 | kmicromail |
44 | 44 | ||
45 | SUBDIRS_GAMMU = \ | 45 | SUBDIRS_GAMMU = \ |
46 | gammu/emb/common \ | 46 | gammu/emb/common \ |
47 | gammu/emb/gammu | 47 | gammu/emb/gammu |
48 | 48 | ||
49 | SUBDIRS_PWMANAGER = \ | 49 | SUBDIRS_PWMANAGER = \ |
50 | pwmanager/pwmanager | 50 | pwmanager/pwmanager |
51 | 51 | ||
52 | SUBDIRS = \ | 52 | SUBDIRS = \ |
53 | $(SUBDIRS_MICROKDE) \ | 53 | $(SUBDIRS_MICROKDE) \ |
54 | $(SUBDIRS_QTOPIA_PLUGIN) \ | 54 | $(SUBDIRS_QTOPIA_PLUGIN) \ |
55 | $(SUBDIRS_OPIE_PLUGIN) \ | 55 | $(SUBDIRS_OPIE_PLUGIN) \ |
56 | $(SUBDIRS_SHARP_PLUGIN) \ | 56 | $(SUBDIRS_SHARP_PLUGIN) \ |
57 | $(SUBDIRS_LDAP_PLUGIN) \ | 57 | $(SUBDIRS_LDAP_PLUGIN) \ |
58 | $(SUBDIRS_MICROMAIL) \ | 58 | $(SUBDIRS_MICROMAIL) \ |
59 | $(SUBDIRS_GAMMU) \ | 59 | $(SUBDIRS_GAMMU) \ |
60 | $(SUBDIRS_PWMANAGER) | 60 | $(SUBDIRS_PWMANAGER) |
61 | 61 | ||
62 | 62 | ||
63 | all: build_microkde \ | 63 | all: build_microkde \ |
64 | build_qtopia_plugin \ | 64 | build_qtopia_plugin \ |
65 | build_opie_plugin \ | 65 | build_opie_plugin \ |
66 | build_sharp_plugin \ | 66 | build_sharp_plugin \ |
67 | build_ldap_plugin \ | 67 | build_ldap_plugin \ |
68 | build_micromail \ | 68 | build_micromail \ |
69 | build_gammu \ | 69 | build_gammu \ |
70 | build_pwmanager | 70 | build_pwmanager |
71 | 71 | ||
72 | 72 | ||
73 | build_microkde: variable_test tmake | 73 | build_microkde: variable_test tmake |
74 | for i in $(SUBDIRS_MICROKDE); do pushd $$i; \ | 74 | for i in $(SUBDIRS_MICROKDE); do pushd $$i; \ |
75 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 75 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
76 | done | 76 | done |
77 | 77 | ||
78 | build_qtopia_plugin: build_microkde | 78 | build_qtopia_plugin: build_microkde |
79 | ifdef BUILD_NO_QTOPIA_PLUGIN | 79 | ifdef BUILD_NO_QTOPIA_PLUGIN |
80 | @echo == qtopia plugin not build. | 80 | @echo == qtopia plugin not build. |
81 | else | 81 | else |
82 | for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \ | 82 | for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \ |
83 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 83 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
84 | done | 84 | done |
85 | endif | 85 | endif |
86 | 86 | ||
87 | build_opie_plugin: build_microkde | 87 | build_opie_plugin: build_microkde |
88 | ifdef BUILD_NO_OPIE_PLUGIN | 88 | ifdef BUILD_NO_OPIE_PLUGIN |
89 | @echo == opie plugin not build. | 89 | @echo == opie plugin not build. |
90 | else | 90 | else |
91 | for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \ | 91 | for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \ |
92 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 92 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
93 | done | 93 | done |
94 | endif | 94 | endif |
95 | 95 | ||
96 | build_sharp_plugin: build_microkde | 96 | build_sharp_plugin: build_microkde |
97 | ifdef BUILD_NO_SHARP_PLUGIN | 97 | ifdef BUILD_NO_SHARP_PLUGIN |
98 | @echo == ldap plugin not build. | 98 | @echo == ldap plugin not build. |
99 | else | 99 | else |
100 | for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \ | 100 | for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \ |
101 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 101 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
102 | done | 102 | done |
103 | endif | 103 | endif |
104 | 104 | ||
105 | build_ldap_plugin: build_microkde | 105 | build_ldap_plugin: build_microkde |
106 | ifdef BUILD_NO_LDAP_PLUGIN | 106 | ifdef BUILD_NO_LDAP_PLUGIN |
107 | @echo == ldap plugin not build. | 107 | @echo == ldap plugin not build. |
108 | else | 108 | else |
109 | for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \ | 109 | for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \ |
110 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 110 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
111 | done | 111 | done |
112 | endif | 112 | endif |
113 | 113 | ||
114 | 114 | ||
115 | build_micromail: build_microkde | 115 | build_micromail: build_microkde |
116 | ifdef BUILD_NO_MICROMAIL | 116 | ifdef BUILD_NO_MICROMAIL |
117 | @echo == kmicromail not build. | 117 | @echo == kmicromail not build. |
118 | else | 118 | else |
119 | for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \ | 119 | for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \ |
120 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 120 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
121 | done | 121 | done |
122 | endif | 122 | endif |
123 | 123 | ||
124 | build_gammu: variable_test tmake | 124 | build_gammu: variable_test tmake |
125 | ifdef BUILD_NO_GAMMU | 125 | ifdef BUILD_NO_GAMMU |
126 | @echo == gammu not build. | 126 | @echo == gammu not build. |
127 | else | 127 | else |
128 | for i in $(SUBDIRS_GAMMU); do pushd $$i; \ | 128 | for i in $(SUBDIRS_GAMMU); do pushd $$i; \ |
129 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 129 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
130 | done | 130 | done |
131 | endif | 131 | endif |
132 | 132 | ||
133 | build_pwmanager: build_microkde | 133 | build_pwmanager: build_microkde |
134 | ifdef BUILD_NO_PWMANAGER | 134 | ifdef BUILD_NO_PWMANAGER |
135 | @echo == pwmanager not build. | 135 | @echo == pwmanager not build. |
136 | else | 136 | else |
137 | for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \ | 137 | for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \ |
138 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 138 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
139 | done | 139 | done |
140 | endif | 140 | endif |
141 | 141 | ||
142 | 142 | ||
143 | variable_info: | 143 | variable_info: |
144 | @echo -------------------------------------- | 144 | @echo -------------------------------------- |
145 | @echo KDEPIM buildsystem, variableinfo... | 145 | @echo KDEPIM buildsystem, variableinfo... |
146 | @echo KDEPIMDIR=$(KDEPIMDIR) | 146 | @echo KDEPIMDIR=$(KDEPIMDIR) |
147 | @echo QTDIR=$(QTDIR) | 147 | @echo QTDIR=$(QTDIR) |
148 | @echo QPEDIR=$(QPEDIR) | 148 | @echo QPEDIR=$(QPEDIR) |
149 | @echo OPIEDIR=$(OPIEDIR) | 149 | @echo OPIEDIR=$(OPIEDIR) |
150 | @echo PLATFORM=$(PLATFORM) | 150 | @echo PLATFORM=$(PLATFORM) |
151 | @echo RELEASE_DEBUG=$(RELEASE_DEBUG) | 151 | @echo RELEASE_DEBUG=$(RELEASE_DEBUG) |
152 | @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) | 152 | @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) |
153 | @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) | 153 | @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) |
154 | @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) | 154 | @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) |
155 | @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN) | 155 | @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN) |
156 | @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) | 156 | @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) |
157 | ifndef BUILD_NO_SHARP_PLUGIN | 157 | ifndef BUILD_NO_SHARP_PLUGIN |
158 | @echo SHARPDTMSDK=$(SHARPDTMSDK) | 158 | @echo SHARPDTMSDK=$(SHARPDTMSDK) |
159 | endif | 159 | endif |
160 | @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) | 160 | @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) |
161 | @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER) | 161 | @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER) |
162 | @echo -------------------------------------- | 162 | @echo -------------------------------------- |
163 | 163 | ||
164 | variable_test: variable_info | 164 | variable_test: variable_info |
165 | @echo KDEPIM buildsystem, variablecheck... | 165 | @echo KDEPIM buildsystem, variablecheck... |
166 | ifndef KDEPIMDIR | 166 | ifndef KDEPIMDIR |
167 | @echo KDEPIMDIR is not defined. | 167 | @echo KDEPIMDIR is not defined. |
168 | $(error KDEPIMDIR is not defined) | 168 | $(error KDEPIMDIR is not defined) |
169 | endif | 169 | endif |
170 | ifndef PLATFORM | 170 | ifndef PLATFORM |
171 | @echo PLATFORM is not defined. | 171 | @echo PLATFORM is not defined. |
172 | $(error PLATFORM is not defined) | 172 | $(error PLATFORM is not defined) |
173 | endif | 173 | endif |
174 | ifdef BUILD_NO_LDAP_PLUGIN | 174 | ifdef BUILD_NO_LDAP_PLUGIN |
175 | @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) | 175 | @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) |
176 | endif | 176 | endif |
177 | ifdef BUILD_NO_OPIE_PLUGIN | 177 | ifdef BUILD_NO_OPIE_PLUGIN |
178 | @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN) | 178 | @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN) |
179 | endif | 179 | endif |
180 | ifdef BUILD_NO_QTOPIA_PLUGIN | 180 | ifdef BUILD_NO_QTOPIA_PLUGIN |
181 | @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN) | 181 | @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN) |
182 | endif | 182 | endif |
183 | ifdef BUILD_NO_MICROMAIL | 183 | ifdef BUILD_NO_MICROMAIL |
184 | @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) | 184 | @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) |
185 | endif | 185 | endif |
186 | ifdef BUILD_NO_SHARP_PLUGIN | 186 | ifdef BUILD_NO_SHARP_PLUGIN |
187 | @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) | 187 | @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) |
188 | else | 188 | else |
189 | ifndef SHARPDTMSDK | 189 | ifndef SHARPDTMSDK |
190 | @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) | 190 | @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) |
191 | $(error SHARPDTMSDK is not defined) | 191 | $(error SHARPDTMSDK is not defined) |
192 | endif | 192 | endif |
193 | endif | 193 | endif |
194 | ifdef BUILD_NO_GAMMU | 194 | ifdef BUILD_NO_GAMMU |
195 | @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU) | 195 | @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU) |
196 | endif | 196 | endif |
197 | ifdef BUILD_NO_PWMANAGER | 197 | ifdef BUILD_NO_PWMANAGER |
198 | @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER) | 198 | @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER) |
199 | endif | 199 | endif |
200 | @echo -------------------------------------- | 200 | @echo -------------------------------------- |
201 | 201 | ||
202 | 202 | ||
203 | objects: | 203 | objects: |
204 | for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done | 204 | for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done |
205 | for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done | 205 | for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done |
206 | mkdir -p libical/lib/$(PLATFORM) | 206 | mkdir -p libical/lib/$(PLATFORM) |
207 | 207 | ||
208 | clean: | 208 | clean: |
209 | rm -rf libical/lib/$(PLATFORM)/*; | 209 | rm -rf libical/lib/$(PLATFORM)/*; |
210 | for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ | 210 | for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ |
211 | rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ | 211 | rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ |
212 | done | 212 | done |
213 | 213 | ||
214 | install: | 214 | install: |
215 | 215 | ||
216 | cd bin/kdepim; make install | 216 | cd bin/kdepim; make install |
217 | cp -r Pim $(QPEDIR)/apps | 217 | cp -r Pim $(QPEDIR)/apps |
218 | cp db2file/db2file $(QPEDIR)/bin/db2file | 218 | cp db2file/db2file $(QPEDIR)/bin/db2file |
219 | cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop | 219 | cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop |
220 | cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop | 220 | cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop |
221 | cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop | 221 | cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop |
222 | cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop | 222 | cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop |
223 | 223 | ||
224 | dist: | 224 | dist: |
225 | @echo Dont forget to do "make install" before "make dist" | 225 | @echo Dont forget to do "make install" before "make dist" |
226 | rm -f *arm.ipk | 226 | rm -f *arm.ipk |
227 | rm -f *~ | 227 | rm -f *~ |
228 | cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim | 228 | cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim |
229 | ./mkipks kmicrokdelibs.control | 229 | mkipks kmicrokdelibs.control |
230 | ./mkipks korganizer.control | 230 | mkipks korganizer.control |
231 | ./mkipks kaddressbook.control | 231 | mkipks kaddressbook.control |
232 | ifndef BUILD_NO_MICROMAIL | 232 | ifndef BUILD_NO_MICROMAIL |
233 | ./mkipks kopiemail.control | 233 | mkipks kopiemail.control |
234 | endif | 234 | endif |
235 | ./mkipks korganizer-alarm.control | 235 | mkipks korganizer-alarm.control |
236 | ifndef BUILD_NO_GAMMU | 236 | ifndef BUILD_NO_GAMMU |
237 | ./mkipks phoneaccess.control | 237 | mkipks phoneaccess.control |
238 | endif | 238 | endif |
239 | ifndef BUILD_NO_PWMANAGER | 239 | ifndef BUILD_NO_PWMANAGER |
240 | ./mkipks pwmanager.control | 240 | mkipks pwmanager.control |
241 | endif | 241 | endif |
242 | ./mkipks pim_TAB_icon.control | 242 | mkipks pim_TAB_icon.control |
243 | 243 | ||
244 | tmake: objects \ | 244 | tmake: objects \ |
245 | qtcompat/Makefile$(PLATFORM) \ | 245 | qtcompat/Makefile$(PLATFORM) \ |
246 | microkde/Makefile$(PLATFORM) \ | 246 | microkde/Makefile$(PLATFORM) \ |
247 | libkcal/Makefile$(PLATFORM) \ | 247 | libkcal/Makefile$(PLATFORM) \ |
248 | libkdepim/Makefile$(PLATFORM) \ | 248 | libkdepim/Makefile$(PLATFORM) \ |
249 | korganizer/Makefile$(PLATFORM) \ | 249 | korganizer/Makefile$(PLATFORM) \ |
250 | kalarmd/Makefile$(PLATFORM) \ | 250 | kalarmd/Makefile$(PLATFORM) \ |
251 | libical/src/libical/Makefile$(PLATFORM) \ | 251 | libical/src/libical/Makefile$(PLATFORM) \ |
252 | libical/src/libicalss/Makefile$(PLATFORM) \ | 252 | libical/src/libicalss/Makefile$(PLATFORM) \ |
253 | kabc/Makefile$(PLATFORM) \ | 253 | kabc/Makefile$(PLATFORM) \ |
254 | kabc/formats/binary/Makefile$(PLATFORM) \ | 254 | kabc/formats/binary/Makefile$(PLATFORM) \ |
255 | kabc/plugins/file/Makefile$(PLATFORM) \ | 255 | kabc/plugins/file/Makefile$(PLATFORM) \ |
256 | kabc/plugins/dir/Makefile$(PLATFORM) \ | 256 | kabc/plugins/dir/Makefile$(PLATFORM) \ |
257 | kabc/plugins/ldap/Makefile$(PLATFORM) \ | 257 | kabc/plugins/ldap/Makefile$(PLATFORM) \ |
258 | kabc/plugins/opie/Makefile$(PLATFORM) \ | 258 | kabc/plugins/opie/Makefile$(PLATFORM) \ |
259 | kabc/plugins/qtopia/Makefile$(PLATFORM) \ | 259 | kabc/plugins/qtopia/Makefile$(PLATFORM) \ |
260 | kabc/plugins/sharpdtm/Makefile$(PLATFORM) \ | 260 | kabc/plugins/sharpdtm/Makefile$(PLATFORM) \ |
261 | kaddressbook/Makefile$(PLATFORM) \ | 261 | kaddressbook/Makefile$(PLATFORM) \ |
262 | kmicromail/Makefile$(PLATFORM) \ | 262 | kmicromail/Makefile$(PLATFORM) \ |
263 | kmicromail/libetpan/Makefile$(PLATFORM) \ | 263 | kmicromail/libetpan/Makefile$(PLATFORM) \ |
264 | kmicromail/libmailwrapper/Makefile$(PLATFORM) \ | 264 | kmicromail/libmailwrapper/Makefile$(PLATFORM) \ |
265 | gammu/emb/common/Makefile$(PLATFORM) \ | 265 | gammu/emb/common/Makefile$(PLATFORM) \ |
266 | gammu/emb/gammu/Makefile$(PLATFORM) \ | 266 | gammu/emb/gammu/Makefile$(PLATFORM) \ |
267 | pwmanager/pwmanager/Makefile$(PLATFORM) \ | 267 | pwmanager/pwmanager/Makefile$(PLATFORM) \ |
268 | 268 | ||
269 | qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro | 269 | qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro |
270 | cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM) | 270 | cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM) |
271 | 271 | ||
272 | microkde/Makefile$(PLATFORM): microkde/microkdeE.pro | 272 | microkde/Makefile$(PLATFORM): microkde/microkdeE.pro |
273 | cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM) | 273 | cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM) |
274 | 274 | ||
275 | libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro | 275 | libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro |
276 | cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM) | 276 | cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM) |
277 | 277 | ||
278 | 278 | ||
279 | libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro | 279 | libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro |
280 | cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM) | 280 | cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM) |
281 | 281 | ||
282 | kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro | 282 | kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro |
283 | cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM) | 283 | cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM) |
284 | 284 | ||
285 | korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro | 285 | korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro |
286 | cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM) | 286 | cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM) |
287 | 287 | ||
288 | libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro | 288 | libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro |
289 | cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM) | 289 | cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM) |
290 | 290 | ||
291 | libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro | 291 | libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro |
292 | cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM) | 292 | cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM) |
293 | 293 | ||
294 | kabc/Makefile$(PLATFORM): kabc/kabcE.pro | 294 | kabc/Makefile$(PLATFORM): kabc/kabcE.pro |
295 | cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM) | 295 | cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM) |
296 | 296 | ||
297 | kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro | 297 | kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro |
298 | cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM) | 298 | cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM) |
299 | 299 | ||
300 | kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro | 300 | kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro |
301 | cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM) | 301 | cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM) |
302 | 302 | ||
303 | kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro | 303 | kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro |
304 | cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM) | 304 | cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM) |
305 | 305 | ||
306 | kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro | 306 | kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro |
307 | cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM) | 307 | cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM) |
308 | 308 | ||
309 | kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro | 309 | kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro |
310 | cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM) | 310 | cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM) |
311 | 311 | ||
312 | kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro | 312 | kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro |
313 | cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM) | 313 | cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM) |
314 | 314 | ||
315 | kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro | 315 | kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro |
316 | cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM) | 316 | cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM) |
317 | 317 | ||
318 | kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro | 318 | kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro |
319 | cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM) | 319 | cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM) |
320 | 320 | ||
321 | kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro | 321 | kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro |
322 | cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM) | 322 | cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM) |
323 | 323 | ||
324 | kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro | 324 | kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro |
325 | cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM) | 325 | cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM) |
326 | 326 | ||
327 | kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro | 327 | kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro |
328 | cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM) | 328 | cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM) |
329 | 329 | ||
330 | gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro | 330 | gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro |
331 | cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM) | 331 | cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM) |
332 | 332 | ||
333 | gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro | 333 | gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro |
334 | cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM) | 334 | cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM) |
335 | 335 | ||
336 | pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro | 336 | pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro |
337 | cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM) | 337 | cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM) |
338 | 338 | ||
diff --git a/Makefile.Embedded b/Makefile.Embedded index 6a8521f..84f909e 100644 --- a/Makefile.Embedded +++ b/Makefile.Embedded | |||
@@ -37,302 +37,302 @@ SUBDIRS_SHARP_PLUGIN = \ | |||
37 | SUBDIRS_LDAP_PLUGIN = \ | 37 | SUBDIRS_LDAP_PLUGIN = \ |
38 | kabc/plugins/ldap | 38 | kabc/plugins/ldap |
39 | 39 | ||
40 | SUBDIRS_MICROMAIL = \ | 40 | SUBDIRS_MICROMAIL = \ |
41 | kmicromail/libetpan \ | 41 | kmicromail/libetpan \ |
42 | kmicromail/libmailwrapper \ | 42 | kmicromail/libmailwrapper \ |
43 | kmicromail | 43 | kmicromail |
44 | 44 | ||
45 | SUBDIRS_GAMMU = \ | 45 | SUBDIRS_GAMMU = \ |
46 | gammu/emb/common \ | 46 | gammu/emb/common \ |
47 | gammu/emb/gammu | 47 | gammu/emb/gammu |
48 | 48 | ||
49 | SUBDIRS_PWMANAGER = \ | 49 | SUBDIRS_PWMANAGER = \ |
50 | pwmanager/pwmanager | 50 | pwmanager/pwmanager |
51 | 51 | ||
52 | SUBDIRS = \ | 52 | SUBDIRS = \ |
53 | $(SUBDIRS_MICROKDE) \ | 53 | $(SUBDIRS_MICROKDE) \ |
54 | $(SUBDIRS_QTOPIA_PLUGIN) \ | 54 | $(SUBDIRS_QTOPIA_PLUGIN) \ |
55 | $(SUBDIRS_OPIE_PLUGIN) \ | 55 | $(SUBDIRS_OPIE_PLUGIN) \ |
56 | $(SUBDIRS_SHARP_PLUGIN) \ | 56 | $(SUBDIRS_SHARP_PLUGIN) \ |
57 | $(SUBDIRS_LDAP_PLUGIN) \ | 57 | $(SUBDIRS_LDAP_PLUGIN) \ |
58 | $(SUBDIRS_MICROMAIL) \ | 58 | $(SUBDIRS_MICROMAIL) \ |
59 | $(SUBDIRS_GAMMU) \ | 59 | $(SUBDIRS_GAMMU) \ |
60 | $(SUBDIRS_PWMANAGER) | 60 | $(SUBDIRS_PWMANAGER) |
61 | 61 | ||
62 | 62 | ||
63 | all: build_microkde \ | 63 | all: build_microkde \ |
64 | build_qtopia_plugin \ | 64 | build_qtopia_plugin \ |
65 | build_opie_plugin \ | 65 | build_opie_plugin \ |
66 | build_sharp_plugin \ | 66 | build_sharp_plugin \ |
67 | build_ldap_plugin \ | 67 | build_ldap_plugin \ |
68 | build_micromail \ | 68 | build_micromail \ |
69 | build_gammu \ | 69 | build_gammu \ |
70 | build_pwmanager | 70 | build_pwmanager |
71 | 71 | ||
72 | 72 | ||
73 | build_microkde: variable_test tmake | 73 | build_microkde: variable_test tmake |
74 | for i in $(SUBDIRS_MICROKDE); do pushd $$i; \ | 74 | for i in $(SUBDIRS_MICROKDE); do pushd $$i; \ |
75 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 75 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
76 | done | 76 | done |
77 | 77 | ||
78 | build_qtopia_plugin: build_microkde | 78 | build_qtopia_plugin: build_microkde |
79 | ifdef BUILD_NO_QTOPIA_PLUGIN | 79 | ifdef BUILD_NO_QTOPIA_PLUGIN |
80 | @echo == qtopia plugin not build. | 80 | @echo == qtopia plugin not build. |
81 | else | 81 | else |
82 | for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \ | 82 | for i in $(SUBDIRS_QTOPIA_PLUGIN); do pushd $$i; \ |
83 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 83 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
84 | done | 84 | done |
85 | endif | 85 | endif |
86 | 86 | ||
87 | build_opie_plugin: build_microkde | 87 | build_opie_plugin: build_microkde |
88 | ifdef BUILD_NO_OPIE_PLUGIN | 88 | ifdef BUILD_NO_OPIE_PLUGIN |
89 | @echo == opie plugin not build. | 89 | @echo == opie plugin not build. |
90 | else | 90 | else |
91 | for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \ | 91 | for i in $(SUBDIRS_OPIE_PLUGIN); do pushd $$i; \ |
92 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 92 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
93 | done | 93 | done |
94 | endif | 94 | endif |
95 | 95 | ||
96 | build_sharp_plugin: build_microkde | 96 | build_sharp_plugin: build_microkde |
97 | ifdef BUILD_NO_SHARP_PLUGIN | 97 | ifdef BUILD_NO_SHARP_PLUGIN |
98 | @echo == ldap plugin not build. | 98 | @echo == ldap plugin not build. |
99 | else | 99 | else |
100 | for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \ | 100 | for i in $(SUBDIRS_SHARP_PLUGIN); do pushd $$i; \ |
101 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 101 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
102 | done | 102 | done |
103 | endif | 103 | endif |
104 | 104 | ||
105 | build_ldap_plugin: build_microkde | 105 | build_ldap_plugin: build_microkde |
106 | ifdef BUILD_NO_LDAP_PLUGIN | 106 | ifdef BUILD_NO_LDAP_PLUGIN |
107 | @echo == ldap plugin not build. | 107 | @echo == ldap plugin not build. |
108 | else | 108 | else |
109 | for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \ | 109 | for i in $(SUBDIRS_LDAP_PLUGIN); do pushd $$i; \ |
110 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 110 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
111 | done | 111 | done |
112 | endif | 112 | endif |
113 | 113 | ||
114 | 114 | ||
115 | build_micromail: build_microkde | 115 | build_micromail: build_microkde |
116 | ifdef BUILD_NO_MICROMAIL | 116 | ifdef BUILD_NO_MICROMAIL |
117 | @echo == kmicromail not build. | 117 | @echo == kmicromail not build. |
118 | else | 118 | else |
119 | for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \ | 119 | for i in $(SUBDIRS_MICROMAIL); do pushd $$i; \ |
120 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 120 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
121 | done | 121 | done |
122 | endif | 122 | endif |
123 | 123 | ||
124 | build_gammu: variable_test tmake | 124 | build_gammu: variable_test tmake |
125 | ifdef BUILD_NO_GAMMU | 125 | ifdef BUILD_NO_GAMMU |
126 | @echo == gammu not build. | 126 | @echo == gammu not build. |
127 | else | 127 | else |
128 | for i in $(SUBDIRS_GAMMU); do pushd $$i; \ | 128 | for i in $(SUBDIRS_GAMMU); do pushd $$i; \ |
129 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 129 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
130 | done | 130 | done |
131 | endif | 131 | endif |
132 | 132 | ||
133 | build_pwmanager: build_microkde | 133 | build_pwmanager: build_microkde |
134 | ifdef BUILD_NO_PWMANAGER | 134 | ifdef BUILD_NO_PWMANAGER |
135 | @echo == pwmanager not build. | 135 | @echo == pwmanager not build. |
136 | else | 136 | else |
137 | for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \ | 137 | for i in $(SUBDIRS_PWMANAGER); do pushd $$i; \ |
138 | make -f Makefile$(PLATFORM) || exit 1; popd; \ | 138 | make -f Makefile$(PLATFORM) || exit 1; popd; \ |
139 | done | 139 | done |
140 | endif | 140 | endif |
141 | 141 | ||
142 | 142 | ||
143 | variable_info: | 143 | variable_info: |
144 | @echo -------------------------------------- | 144 | @echo -------------------------------------- |
145 | @echo KDEPIM buildsystem, variableinfo... | 145 | @echo KDEPIM buildsystem, variableinfo... |
146 | @echo KDEPIMDIR=$(KDEPIMDIR) | 146 | @echo KDEPIMDIR=$(KDEPIMDIR) |
147 | @echo QTDIR=$(QTDIR) | 147 | @echo QTDIR=$(QTDIR) |
148 | @echo QPEDIR=$(QPEDIR) | 148 | @echo QPEDIR=$(QPEDIR) |
149 | @echo OPIEDIR=$(OPIEDIR) | 149 | @echo OPIEDIR=$(OPIEDIR) |
150 | @echo PLATFORM=$(PLATFORM) | 150 | @echo PLATFORM=$(PLATFORM) |
151 | @echo RELEASE_DEBUG=$(RELEASE_DEBUG) | 151 | @echo RELEASE_DEBUG=$(RELEASE_DEBUG) |
152 | @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) | 152 | @echo BUILD_NO_MICROMAIL=$(BUILD_NO_MICROMAIL) |
153 | @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) | 153 | @echo BUILD_NO_LDAP_PLUGIN=$(BUILD_NO_LDAP_PLUGIN) |
154 | @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) | 154 | @echo BUILD_NO_OPIE_PLUGIN=$(BUILD_NO_OPIE_PLUGIN) |
155 | @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN) | 155 | @echo BUILD_NO_QTOPIA_PLUGIN=$(BUILD_NO_QTOPIA_PLUGIN) |
156 | @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) | 156 | @echo BUILD_NO_SHARP_PLUGIN=$(BUILD_NO_SHARP_PLUGIN) |
157 | ifndef BUILD_NO_SHARP_PLUGIN | 157 | ifndef BUILD_NO_SHARP_PLUGIN |
158 | @echo SHARPDTMSDK=$(SHARPDTMSDK) | 158 | @echo SHARPDTMSDK=$(SHARPDTMSDK) |
159 | endif | 159 | endif |
160 | @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) | 160 | @echo BUILD_NO_GAMMU=$(BUILD_NO_GAMMU) |
161 | @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER) | 161 | @echo BUILD_NO_PWMANAGER=$(BUILD_NO_PWMANAGER) |
162 | @echo -------------------------------------- | 162 | @echo -------------------------------------- |
163 | 163 | ||
164 | variable_test: variable_info | 164 | variable_test: variable_info |
165 | @echo KDEPIM buildsystem, variablecheck... | 165 | @echo KDEPIM buildsystem, variablecheck... |
166 | ifndef KDEPIMDIR | 166 | ifndef KDEPIMDIR |
167 | @echo KDEPIMDIR is not defined. | 167 | @echo KDEPIMDIR is not defined. |
168 | $(error KDEPIMDIR is not defined) | 168 | $(error KDEPIMDIR is not defined) |
169 | endif | 169 | endif |
170 | ifndef PLATFORM | 170 | ifndef PLATFORM |
171 | @echo PLATFORM is not defined. | 171 | @echo PLATFORM is not defined. |
172 | $(error PLATFORM is not defined) | 172 | $(error PLATFORM is not defined) |
173 | endif | 173 | endif |
174 | ifdef BUILD_NO_LDAP_PLUGIN | 174 | ifdef BUILD_NO_LDAP_PLUGIN |
175 | @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) | 175 | @echo LDAP PLUGIN will not be build, because BUILD_NO_LDAP_PLUGIN is set to $(BUILD_NO_LDAP_PLUGIN) |
176 | endif | 176 | endif |
177 | ifdef BUILD_NO_OPIE_PLUGIN | 177 | ifdef BUILD_NO_OPIE_PLUGIN |
178 | @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN) | 178 | @echo OPIE PLUGIN will not be build, because BUILD_NO_OPIE_PLUGIN is set to $(BUILD_NO_OPIE_PLUGIN) |
179 | endif | 179 | endif |
180 | ifdef BUILD_NO_QTOPIA_PLUGIN | 180 | ifdef BUILD_NO_QTOPIA_PLUGIN |
181 | @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN) | 181 | @echo QTOPIA PLUGIN will not be build, because BUILD_NO__QTOPIA_PLUGIN is set to $(BUILD_NO__QTOPIA_PLUGIN) |
182 | endif | 182 | endif |
183 | ifdef BUILD_NO_MICROMAIL | 183 | ifdef BUILD_NO_MICROMAIL |
184 | @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) | 184 | @echo MICROMAIL will not be build, because BUILD_NO_MICROMAIL is set to $(BUILD_NO_MICROMAIL) |
185 | endif | 185 | endif |
186 | ifdef BUILD_NO_SHARP_PLUGIN | 186 | ifdef BUILD_NO_SHARP_PLUGIN |
187 | @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) | 187 | @echo SHARP PLUGIN will not be build, because BUILD_NO_SHARP_PLUGIN is set to $(BUILD_NO_SHARP_PLUGIN) |
188 | else | 188 | else |
189 | ifndef SHARPDTMSDK | 189 | ifndef SHARPDTMSDK |
190 | @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) | 190 | @echo SHARP PLUGIN can not be build, because SHARPDTMSDK is set to $(SHARPDTMSDK) |
191 | $(error SHARPDTMSDK is not defined) | 191 | $(error SHARPDTMSDK is not defined) |
192 | endif | 192 | endif |
193 | endif | 193 | endif |
194 | ifdef BUILD_NO_GAMMU | 194 | ifdef BUILD_NO_GAMMU |
195 | @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU) | 195 | @echo GAMMU will not be build, because BUILD_NO_GAMMU is set to $(BUILD_NO_GAMMU) |
196 | endif | 196 | endif |
197 | ifdef BUILD_NO_PWMANAGER | 197 | ifdef BUILD_NO_PWMANAGER |
198 | @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER) | 198 | @echo PWMANAGER will not be build, because BUILD_NO_PWMANAGER is set to $(BUILD_NO_PWMANAGER) |
199 | endif | 199 | endif |
200 | @echo -------------------------------------- | 200 | @echo -------------------------------------- |
201 | 201 | ||
202 | 202 | ||
203 | objects: | 203 | objects: |
204 | for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done | 204 | for i in $(SUBDIRS); do mkdir -p $$i/obj/$(PLATFORM); done |
205 | for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done | 205 | for i in $(SUBDIRS); do mkdir -p $$i/moc/$(PLATFORM); done |
206 | mkdir -p libical/lib/$(PLATFORM) | 206 | mkdir -p libical/lib/$(PLATFORM) |
207 | 207 | ||
208 | clean: | 208 | clean: |
209 | rm -rf libical/lib/$(PLATFORM)/*; | 209 | rm -rf libical/lib/$(PLATFORM)/*; |
210 | for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ | 210 | for i in $(SUBDIRS); do pushd $$i; make clean; rm -f *~;\ |
211 | rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ | 211 | rm -f obj/$(PLATFORM)/*; rm -f moc/$(PLATFORM)/*; rm Makefile$(PLATFORM); popd; \ |
212 | done | 212 | done |
213 | 213 | ||
214 | install: | 214 | install: |
215 | 215 | ||
216 | cd bin/kdepim; make install | 216 | cd bin/kdepim; make install |
217 | cp -r Pim $(QPEDIR)/apps | 217 | cp -r Pim $(QPEDIR)/apps |
218 | cp db2file/db2file $(QPEDIR)/bin/db2file | 218 | cp db2file/db2file $(QPEDIR)/bin/db2file |
219 | cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop | 219 | cp korganizer/korganizer.desktop $(QPEDIR)/apps/Pim/korganizer.desktop |
220 | cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop | 220 | cp kaddressbook/kaddressbook.desktop $(QPEDIR)/apps/Pim/kaddressbook.desktop |
221 | cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop | 221 | cp kmicromail/kmicromail.desktop $(QPEDIR)/apps/Pim/kopiemail.desktop |
222 | cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop | 222 | cp pwmanager/pwmanager/pwmanager.desktop $(QPEDIR)/apps/Pim/pwmanager.desktop |
223 | 223 | ||
224 | dist: | 224 | dist: |
225 | @echo Dont forget to do "make install" before "make dist" | 225 | @echo Dont forget to do "make install" before "make dist" |
226 | rm -f *arm.ipk | 226 | rm -f *arm.ipk |
227 | rm -f *~ | 227 | rm -f *~ |
228 | cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim | 228 | cd ..; tar czf kdepim.src.tar.gz --exclude=obj --exclude=moc --exclude=CVS --exclude=Makefilezaurus --exclude=Makefileqtopia kdepim |
229 | ./mkipks kmicrokdelibs.control | 229 | mkipks kmicrokdelibs.control |
230 | ./mkipks korganizer.control | 230 | mkipks korganizer.control |
231 | ./mkipks kaddressbook.control | 231 | mkipks kaddressbook.control |
232 | ifndef BUILD_NO_MICROMAIL | 232 | ifndef BUILD_NO_MICROMAIL |
233 | ./mkipks kopiemail.control | 233 | mkipks kopiemail.control |
234 | endif | 234 | endif |
235 | ./mkipks korganizer-alarm.control | 235 | mkipks korganizer-alarm.control |
236 | ifndef BUILD_NO_GAMMU | 236 | ifndef BUILD_NO_GAMMU |
237 | ./mkipks phoneaccess.control | 237 | mkipks phoneaccess.control |
238 | endif | 238 | endif |
239 | ifndef BUILD_NO_PWMANAGER | 239 | ifndef BUILD_NO_PWMANAGER |
240 | ./mkipks pwmanager.control | 240 | mkipks pwmanager.control |
241 | endif | 241 | endif |
242 | ./mkipks pim_TAB_icon.control | 242 | mkipks pim_TAB_icon.control |
243 | 243 | ||
244 | tmake: objects \ | 244 | tmake: objects \ |
245 | qtcompat/Makefile$(PLATFORM) \ | 245 | qtcompat/Makefile$(PLATFORM) \ |
246 | microkde/Makefile$(PLATFORM) \ | 246 | microkde/Makefile$(PLATFORM) \ |
247 | libkcal/Makefile$(PLATFORM) \ | 247 | libkcal/Makefile$(PLATFORM) \ |
248 | libkdepim/Makefile$(PLATFORM) \ | 248 | libkdepim/Makefile$(PLATFORM) \ |
249 | korganizer/Makefile$(PLATFORM) \ | 249 | korganizer/Makefile$(PLATFORM) \ |
250 | kalarmd/Makefile$(PLATFORM) \ | 250 | kalarmd/Makefile$(PLATFORM) \ |
251 | libical/src/libical/Makefile$(PLATFORM) \ | 251 | libical/src/libical/Makefile$(PLATFORM) \ |
252 | libical/src/libicalss/Makefile$(PLATFORM) \ | 252 | libical/src/libicalss/Makefile$(PLATFORM) \ |
253 | kabc/Makefile$(PLATFORM) \ | 253 | kabc/Makefile$(PLATFORM) \ |
254 | kabc/formats/binary/Makefile$(PLATFORM) \ | 254 | kabc/formats/binary/Makefile$(PLATFORM) \ |
255 | kabc/plugins/file/Makefile$(PLATFORM) \ | 255 | kabc/plugins/file/Makefile$(PLATFORM) \ |
256 | kabc/plugins/dir/Makefile$(PLATFORM) \ | 256 | kabc/plugins/dir/Makefile$(PLATFORM) \ |
257 | kabc/plugins/ldap/Makefile$(PLATFORM) \ | 257 | kabc/plugins/ldap/Makefile$(PLATFORM) \ |
258 | kabc/plugins/opie/Makefile$(PLATFORM) \ | 258 | kabc/plugins/opie/Makefile$(PLATFORM) \ |
259 | kabc/plugins/qtopia/Makefile$(PLATFORM) \ | 259 | kabc/plugins/qtopia/Makefile$(PLATFORM) \ |
260 | kabc/plugins/sharpdtm/Makefile$(PLATFORM) \ | 260 | kabc/plugins/sharpdtm/Makefile$(PLATFORM) \ |
261 | kaddressbook/Makefile$(PLATFORM) \ | 261 | kaddressbook/Makefile$(PLATFORM) \ |
262 | kmicromail/Makefile$(PLATFORM) \ | 262 | kmicromail/Makefile$(PLATFORM) \ |
263 | kmicromail/libetpan/Makefile$(PLATFORM) \ | 263 | kmicromail/libetpan/Makefile$(PLATFORM) \ |
264 | kmicromail/libmailwrapper/Makefile$(PLATFORM) \ | 264 | kmicromail/libmailwrapper/Makefile$(PLATFORM) \ |
265 | gammu/emb/common/Makefile$(PLATFORM) \ | 265 | gammu/emb/common/Makefile$(PLATFORM) \ |
266 | gammu/emb/gammu/Makefile$(PLATFORM) \ | 266 | gammu/emb/gammu/Makefile$(PLATFORM) \ |
267 | pwmanager/pwmanager/Makefile$(PLATFORM) \ | 267 | pwmanager/pwmanager/Makefile$(PLATFORM) \ |
268 | 268 | ||
269 | qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro | 269 | qtcompat/Makefile$(PLATFORM): qtcompat/qtcompat.pro |
270 | cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM) | 270 | cd qtcompat; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtcompat.pro -o Makefile$(PLATFORM) |
271 | 271 | ||
272 | microkde/Makefile$(PLATFORM): microkde/microkdeE.pro | 272 | microkde/Makefile$(PLATFORM): microkde/microkdeE.pro |
273 | cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM) | 273 | cd microkde; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" microkdeE.pro -o Makefile$(PLATFORM) |
274 | 274 | ||
275 | libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro | 275 | libkcal/Makefile$(PLATFORM): libkcal/libkcalE.pro |
276 | cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM) | 276 | cd libkcal; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkcalE.pro -o Makefile$(PLATFORM) |
277 | 277 | ||
278 | 278 | ||
279 | libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro | 279 | libkdepim/Makefile$(PLATFORM): libkdepim/libkdepimE.pro |
280 | cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM) | 280 | cd libkdepim; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libkdepimE.pro -o Makefile$(PLATFORM) |
281 | 281 | ||
282 | kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro | 282 | kalarmd/Makefile$(PLATFORM): kalarmd/kalarmdE.pro |
283 | cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM) | 283 | cd kalarmd; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kalarmdE.pro -o Makefile$(PLATFORM) |
284 | 284 | ||
285 | korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro | 285 | korganizer/Makefile$(PLATFORM): korganizer/korganizerE.pro |
286 | cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM) | 286 | cd korganizer; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" korganizerE.pro -o Makefile$(PLATFORM) |
287 | 287 | ||
288 | libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro | 288 | libical/src/libical/Makefile$(PLATFORM): libical/src/libical/libicalE.pro |
289 | cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM) | 289 | cd libical/src/libical; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalE.pro -o Makefile$(PLATFORM) |
290 | 290 | ||
291 | libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro | 291 | libical/src/libicalss/Makefile$(PLATFORM): libical/src/libicalss/libicalssE.pro |
292 | cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM) | 292 | cd libical/src/libicalss; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libicalssE.pro -o Makefile$(PLATFORM) |
293 | 293 | ||
294 | kabc/Makefile$(PLATFORM): kabc/kabcE.pro | 294 | kabc/Makefile$(PLATFORM): kabc/kabcE.pro |
295 | cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM) | 295 | cd kabc; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcE.pro -o Makefile$(PLATFORM) |
296 | 296 | ||
297 | kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro | 297 | kabc/formats/binary/Makefile$(PLATFORM): kabc/formats/binary/kabcformat_binaryE.pro |
298 | cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM) | 298 | cd kabc/formats/binary; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kabcformat_binaryE.pro -o Makefile$(PLATFORM) |
299 | 299 | ||
300 | kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro | 300 | kabc/plugins/file/Makefile$(PLATFORM): kabc/plugins/file/fileE.pro |
301 | cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM) | 301 | cd kabc/plugins/file; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" fileE.pro -o Makefile$(PLATFORM) |
302 | 302 | ||
303 | kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro | 303 | kabc/plugins/dir/Makefile$(PLATFORM): kabc/plugins/dir/dirE.pro |
304 | cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM) | 304 | cd kabc/plugins/dir; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" dirE.pro -o Makefile$(PLATFORM) |
305 | 305 | ||
306 | kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro | 306 | kabc/plugins/ldap/Makefile$(PLATFORM): kabc/plugins/ldap/ldapE.pro |
307 | cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM) | 307 | cd kabc/plugins/ldap; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" ldapE.pro -o Makefile$(PLATFORM) |
308 | 308 | ||
309 | kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro | 309 | kabc/plugins/opie/Makefile$(PLATFORM): kabc/plugins/opie/opieE.pro |
310 | cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM) | 310 | cd kabc/plugins/opie; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" opieE.pro -o Makefile$(PLATFORM) |
311 | 311 | ||
312 | kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro | 312 | kabc/plugins/qtopia/Makefile$(PLATFORM): kabc/plugins/qtopia/qtopiaE.pro |
313 | cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM) | 313 | cd kabc/plugins/qtopia; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" qtopiaE.pro -o Makefile$(PLATFORM) |
314 | 314 | ||
315 | kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro | 315 | kabc/plugins/sharpdtm/Makefile$(PLATFORM): kabc/plugins/sharpdtm/sharpdtmE.pro |
316 | cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM) | 316 | cd kabc/plugins/sharpdtm; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" sharpdtmE.pro -o Makefile$(PLATFORM) |
317 | 317 | ||
318 | kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro | 318 | kaddressbook/Makefile$(PLATFORM): kaddressbook/kaddressbookE.pro |
319 | cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM) | 319 | cd kaddressbook; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kaddressbookE.pro -o Makefile$(PLATFORM) |
320 | 320 | ||
321 | kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro | 321 | kmicromail/Makefile$(PLATFORM): kmicromail/kmicromailE.pro |
322 | cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM) | 322 | cd kmicromail; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" kmicromailE.pro -o Makefile$(PLATFORM) |
323 | 323 | ||
324 | kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro | 324 | kmicromail/libetpan/Makefile$(PLATFORM): kmicromail/libetpan/libetpanE.pro |
325 | cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM) | 325 | cd kmicromail/libetpan; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libetpanE.pro -o Makefile$(PLATFORM) |
326 | 326 | ||
327 | kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro | 327 | kmicromail/libmailwrapper/Makefile$(PLATFORM): kmicromail/libmailwrapper/libmailwrapperE.pro |
328 | cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM) | 328 | cd kmicromail/libmailwrapper; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" libmailwrapperE.pro -o Makefile$(PLATFORM) |
329 | 329 | ||
330 | gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro | 330 | gammu/emb/common/Makefile$(PLATFORM): gammu/emb/common/commonE.pro |
331 | cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM) | 331 | cd gammu/emb/common; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" commonE.pro -o Makefile$(PLATFORM) |
332 | 332 | ||
333 | gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro | 333 | gammu/emb/gammu/Makefile$(PLATFORM): gammu/emb/gammu/gammuE.pro |
334 | cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM) | 334 | cd gammu/emb/gammu; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" gammuE.pro -o Makefile$(PLATFORM) |
335 | 335 | ||
336 | pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro | 336 | pwmanager/pwmanager/Makefile$(PLATFORM): pwmanager/pwmanager/pwmanagerE.pro |
337 | cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM) | 337 | cd pwmanager/pwmanager; tmake "CONFIG+=$(RELEASE_DEBUG)" "VERSION=$(KDEPIM_VERSION)" pwmanagerE.pro -o Makefile$(PLATFORM) |
338 | 338 | ||
diff --git a/libkdepim/ksyncmanager.cpp b/libkdepim/ksyncmanager.cpp index 8851097..40d8e47 100644 --- a/libkdepim/ksyncmanager.cpp +++ b/libkdepim/ksyncmanager.cpp | |||
@@ -592,385 +592,389 @@ void KSyncManager::syncRemote( KSyncProfile* prof, bool ask) | |||
592 | 592 | ||
593 | int fi; | 593 | int fi; |
594 | if ( (fi = preCommand.find("$PWD$")) > 0 ) { | 594 | if ( (fi = preCommand.find("$PWD$")) > 0 ) { |
595 | QString pwd = getPassword(); | 595 | QString pwd = getPassword(); |
596 | preCommand = preCommand.left( fi )+ pwd + preCommand.mid( fi+5 ); | 596 | preCommand = preCommand.left( fi )+ pwd + preCommand.mid( fi+5 ); |
597 | 597 | ||
598 | } | 598 | } |
599 | int maxlen = 30; | 599 | int maxlen = 30; |
600 | if ( QApplication::desktop()->width() > 320 ) | 600 | if ( QApplication::desktop()->width() > 320 ) |
601 | maxlen += 25; | 601 | maxlen += 25; |
602 | mParent->topLevelWidget()->setCaption ( i18n( "Copy remote file to local machine..." ) ); | 602 | mParent->topLevelWidget()->setCaption ( i18n( "Copy remote file to local machine..." ) ); |
603 | int fileSize = 0; | 603 | int fileSize = 0; |
604 | int result = system ( preCommand ); | 604 | int result = system ( preCommand ); |
605 | // 0 : okay | 605 | // 0 : okay |
606 | // 256: no such file or dir | 606 | // 256: no such file or dir |
607 | // | 607 | // |
608 | qDebug("Sync: Remote copy result(0 = okay): %d ",result ); | 608 | qDebug("Sync: Remote copy result(0 = okay): %d ",result ); |
609 | if ( result != 0 ) { | 609 | if ( result != 0 ) { |
610 | unsigned int len = maxlen; | 610 | unsigned int len = maxlen; |
611 | while ( len < preCommand.length() ) { | 611 | while ( len < preCommand.length() ) { |
612 | preCommand.insert( len , "\n" ); | 612 | preCommand.insert( len , "\n" ); |
613 | len += maxlen +2; | 613 | len += maxlen +2; |
614 | } | 614 | } |
615 | question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (preCommand) ; | 615 | question = i18n("Sorry, the copy command failed!\nCommand was:\n%1\n \nTry command on console to get more\ndetailed info about the reason.\n").arg (preCommand) ; |
616 | QMessageBox::information( mParent, i18n("Sync - ERROR"), | 616 | QMessageBox::information( mParent, i18n("Sync - ERROR"), |
617 | question, | 617 | question, |
618 | i18n("Okay!")) ; | 618 | i18n("Okay!")) ; |
619 | mParent->topLevelWidget()->setCaption ("KDE-Pim"); | 619 | mParent->topLevelWidget()->setCaption ("KDE-Pim"); |
620 | return; | 620 | return; |
621 | } | 621 | } |
622 | mParent->topLevelWidget()->setCaption ( i18n( "Copying succeed." ) ); | 622 | mParent->topLevelWidget()->setCaption ( i18n( "Copying succeed." ) ); |
623 | //qDebug(" file **%s** ",prof->getLocalTempFile().latin1() ); | 623 | //qDebug(" file **%s** ",prof->getLocalTempFile().latin1() ); |
624 | 624 | ||
625 | if ( syncWithFile( localTempFile, true ) ) { | 625 | if ( syncWithFile( localTempFile, true ) ) { |
626 | 626 | ||
627 | if ( mWriteBackFile ) { | 627 | if ( mWriteBackFile ) { |
628 | int fi; | 628 | int fi; |
629 | if ( (fi = postCommand.find("$PWD$")) > 0 ) { | 629 | if ( (fi = postCommand.find("$PWD$")) > 0 ) { |
630 | QString pwd = getPassword(); | 630 | QString pwd = getPassword(); |
631 | postCommand = postCommand.left( fi )+ pwd + postCommand.mid( fi+5 ); | 631 | postCommand = postCommand.left( fi )+ pwd + postCommand.mid( fi+5 ); |
632 | 632 | ||
633 | } | 633 | } |
634 | mParent->topLevelWidget()->setCaption ( i18n( "Writing back file ..." ) ); | 634 | mParent->topLevelWidget()->setCaption ( i18n( "Writing back file ..." ) ); |
635 | result = system ( postCommand ); | 635 | result = system ( postCommand ); |
636 | qDebug("Sync:Writing back file result: %d ", result); | 636 | qDebug("Sync:Writing back file result: %d ", result); |
637 | if ( result != 0 ) { | 637 | if ( result != 0 ) { |
638 | mParent->topLevelWidget()->setCaption ( i18n( "Writing back file result: " )+QString::number( result ) ); | 638 | mParent->topLevelWidget()->setCaption ( i18n( "Writing back file result: " )+QString::number( result ) ); |
639 | return; | 639 | return; |
640 | } else { | 640 | } else { |
641 | mParent->topLevelWidget()->setCaption ( i18n( "Syncronization sucessfully completed" ) ); | 641 | mParent->topLevelWidget()->setCaption ( i18n( "Syncronization sucessfully completed" ) ); |
642 | } | 642 | } |
643 | } | 643 | } |
644 | } | 644 | } |
645 | return; | 645 | return; |
646 | } | 646 | } |
647 | void KSyncManager::edit_pisync_options() | 647 | void KSyncManager::edit_pisync_options() |
648 | { | 648 | { |
649 | QDialog dia( mParent, "dia", true ); | 649 | QDialog dia( mParent, "dia", true ); |
650 | dia.setCaption( i18n("Pi-Sync options for device: " ) +mCurrentSyncDevice ); | 650 | dia.setCaption( i18n("Pi-Sync options for device: " ) +mCurrentSyncDevice ); |
651 | QVBoxLayout lay ( &dia ); | 651 | QVBoxLayout lay ( &dia ); |
652 | lay.setSpacing( 5 ); | 652 | lay.setSpacing( 5 ); |
653 | lay.setMargin( 3 ); | 653 | lay.setMargin( 3 ); |
654 | QLabel lab1 ( i18n("Password for remote access:"), &dia); | 654 | QLabel lab1 ( i18n("Password for remote access:"), &dia); |
655 | lay.addWidget( &lab1 ); | 655 | lay.addWidget( &lab1 ); |
656 | QLineEdit le1 (&dia ); | 656 | QLineEdit le1 (&dia ); |
657 | lay.addWidget( &le1 ); | 657 | lay.addWidget( &le1 ); |
658 | QLabel lab2 ( i18n("Remote IP address:"), &dia); | 658 | QLabel lab2 ( i18n("Remote IP address:"), &dia); |
659 | lay.addWidget( &lab2 ); | 659 | lay.addWidget( &lab2 ); |
660 | QLineEdit le2 (&dia ); | 660 | QLineEdit le2 (&dia ); |
661 | lay.addWidget( &le2 ); | 661 | lay.addWidget( &le2 ); |
662 | QLabel lab3 ( i18n("Remote port number:"), &dia); | 662 | QLabel lab3 ( i18n("Remote port number:"), &dia); |
663 | lay.addWidget( &lab3 ); | 663 | lay.addWidget( &lab3 ); |
664 | QLineEdit le3 (&dia ); | 664 | QLineEdit le3 (&dia ); |
665 | lay.addWidget( &le3 ); | 665 | lay.addWidget( &le3 ); |
666 | QPushButton pb ( "OK", &dia); | 666 | QPushButton pb ( "OK", &dia); |
667 | lay.addWidget( &pb ); | 667 | lay.addWidget( &pb ); |
668 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); | 668 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); |
669 | le1.setText( mPassWordPiSync ); | 669 | le1.setText( mPassWordPiSync ); |
670 | le2.setText( mActiveSyncIP ); | 670 | le2.setText( mActiveSyncIP ); |
671 | le3.setText( mActiveSyncPort ); | 671 | le3.setText( mActiveSyncPort ); |
672 | if ( dia.exec() ) { | 672 | if ( dia.exec() ) { |
673 | mPassWordPiSync = le1.text(); | 673 | mPassWordPiSync = le1.text(); |
674 | mActiveSyncPort = le3.text(); | 674 | mActiveSyncPort = le3.text(); |
675 | mActiveSyncIP = le2.text(); | 675 | mActiveSyncIP = le2.text(); |
676 | } | 676 | } |
677 | 677 | ||
678 | } | 678 | } |
679 | void KSyncManager::edit_sync_options() | 679 | void KSyncManager::edit_sync_options() |
680 | { | 680 | { |
681 | 681 | ||
682 | QDialog dia( mParent, "dia", true ); | 682 | QDialog dia( mParent, "dia", true ); |
683 | dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice ); | 683 | dia.setCaption( i18n("Device: " ) +mCurrentSyncDevice ); |
684 | QButtonGroup gr ( 1, Qt::Horizontal, i18n("Sync preferences"), &dia); | 684 | QButtonGroup gr ( 1, Qt::Horizontal, i18n("Sync preferences"), &dia); |
685 | QVBoxLayout lay ( &dia ); | 685 | QVBoxLayout lay ( &dia ); |
686 | lay.setSpacing( 2 ); | 686 | lay.setSpacing( 2 ); |
687 | lay.setMargin( 3 ); | 687 | lay.setMargin( 3 ); |
688 | lay.addWidget(&gr); | 688 | lay.addWidget(&gr); |
689 | QRadioButton loc ( i18n("Take local entry on conflict"), &gr ); | 689 | QRadioButton loc ( i18n("Take local entry on conflict"), &gr ); |
690 | QRadioButton rem ( i18n("Take remote entry on conflict"), &gr ); | 690 | QRadioButton rem ( i18n("Take remote entry on conflict"), &gr ); |
691 | QRadioButton newest( i18n("Take newest entry on conflict"), &gr ); | 691 | QRadioButton newest( i18n("Take newest entry on conflict"), &gr ); |
692 | QRadioButton ask( i18n("Ask for every entry on conflict"), &gr ); | 692 | QRadioButton ask( i18n("Ask for every entry on conflict"), &gr ); |
693 | QRadioButton f_loc( i18n("Force: Take local entry always"), &gr ); | 693 | QRadioButton f_loc( i18n("Force: Take local entry always"), &gr ); |
694 | QRadioButton f_rem( i18n("Force: Take remote entry always"), &gr ); | 694 | QRadioButton f_rem( i18n("Force: Take remote entry always"), &gr ); |
695 | //QRadioButton both( i18n("Take both on conflict"), &gr ); | 695 | //QRadioButton both( i18n("Take both on conflict"), &gr ); |
696 | QPushButton pb ( "OK", &dia); | 696 | QPushButton pb ( "OK", &dia); |
697 | lay.addWidget( &pb ); | 697 | lay.addWidget( &pb ); |
698 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); | 698 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); |
699 | switch ( mSyncAlgoPrefs ) { | 699 | switch ( mSyncAlgoPrefs ) { |
700 | case 0: | 700 | case 0: |
701 | loc.setChecked( true); | 701 | loc.setChecked( true); |
702 | break; | 702 | break; |
703 | case 1: | 703 | case 1: |
704 | rem.setChecked( true ); | 704 | rem.setChecked( true ); |
705 | break; | 705 | break; |
706 | case 2: | 706 | case 2: |
707 | newest.setChecked( true); | 707 | newest.setChecked( true); |
708 | break; | 708 | break; |
709 | case 3: | 709 | case 3: |
710 | ask.setChecked( true); | 710 | ask.setChecked( true); |
711 | break; | 711 | break; |
712 | case 4: | 712 | case 4: |
713 | f_loc.setChecked( true); | 713 | f_loc.setChecked( true); |
714 | break; | 714 | break; |
715 | case 5: | 715 | case 5: |
716 | f_rem.setChecked( true); | 716 | f_rem.setChecked( true); |
717 | break; | 717 | break; |
718 | case 6: | 718 | case 6: |
719 | // both.setChecked( true); | 719 | // both.setChecked( true); |
720 | break; | 720 | break; |
721 | default: | 721 | default: |
722 | break; | 722 | break; |
723 | } | 723 | } |
724 | if ( dia.exec() ) { | 724 | if ( dia.exec() ) { |
725 | mSyncAlgoPrefs = rem.isChecked()*1+newest.isChecked()*2+ ask.isChecked()*3+ f_loc.isChecked()*4+ f_rem.isChecked()*5;//+ both.isChecked()*6 ; | 725 | mSyncAlgoPrefs = rem.isChecked()*1+newest.isChecked()*2+ ask.isChecked()*3+ f_loc.isChecked()*4+ f_rem.isChecked()*5;//+ both.isChecked()*6 ; |
726 | } | 726 | } |
727 | 727 | ||
728 | 728 | ||
729 | } | 729 | } |
730 | 730 | ||
731 | QString KSyncManager::getPassword( ) | 731 | QString KSyncManager::getPassword( ) |
732 | { | 732 | { |
733 | QString retfile = ""; | 733 | QString retfile = ""; |
734 | QDialog dia ( mParent, "input-dialog", true ); | 734 | QDialog dia ( mParent, "input-dialog", true ); |
735 | QLineEdit lab ( &dia ); | 735 | QLineEdit lab ( &dia ); |
736 | lab.setEchoMode( QLineEdit::Password ); | 736 | lab.setEchoMode( QLineEdit::Password ); |
737 | QVBoxLayout lay( &dia ); | 737 | QVBoxLayout lay( &dia ); |
738 | lay.setMargin(7); | 738 | lay.setMargin(7); |
739 | lay.setSpacing(7); | 739 | lay.setSpacing(7); |
740 | lay.addWidget( &lab); | 740 | lay.addWidget( &lab); |
741 | dia.setFixedSize( 230,50 ); | 741 | dia.setFixedSize( 230,50 ); |
742 | dia.setCaption( i18n("Enter password") ); | 742 | dia.setCaption( i18n("Enter password") ); |
743 | QPushButton pb ( "OK", &dia); | 743 | QPushButton pb ( "OK", &dia); |
744 | lay.addWidget( &pb ); | 744 | lay.addWidget( &pb ); |
745 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); | 745 | connect(&pb, SIGNAL( clicked() ), &dia, SLOT ( accept() ) ); |
746 | dia.show(); | 746 | dia.show(); |
747 | int res = dia.exec(); | 747 | int res = dia.exec(); |
748 | if ( res ) | 748 | if ( res ) |
749 | retfile = lab.text(); | 749 | retfile = lab.text(); |
750 | dia.hide(); | 750 | dia.hide(); |
751 | qApp->processEvents(); | 751 | qApp->processEvents(); |
752 | return retfile; | 752 | return retfile; |
753 | 753 | ||
754 | } | 754 | } |
755 | 755 | ||
756 | 756 | ||
757 | void KSyncManager::confSync() | 757 | void KSyncManager::confSync() |
758 | { | 758 | { |
759 | static KSyncPrefsDialog* sp = 0; | 759 | static KSyncPrefsDialog* sp = 0; |
760 | if ( ! sp ) { | 760 | if ( ! sp ) { |
761 | sp = new KSyncPrefsDialog( mParent, "syncprefs", true ); | 761 | sp = new KSyncPrefsDialog( mParent, "syncprefs", true ); |
762 | } | 762 | } |
763 | sp->usrReadConfig(); | 763 | sp->usrReadConfig(); |
764 | #ifndef DESKTOP_VERSION | 764 | #ifndef DESKTOP_VERSION |
765 | sp->showMaximized(); | 765 | sp->showMaximized(); |
766 | #else | 766 | #else |
767 | sp->show(); | 767 | sp->show(); |
768 | #endif | 768 | #endif |
769 | sp->exec(); | 769 | sp->exec(); |
770 | mSyncProfileNames = sp->getSyncProfileNames(); | 770 | mSyncProfileNames = sp->getSyncProfileNames(); |
771 | mLocalMachineName = sp->getLocalMachineName (); | 771 | mLocalMachineName = sp->getLocalMachineName (); |
772 | QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); | 772 | QTimer::singleShot ( 1, this, SLOT ( fillSyncMenu() ) ); |
773 | } | 773 | } |
774 | void KSyncManager::syncKDE() | 774 | void KSyncManager::syncKDE() |
775 | { | 775 | { |
776 | emit save(); | 776 | emit save(); |
777 | switch(mTargetApp) | 777 | switch(mTargetApp) |
778 | { | 778 | { |
779 | case (KAPI): | 779 | case (KAPI): |
780 | 780 | ||
781 | break; | 781 | break; |
782 | case (KOPI): | 782 | case (KOPI): |
783 | { | 783 | { |
784 | QString command = qApp->applicationDirPath () + "/kdecaldump"; | 784 | #ifdef DESKTOP_VERSION |
785 | QString command = qApp->applicationDirPath () + "/kdecaldump"; | ||
786 | #else | ||
787 | QString command = "kdecaldump"; | ||
788 | #endif | ||
785 | if ( ! QFile::exists ( command ) ) | 789 | if ( ! QFile::exists ( command ) ) |
786 | command = "kdecaldump"; | 790 | command = "kdecaldump"; |
787 | QString fileName = QDir::homeDirPath ()+"/.kdecalendardump.ics"; | 791 | QString fileName = QDir::homeDirPath ()+"/.kdecalendardump.ics"; |
788 | system ( command.latin1()); | 792 | system ( command.latin1()); |
789 | if ( syncWithFile( fileName,true ) ) { | 793 | if ( syncWithFile( fileName,true ) ) { |
790 | if ( mWriteBackFile ) { | 794 | if ( mWriteBackFile ) { |
791 | command += " --read"; | 795 | command += " --read"; |
792 | system ( command.latin1()); | 796 | system ( command.latin1()); |
793 | } | 797 | } |
794 | } | 798 | } |
795 | 799 | ||
796 | } | 800 | } |
797 | break; | 801 | break; |
798 | case (PWMPI): | 802 | case (PWMPI): |
799 | 803 | ||
800 | break; | 804 | break; |
801 | default: | 805 | default: |
802 | qDebug("KSyncManager::slotSyncMenu: invalid apptype selected"); | 806 | qDebug("KSyncManager::slotSyncMenu: invalid apptype selected"); |
803 | break; | 807 | break; |
804 | 808 | ||
805 | } | 809 | } |
806 | } | 810 | } |
807 | 811 | ||
808 | void KSyncManager::syncSharp() | 812 | void KSyncManager::syncSharp() |
809 | { | 813 | { |
810 | 814 | ||
811 | if ( ! syncExternalApplication("sharp") ) | 815 | if ( ! syncExternalApplication("sharp") ) |
812 | qDebug("ERROR sync sharp "); | 816 | qDebug("ERROR sync sharp "); |
813 | } | 817 | } |
814 | 818 | ||
815 | bool KSyncManager::syncExternalApplication(QString resource) | 819 | bool KSyncManager::syncExternalApplication(QString resource) |
816 | { | 820 | { |
817 | 821 | ||
818 | emit save(); | 822 | emit save(); |
819 | 823 | ||
820 | if ( mAskForPreferences ) | 824 | if ( mAskForPreferences ) |
821 | edit_sync_options(); | 825 | edit_sync_options(); |
822 | 826 | ||
823 | qDebug("Sync extern %s", resource.latin1()); | 827 | qDebug("Sync extern %s", resource.latin1()); |
824 | 828 | ||
825 | bool syncOK = mImplementation->syncExternal(this, resource); | 829 | bool syncOK = mImplementation->syncExternal(this, resource); |
826 | 830 | ||
827 | return syncOK; | 831 | return syncOK; |
828 | 832 | ||
829 | } | 833 | } |
830 | 834 | ||
831 | void KSyncManager::syncPhone() | 835 | void KSyncManager::syncPhone() |
832 | { | 836 | { |
833 | 837 | ||
834 | syncExternalApplication("phone"); | 838 | syncExternalApplication("phone"); |
835 | 839 | ||
836 | } | 840 | } |
837 | 841 | ||
838 | void KSyncManager::showProgressBar(int percentage, QString caption, int total) | 842 | void KSyncManager::showProgressBar(int percentage, QString caption, int total) |
839 | { | 843 | { |
840 | if (!bar->isVisible()) | 844 | if (!bar->isVisible()) |
841 | { | 845 | { |
842 | bar->setCaption (caption); | 846 | bar->setCaption (caption); |
843 | bar->setTotalSteps ( total ) ; | 847 | bar->setTotalSteps ( total ) ; |
844 | 848 | ||
845 | bar->show(); | 849 | bar->show(); |
846 | } | 850 | } |
847 | 851 | ||
848 | bar->setProgress( percentage ); | 852 | bar->setProgress( percentage ); |
849 | } | 853 | } |
850 | 854 | ||
851 | void KSyncManager::hideProgressBar() | 855 | void KSyncManager::hideProgressBar() |
852 | { | 856 | { |
853 | bar->hide(); | 857 | bar->hide(); |
854 | } | 858 | } |
855 | 859 | ||
856 | bool KSyncManager::isProgressBarCanceled() | 860 | bool KSyncManager::isProgressBarCanceled() |
857 | { | 861 | { |
858 | return !bar->isVisible(); | 862 | return !bar->isVisible(); |
859 | } | 863 | } |
860 | 864 | ||
861 | QString KSyncManager::syncFileName() | 865 | QString KSyncManager::syncFileName() |
862 | { | 866 | { |
863 | 867 | ||
864 | QString fn = "tempfile"; | 868 | QString fn = "tempfile"; |
865 | switch(mTargetApp) | 869 | switch(mTargetApp) |
866 | { | 870 | { |
867 | case (KAPI): | 871 | case (KAPI): |
868 | fn = "tempsyncab.vcf"; | 872 | fn = "tempsyncab.vcf"; |
869 | break; | 873 | break; |
870 | case (KOPI): | 874 | case (KOPI): |
871 | fn = "tempsynccal.ics"; | 875 | fn = "tempsynccal.ics"; |
872 | break; | 876 | break; |
873 | case (PWMPI): | 877 | case (PWMPI): |
874 | fn = "tempsyncpw.pwm"; | 878 | fn = "tempsyncpw.pwm"; |
875 | break; | 879 | break; |
876 | default: | 880 | default: |
877 | break; | 881 | break; |
878 | } | 882 | } |
879 | #ifdef _WIN32_ | 883 | #ifdef _WIN32_ |
880 | return locateLocal( "tmp", fn ); | 884 | return locateLocal( "tmp", fn ); |
881 | #else | 885 | #else |
882 | return (QString( "/tmp/" )+ fn ); | 886 | return (QString( "/tmp/" )+ fn ); |
883 | #endif | 887 | #endif |
884 | } | 888 | } |
885 | 889 | ||
886 | void KSyncManager::syncPi() | 890 | void KSyncManager::syncPi() |
887 | { | 891 | { |
888 | mPisyncFinished = false; | 892 | mPisyncFinished = false; |
889 | qApp->processEvents(); | 893 | qApp->processEvents(); |
890 | if ( mAskForPreferences ) | 894 | if ( mAskForPreferences ) |
891 | edit_pisync_options(); | 895 | edit_pisync_options(); |
892 | bool ok; | 896 | bool ok; |
893 | Q_UINT16 port = mActiveSyncPort.toUInt(&ok); | 897 | Q_UINT16 port = mActiveSyncPort.toUInt(&ok); |
894 | if ( ! ok ) { | 898 | if ( ! ok ) { |
895 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); | 899 | mParent->topLevelWidget()->setCaption( i18n("Sorry, no valid port.Syncing cancelled.") ); |
896 | return; | 900 | return; |
897 | } | 901 | } |
898 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this ); | 902 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, port, mActiveSyncIP, this ); |
899 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); | 903 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int )), this, SLOT(deleteCommandSocket(KCommandSocket*, int)) ); |
900 | mParent->topLevelWidget()->setCaption( i18n("Sending request for remote file ...") ); | 904 | mParent->topLevelWidget()->setCaption( i18n("Sending request for remote file ...") ); |
901 | commandSocket->readFile( syncFileName() ); | 905 | commandSocket->readFile( syncFileName() ); |
902 | } | 906 | } |
903 | 907 | ||
904 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) | 908 | void KSyncManager::deleteCommandSocket(KCommandSocket*s, int state) |
905 | { | 909 | { |
906 | //enum { success, errorW, errorR, quiet }; | 910 | //enum { success, errorW, errorR, quiet }; |
907 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) { | 911 | if ( state == KCommandSocket::errorR ||state == KCommandSocket::errorTO ) { |
908 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); | 912 | mParent->topLevelWidget()->setCaption( i18n("ERROR: Receiving remote file failed.") ); |
909 | delete s; | 913 | delete s; |
910 | if ( state == KCommandSocket::errorR ) { | 914 | if ( state == KCommandSocket::errorR ) { |
911 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this ); | 915 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this ); |
912 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 916 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
913 | commandSocket->sendStop(); | 917 | commandSocket->sendStop(); |
914 | } | 918 | } |
915 | mPisyncFinished = true; | 919 | mPisyncFinished = true; |
916 | return; | 920 | return; |
917 | 921 | ||
918 | } else if ( state == KCommandSocket::errorW ) { | 922 | } else if ( state == KCommandSocket::errorW ) { |
919 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); | 923 | mParent->topLevelWidget()->setCaption( i18n("ERROR:Writing back file failed.") ); |
920 | mPisyncFinished = true; | 924 | mPisyncFinished = true; |
921 | 925 | ||
922 | } else if ( state == KCommandSocket::successR ) { | 926 | } else if ( state == KCommandSocket::successR ) { |
923 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); | 927 | QTimer::singleShot( 1, this , SLOT ( readFileFromSocket())); |
924 | 928 | ||
925 | } else if ( state == KCommandSocket::successW ) { | 929 | } else if ( state == KCommandSocket::successW ) { |
926 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); | 930 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); |
927 | mPisyncFinished = true; | 931 | mPisyncFinished = true; |
928 | } | 932 | } |
929 | 933 | ||
930 | delete s; | 934 | delete s; |
931 | } | 935 | } |
932 | 936 | ||
933 | void KSyncManager::readFileFromSocket() | 937 | void KSyncManager::readFileFromSocket() |
934 | { | 938 | { |
935 | QString fileName = syncFileName(); | 939 | QString fileName = syncFileName(); |
936 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); | 940 | mParent->topLevelWidget()->setCaption( i18n("Remote file saved to temp file.") ); |
937 | if ( ! syncWithFile( fileName , true ) ) { | 941 | if ( ! syncWithFile( fileName , true ) ) { |
938 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); | 942 | mParent->topLevelWidget()->setCaption( i18n("Syncing failed.") ); |
939 | mPisyncFinished = true; | 943 | mPisyncFinished = true; |
940 | return; | 944 | return; |
941 | } | 945 | } |
942 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this ); | 946 | KCommandSocket* commandSocket = new KCommandSocket( mPassWordPiSync, mActiveSyncPort.toUInt(), mActiveSyncIP, this ); |
943 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); | 947 | connect( commandSocket, SIGNAL(commandFinished( KCommandSocket*, int)), this, SLOT(deleteCommandSocket(KCommandSocket*, int )) ); |
944 | if ( mWriteBackFile ) | 948 | if ( mWriteBackFile ) |
945 | commandSocket->writeFile( fileName ); | 949 | commandSocket->writeFile( fileName ); |
946 | else { | 950 | else { |
947 | commandSocket->sendStop(); | 951 | commandSocket->sendStop(); |
948 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); | 952 | mParent->topLevelWidget()->setCaption( i18n("Pi-Sync succesful!") ); |
949 | mPisyncFinished = true; | 953 | mPisyncFinished = true; |
950 | } | 954 | } |
951 | } | 955 | } |
952 | 956 | ||
953 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) | 957 | KServerSocket:: KServerSocket ( QString pw, Q_UINT16 port, int backlog, QObject * parent, const char * name ) : QServerSocket( port, backlog, parent, name ) |
954 | { | 958 | { |
955 | mPassWord = pw; | 959 | mPassWord = pw; |
956 | mSocket = 0; | 960 | mSocket = 0; |
957 | mSyncActionDialog = 0; | 961 | mSyncActionDialog = 0; |
958 | blockRC = false; | 962 | blockRC = false; |
959 | }; | 963 | }; |
960 | 964 | ||
961 | void KServerSocket::newConnection ( int socket ) | 965 | void KServerSocket::newConnection ( int socket ) |
962 | { | 966 | { |
963 | // qDebug("KServerSocket:New connection %d ", socket); | 967 | // qDebug("KServerSocket:New connection %d ", socket); |
964 | if ( mSocket ) { | 968 | if ( mSocket ) { |
965 | qDebug("KServerSocket::newConnection Socket deleted! "); | 969 | qDebug("KServerSocket::newConnection Socket deleted! "); |
966 | delete mSocket; | 970 | delete mSocket; |
967 | mSocket = 0; | 971 | mSocket = 0; |
968 | } | 972 | } |
969 | mSocket = new QSocket( this ); | 973 | mSocket = new QSocket( this ); |
970 | connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) ); | 974 | connect( mSocket , SIGNAL(readyRead()), this, SLOT(readClient()) ); |
971 | connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); | 975 | connect( mSocket , SIGNAL(delayedCloseFinished()), this, SLOT(discardClient()) ); |
972 | mSocket->setSocket( socket ); | 976 | mSocket->setSocket( socket ); |
973 | } | 977 | } |
974 | 978 | ||
975 | void KServerSocket::discardClient() | 979 | void KServerSocket::discardClient() |
976 | { | 980 | { |
@@ -1 +1 @@ | |||
version = "1.9.7"; | version = "1.9.8"; | ||