Skip to content

Commit f111455

Browse files
obiltschnigobiltschnig
committed
re-added MongoDB, improved buildwin and release scripts
1 parent 586c821 commit f111455

10 files changed

+322
-160
lines changed

‎CHANGELOG

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
This is the changelog file for the POCO C++ Libraries.
22

3-
Release 1.5.2 (2013-07-22)
3+
Release 1.5.2 (2013-07-23)
44
==========================
55

6+
- added MongoDB library
67
- fixed GH #57: poco-1.5.1: Doesn't compile for Android
78
- added VoidEvent (Arturo Castro)
89
- fixed GH #80: NumberFormatter::append broken

‎Makefile

+123-84
Original file line numberDiff line numberDiff line change
@@ -20,226 +20,265 @@ ifndef POCO_BUILD
2020
export POCO_BUILD=$(POCO_BASE)
2121
endif
2222

23-
# if we've built both static and shared, install shared
24-
ifeq ($(LINKMODE),BOTH)
25-
SHAREDONLY='(' -name static -prune ')' -o
26-
endif
27-
28-
# TESTS and SAMPLES are set by confgure script in config.make
29-
poco: libexecs $(if $(TESTS),tests) $(if $(SAMPLES),samples)
23+
.PHONY: poco all libexecs cppunit tests samples cleans clean distclean install
3024

25+
# TESTS and SAMPLES are set in config.make
26+
poco: libexecs $(if $(TESTS),tests) $(if $(SAMPLES),samples)
3127
all: libexecs tests samples
3228

3329
INSTALLDIR = $(DESTDIR)$(POCO_PREFIX)
34-
COMPONENTS = Foundation XML Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Zip PageCompiler PageCompiler/File2Page PDF CppParser JSON MongoDB
30+
COMPONENTS = Foundation XML JSON Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL MongoDB Zip PageCompiler PageCompiler/File2Page CppParser PDF
3531

3632
cppunit:
3733
$(MAKE) -C $(POCO_BASE)/CppUnit
3834

35+
CppUnit-clean:
36+
\$(MAKE) -C \$(POCO_BASE)/CppUnit clean
37+
3938
install: libexecs
4039
mkdir -p $(INSTALLDIR)/include/Poco
41-
mkdir -p $(INSTALLDIR)/lib$(LIB64SUFFIX)
40+
mkdir -p $(INSTALLDIR)/lib
4241
mkdir -p $(INSTALLDIR)/bin
4342
for comp in $(COMPONENTS) ; do \
4443
if [ -d "$(POCO_BASE)/$$comp/include" ] ; then \
4544
cp -Rf $(POCO_BASE)/$$comp/include/* $(INSTALLDIR)/include/ ; \
4645
fi ; \
4746
if [ -d "$(POCO_BUILD)/$$comp/bin" ] ; then \
48-
find $(POCO_BUILD)/$$comp/bin $(SHAREDONLY) '(' -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ')' ; \
47+
find $(POCO_BUILD)/$$comp/bin -perm -700 -type f -exec cp -f {} $(INSTALLDIR)/bin \; ; \
4948
fi ; \
5049
done
51-
find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib$(LIB64SUFFIX) \;
52-
find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib$(LIB64SUFFIX) \;
50+
find $(POCO_BUILD)/lib -name "libPoco*" -type f -exec cp -f {} $(INSTALLDIR)/lib \;
51+
find $(POCO_BUILD)/lib -name "libPoco*" -type l -exec cp -Rf {} $(INSTALLDIR)/lib \;
5352

54-
libexecs = Foundation-libexec XML-libexec JSON-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec PDF-libexec CppParser-libexec MongoDB-libexec
55-
tests = Foundation-tests XML-tests JSON-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests Zip-tests PDF-tests CppParser-tests MongoDB-tests
56-
samples = Foundation-samples XML-samples JSON-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples Zip-samples PageCompiler-samples PDF-samples
53+
libexecs = Foundation-libexec XML-libexec JSON-libexec Util-libexec Net-libexec Crypto-libexec NetSSL_OpenSSL-libexec Data-libexec Data/SQLite-libexec Data/ODBC-libexec Data/MySQL-libexec MongoDB-libexec Zip-libexec PageCompiler-libexec PageCompiler/File2Page-libexec CppParser-libexec PDF-libexec
54+
tests = Foundation-tests XML-tests JSON-tests Util-tests Net-tests Crypto-tests NetSSL_OpenSSL-tests Data-tests Data/SQLite-tests Data/ODBC-tests Data/MySQL-tests MongoDB-tests Zip-tests CppParser-tests PDF-tests
55+
samples = Foundation-samples XML-samples JSON-samples Util-samples Net-samples Crypto-samples NetSSL_OpenSSL-samples Data-samples MongoDB-samples Zip-samples PageCompiler-samples PDF-samples
56+
cleans = Foundation-clean XML-clean JSON-clean Util-clean Net-clean Crypto-clean NetSSL_OpenSSL-clean Data-clean Data/SQLite-clean Data/ODBC-clean Data/MySQL-clean MongoDB-clean Zip-clean PageCompiler-clean PageCompiler/File2Page-clean CppParser-clean PDF-clean
5757

58-
.PHONY: poco all libexecs cppunit tests samples clean distclean install
5958
.PHONY: $(libexecs)
6059
.PHONY: $(tests)
6160
.PHONY: $(samples)
61+
.PHONY: $(cleans)
6262

6363
libexecs: $(filter-out $(foreach f,$(OMIT),$f%),$(libexecs))
6464
tests: $(filter-out $(foreach f,$(OMIT),$f%),$(tests))
6565
samples: $(filter-out $(foreach f,$(OMIT),$f%),$(samples))
66+
cleans: $(filter-out $(foreach f,$(OMIT),$f%),$(cleans))
6667

6768
Foundation-libexec:
6869
$(MAKE) -C $(POCO_BASE)/Foundation
6970

7071
Foundation-tests: Foundation-libexec cppunit
7172
$(MAKE) -C $(POCO_BASE)/Foundation/testsuite
72-
73+
7374
Foundation-samples: Foundation-libexec
7475
$(MAKE) -C $(POCO_BASE)/Foundation/samples
7576

77+
Foundation-clean:
78+
$(MAKE) -C $(POCO_BASE)/Foundation clean
79+
$(MAKE) -C $(POCO_BASE)/Foundation/testsuite clean
80+
$(MAKE) -C $(POCO_BASE)/Foundation/samples clean
81+
7682
XML-libexec: Foundation-libexec
7783
$(MAKE) -C $(POCO_BASE)/XML
7884

7985
XML-tests: XML-libexec cppunit
8086
$(MAKE) -C $(POCO_BASE)/XML/testsuite
81-
87+
8288
XML-samples: XML-libexec
8389
$(MAKE) -C $(POCO_BASE)/XML/samples
8490

91+
XML-clean:
92+
$(MAKE) -C $(POCO_BASE)/XML clean
93+
$(MAKE) -C $(POCO_BASE)/XML/testsuite clean
94+
$(MAKE) -C $(POCO_BASE)/XML/samples clean
95+
8596
JSON-libexec: Foundation-libexec
8697
$(MAKE) -C $(POCO_BASE)/JSON
8798

8899
JSON-tests: JSON-libexec cppunit
89100
$(MAKE) -C $(POCO_BASE)/JSON/testsuite
90-
101+
91102
JSON-samples: JSON-libexec
92103
$(MAKE) -C $(POCO_BASE)/JSON/samples
93104

94-
Util-libexec: Foundation-libexec XML-libexec
105+
JSON-clean:
106+
$(MAKE) -C $(POCO_BASE)/JSON clean
107+
$(MAKE) -C $(POCO_BASE)/JSON/testsuite clean
108+
$(MAKE) -C $(POCO_BASE)/JSON/samples clean
109+
110+
Util-libexec: Foundation-libexec XML-libexec JSON-libexec
95111
$(MAKE) -C $(POCO_BASE)/Util
96112

97113
Util-tests: Util-libexec cppunit
98114
$(MAKE) -C $(POCO_BASE)/Util/testsuite
99-
115+
100116
Util-samples: Util-libexec
101117
$(MAKE) -C $(POCO_BASE)/Util/samples
102118

119+
Util-clean:
120+
$(MAKE) -C $(POCO_BASE)/Util clean
121+
$(MAKE) -C $(POCO_BASE)/Util/testsuite clean
122+
$(MAKE) -C $(POCO_BASE)/Util/samples clean
123+
103124
Net-libexec: Foundation-libexec
104125
$(MAKE) -C $(POCO_BASE)/Net
105126

106127
Net-tests: Net-libexec cppunit
107128
$(MAKE) -C $(POCO_BASE)/Net/testsuite
108-
129+
109130
Net-samples: Net-libexec Foundation-libexec XML-libexec Util-libexec
110131
$(MAKE) -C $(POCO_BASE)/Net/samples
111132

133+
Net-clean:
134+
$(MAKE) -C $(POCO_BASE)/Net clean
135+
$(MAKE) -C $(POCO_BASE)/Net/testsuite clean
136+
$(MAKE) -C $(POCO_BASE)/Net/samples clean
137+
112138
Crypto-libexec: Foundation-libexec
113139
$(MAKE) -C $(POCO_BASE)/Crypto
114140

115141
Crypto-tests: Crypto-libexec cppunit
116142
$(MAKE) -C $(POCO_BASE)/Crypto/testsuite
117-
143+
118144
Crypto-samples: Crypto-libexec Foundation-libexec Util-libexec
119145
$(MAKE) -C $(POCO_BASE)/Crypto/samples
120146

147+
Crypto-clean:
148+
$(MAKE) -C $(POCO_BASE)/Crypto clean
149+
$(MAKE) -C $(POCO_BASE)/Crypto/testsuite clean
150+
$(MAKE) -C $(POCO_BASE)/Crypto/samples clean
151+
121152
NetSSL_OpenSSL-libexec: Foundation-libexec Net-libexec Util-libexec Crypto-libexec
122153
$(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL
123154

124155
NetSSL_OpenSSL-tests: NetSSL_OpenSSL-libexec cppunit
125156
$(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/testsuite
126-
157+
127158
NetSSL_OpenSSL-samples: NetSSL_OpenSSL-libexec
128159
$(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/samples
129160

161+
NetSSL_OpenSSL-clean:
162+
$(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL clean
163+
$(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/testsuite clean
164+
$(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/samples clean
165+
130166
Data-libexec: Foundation-libexec
131167
$(MAKE) -C $(POCO_BASE)/Data
132168

133169
Data-tests: Data-libexec cppunit
134170
$(MAKE) -C $(POCO_BASE)/Data/testsuite
135-
171+
136172
Data-samples: Data-libexec Data-libexec Data/SQLite-libexec
137173
$(MAKE) -C $(POCO_BASE)/Data/samples
138174

175+
Data-clean:
176+
$(MAKE) -C $(POCO_BASE)/Data clean
177+
$(MAKE) -C $(POCO_BASE)/Data/testsuite clean
178+
$(MAKE) -C $(POCO_BASE)/Data/samples clean
179+
139180
Data/SQLite-libexec: Foundation-libexec Data-libexec
140181
$(MAKE) -C $(POCO_BASE)/Data/SQLite
141182

142183
Data/SQLite-tests: Data/SQLite-libexec cppunit
143184
$(MAKE) -C $(POCO_BASE)/Data/SQLite/testsuite
144185

186+
Data/SQLite-clean:
187+
$(MAKE) -C $(POCO_BASE)/Data/SQLite clean
188+
$(MAKE) -C $(POCO_BASE)/Data/SQLite/testsuite clean
189+
145190
Data/ODBC-libexec: Foundation-libexec Data-libexec
146191
$(MAKE) -C $(POCO_BASE)/Data/ODBC
147192

148193
Data/ODBC-tests: Data/ODBC-libexec cppunit
149194
$(MAKE) -C $(POCO_BASE)/Data/ODBC/testsuite
150195

196+
Data/ODBC-clean:
197+
$(MAKE) -C $(POCO_BASE)/Data/ODBC clean
198+
$(MAKE) -C $(POCO_BASE)/Data/ODBC/testsuite clean
199+
151200
Data/MySQL-libexec: Foundation-libexec Data-libexec
152201
$(MAKE) -C $(POCO_BASE)/Data/MySQL
153202

154203
Data/MySQL-tests: Data/MySQL-libexec cppunit
155204
$(MAKE) -C $(POCO_BASE)/Data/MySQL/testsuite
156205

206+
Data/MySQL-clean:
207+
$(MAKE) -C $(POCO_BASE)/Data/MySQL clean
208+
$(MAKE) -C $(POCO_BASE)/Data/MySQL/testsuite clean
209+
210+
MongoDB-libexec: Foundation-libexec Net-libexec
211+
$(MAKE) -C $(POCO_BASE)/MongoDB
212+
213+
MongoDB-tests: MongoDB-libexec cppunit
214+
$(MAKE) -C $(POCO_BASE)/MongoDB/testsuite
215+
216+
MongoDB-samples: MongoDB-libexec
217+
$(MAKE) -C $(POCO_BASE)/MongoDB/samples
218+
219+
MongoDB-clean:
220+
$(MAKE) -C $(POCO_BASE)/MongoDB clean
221+
$(MAKE) -C $(POCO_BASE)/MongoDB/testsuite clean
222+
$(MAKE) -C $(POCO_BASE)/MongoDB/samples clean
223+
157224
Zip-libexec: Foundation-libexec Net-libexec Util-libexec XML-libexec
158225
$(MAKE) -C $(POCO_BASE)/Zip
159226

160227
Zip-tests: Zip-libexec cppunit
161228
$(MAKE) -C $(POCO_BASE)/Zip/testsuite
162-
229+
163230
Zip-samples: Zip-libexec
164231
$(MAKE) -C $(POCO_BASE)/Zip/samples
165232

233+
Zip-clean:
234+
$(MAKE) -C $(POCO_BASE)/Zip clean
235+
$(MAKE) -C $(POCO_BASE)/Zip/testsuite clean
236+
$(MAKE) -C $(POCO_BASE)/Zip/samples clean
237+
166238
PageCompiler-libexec: Net-libexec Util-libexec XML-libexec Foundation-libexec
167239
$(MAKE) -C $(POCO_BASE)/PageCompiler
168-
240+
169241
PageCompiler-samples: PageCompiler-libexec
170242
$(MAKE) -C $(POCO_BASE)/PageCompiler/samples
171243

244+
PageCompiler-clean:
245+
$(MAKE) -C $(POCO_BASE)/PageCompiler clean
246+
$(MAKE) -C $(POCO_BASE)/PageCompiler/samples clean
247+
172248
PageCompiler/File2Page-libexec: Net-libexec Util-libexec XML-libexec Foundation-libexec
173249
$(MAKE) -C $(POCO_BASE)/PageCompiler/File2Page
174250

175-
PDF-libexec: Foundation-libexec
176-
$(MAKE) -C $(POCO_BASE)/PDF
177-
178-
PDF-tests: PDF-libexec cppunit
179-
$(MAKE) -C $(POCO_BASE)/PDF/testsuite
180-
181-
PDF-samples: PDF-libexec
182-
$(MAKE) -C $(POCO_BASE)/PDF/samples
251+
PageCompiler/File2Page-clean:
252+
$(MAKE) -C $(POCO_BASE)/PageCompiler/File2Page clean
183253

184-
CppParser-libexec: Foundation-libexec
254+
CppParser-libexec: Foundation-libexec
185255
$(MAKE) -C $(POCO_BASE)/CppParser
186256

187-
CppParser-tests: CppParser-libexec
257+
CppParser-tests: CppParser-libexec cppunit
188258
$(MAKE) -C $(POCO_BASE)/CppParser/testsuite
189259

190-
MongoDB-libexec: Foundation-libexec Net-libexec
191-
$(MAKE) -C $(POCO_BASE)/MongoDB
260+
CppParser-clean:
261+
$(MAKE) -C $(POCO_BASE)/CppParser clean
262+
$(MAKE) -C $(POCO_BASE)/CppParser/testsuite clean
192263

193-
MongoDB-tests: MongoDB-libexec Net-libexec cppunit
194-
$(MAKE) -C $(POCO_BASE)/MongoDB/testsuite
264+
PDF-libexec: Foundation-libexec
265+
$(MAKE) -C $(POCO_BASE)/PDF
195266

267+
PDF-tests: PDF-libexec cppunit
268+
$(MAKE) -C $(POCO_BASE)/PDF/testsuite
269+
270+
PDF-samples: PDF-libexec
271+
$(MAKE) -C $(POCO_BASE)/PDF/samples
196272

197-
clean:
198-
$(MAKE) -C $(POCO_BASE)/Foundation clean
199-
$(MAKE) -C $(POCO_BASE)/Foundation/testsuite clean
200-
$(MAKE) -C $(POCO_BASE)/Foundation/samples clean
201-
$(MAKE) -C $(POCO_BASE)/XML clean
202-
$(MAKE) -C $(POCO_BASE)/XML/testsuite clean
203-
$(MAKE) -C $(POCO_BASE)/XML/samples clean
204-
$(MAKE) -C $(POCO_BASE)/Util clean
205-
$(MAKE) -C $(POCO_BASE)/Util/testsuite clean
206-
$(MAKE) -C $(POCO_BASE)/Util/samples clean
207-
$(MAKE) -C $(POCO_BASE)/Net clean
208-
$(MAKE) -C $(POCO_BASE)/Net/testsuite clean
209-
$(MAKE) -C $(POCO_BASE)/Net/samples clean
210-
$(MAKE) -C $(POCO_BASE)/Crypto clean
211-
$(MAKE) -C $(POCO_BASE)/Crypto/testsuite clean
212-
$(MAKE) -C $(POCO_BASE)/Crypto/samples clean
213-
$(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL clean
214-
$(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/testsuite clean
215-
$(MAKE) -C $(POCO_BASE)/NetSSL_OpenSSL/samples clean
216-
$(MAKE) -C $(POCO_BASE)/Data clean
217-
$(MAKE) -C $(POCO_BASE)/Data/testsuite clean
218-
$(MAKE) -C $(POCO_BASE)/Data/samples clean
219-
$(MAKE) -C $(POCO_BASE)/Data/SQLite clean
220-
$(MAKE) -C $(POCO_BASE)/Data/SQLite/testsuite clean
221-
$(MAKE) -C $(POCO_BASE)/Data/ODBC clean
222-
$(MAKE) -C $(POCO_BASE)/Data/ODBC/testsuite clean
223-
$(MAKE) -C $(POCO_BASE)/Data/MySQL clean
224-
$(MAKE) -C $(POCO_BASE)/Data/MySQL/testsuite clean
225-
$(MAKE) -C $(POCO_BASE)/Zip clean
226-
$(MAKE) -C $(POCO_BASE)/Zip/testsuite clean
227-
$(MAKE) -C $(POCO_BASE)/Zip/samples clean
228-
$(MAKE) -C $(POCO_BASE)/PageCompiler clean
229-
$(MAKE) -C $(POCO_BASE)/PageCompiler/samples clean
230-
$(MAKE) -C $(POCO_BASE)/PageCompiler/File2Page clean
273+
PDF-clean:
231274
$(MAKE) -C $(POCO_BASE)/PDF clean
232275
$(MAKE) -C $(POCO_BASE)/PDF/testsuite clean
233276
$(MAKE) -C $(POCO_BASE)/PDF/samples clean
234-
$(MAKE) -C $(POCO_BASE)/CppParser clean
235-
$(MAKE) -C $(POCO_BASE)/CppParser/testsuite clean
236-
$(MAKE) -C $(POCO_BASE)/CppUnit clean
237-
$(MAKE) -C $(POCO_BASE)/JSON clean
238-
$(MAKE) -C $(POCO_BASE)/JSON/testsuite clean
239-
$(MAKE) -C $(POCO_BASE)/JSON/samples clean
240-
$(MAKE) -C $(POCO_BASE)/MongoDB clean
241-
$(MAKE) -C $(POCO_BASE)/MongoDB/testsuite clean
277+
278+
clean: cleans CppUnit-clean
242279

243280
distclean:
244281
rm -rf $(POCO_BUILD)/lib
245-
find $(POCO_BUILD) \( -name bin -o -name .dep -o -name obj \) -type d -print0 | xargs -0 rm -rf
282+
find $(POCO_BUILD) -name obj -type d -print0 | xargs -0 rm -rf
283+
find $(POCO_BUILD) -name .dep -type d -print0 | xargs -0 rm -rf
284+
find $(POCO_BUILD) -name bin -type d -print0 | xargs -0 rm -rf

‎PDF/dependencies

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Foundation

0 commit comments

Comments
 (0)