Merge lp:~zorba-coders/zorba/bug1151967 into lp:zorba
- bug1151967
- Merge into trunk
Status: | Needs review | ||||
---|---|---|---|---|---|
Proposed branch: | lp:~zorba-coders/zorba/bug1151967 | ||||
Merge into: | lp:zorba | ||||
Diff against target: |
1182 lines (+1068/-4) 16 files modified
scripts/winports/CMakeLists.txt (+741/-0) scripts/winports/download.cmake (+45/-0) scripts/winports/libiconv/CMakeLists.txt (+31/-0) scripts/winports/libiconv/config.h.patch (+4/-0) scripts/winports/libiconv/iconv.c.patch (+4/-0) scripts/winports/libiconv/iconv.h.patch (+34/-0) scripts/winports/libiconv/libiconv.rc.patch (+5/-0) scripts/winports/libiconv/localcharset.c.patch (+8/-0) scripts/winports/libiconv/localcharset.h.patch (+14/-0) scripts/winports/libiconv/move.cmake (+7/-0) scripts/winports/openssl/CMakeLists.txt (+170/-0) src/compiler/parser/jsoniq_parser.cpp (+1/-1) src/compiler/parser/jsoniq_scanner.cpp (+1/-0) src/runtime/hof/fn_hof_functions_impl.cpp (+1/-1) src/runtime/uris/uris_impl.cpp (+1/-1) test/unit/external_function.cpp (+1/-1) |
||||
To merge this branch: | bzr merge lp:~zorba-coders/zorba/bug1151967 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Chris Hillery | Approve | ||
Rodolfo Ochoa | Pending | ||
Review via email: mp+162905@code.launchpad.net |
Commit message
Description of the change
- 11440. By [u'sorin.marian.nasoi <email address hidden>']
-
- bumped FOTS snapshot to May 8th
- updated DISPUTED test-cases Approved: Chris Hillery, Sorin Marian Nasoi - 11441. By [u'Markos Zaharioudakis <email address hidden>']
-
Implemented resolution of module-import cycles according to the W3C XQuery 3.0 spec Approved: Markos Zaharioudakis
- 11442. By [u'Nicolae Brinza <email address hidden>', u'Paul J. Lucas <email address hidden>']
-
Fixed a bug in the parser that was revealed by bison 2.7 + #include clean-up Approved: Paul J. Lucas, Nicolae Brinza
- 11443. By [u'Paul J. Lucas <email address hidden>']
-
Completely reworked the implementation of Integer so that it now correctly handles xs:integer, xs:negativeInteger, xs:nonNegativeI
nteger, and xs:positiveInteger. Also cleaned-up #includes for Zorba classes so as to reduce uncessary #includes.
This is an intermediate merge proposal just go get all of the above changes in. The actual fix for distinct-values() will come later depending on the outcome of the thread posted to zorba-dev. Approved: Matthias Brantner, Paul J. Lucas
- 11444. By [u'Paul J. Lucas <email address hidden>']
-
Fixed for large sequences. Approved: Matthias Brantner, Paul J. Lucas
- 11445. By [u'Paul J. Lucas <email address hidden>']
-
Util function argument bullet-proofing and clean-up. Approved: Matthias Brantner, Paul J. Lucas
- 11446. By [u'Paul J. Lucas <email address hidden>']
-
Fixed exception caught since it changed. Also fixes error code returned for some tests. Approved: Matthias Brantner, Paul J. Lucas
- 11447. By [u'Markos Zaharioudakis <email address hidden>']
-
exact match for flwor exprs Approved: Markos Zaharioudakis
- 11448. By [u'Paul J. Lucas <email address hidden>']
-
Fixes stupid null-pointer dereference. Approved: Juan Zacarias, Paul J. Lucas
- 11449. By [<email address hidden>']
-
Pruning dead and unused code and scripts from the test directory. Approved: Luis Rodriguez Gonzalez, Chris Hillery
- 11450. By [u'Paul J. Lucas <email address hidden>']
-
Fixed documentation typos. Approved: Matthias Brantner, Paul J. Lucas
- 11451. By [u'Paul J. Lucas <email address hidden>']
-
Rewrote decimal reduction code -- fixes rounding and FOTS distinct-values tests. Approved: Matthias Brantner, Paul J. Lucas
- 11452. By [u'Nicolae Brinza <email address hidden>', u'Ghislain Fourny <ghislain.fourny@28msec.com>', <email address hidden>', <email address hidden>']
-
Added "common" language option and warnings. Re-enabled path expressions in JSONiq grammar. Approved: Nicolae Brinza, Matthias Brantner, Ghislain Fourny
- 11453. By [u'Paul J. Lucas <email address hidden>']
-
Renamed floatimpl.h/.cpp to float.h/.cpp. Why it had impl in the name by decimal and integer didn't isn't clear. I've been meaning to do this for a while. Approved: Juan Zacarias, Paul J. Lucas
- 11454. By [u'Paul J. Lucas <email address hidden>']
-
Better float-to-
int-overflow checking -- fixes two FOTS tests.
Better string-to-integer conversion exception catching -- fixes 3 FOTS tests. Approved: Matthias Brantner, Paul J. Lucas - 11455. By [u'Markos Zaharioudakis <email address hidden>']
-
1. Implemented hoisting optimization for general FLWOR.
2. Fixed bug in hoisting through try-catch expr Approved: Markos Zaharioudakis - 11456. By [u'Paul J. Lucas <email address hidden>']
-
I forgot to commit this file before the previous merge.
Better string-to-integer conversion exception catching -- fixes 3 FOTS tests. Approved: Matthias Brantner, Paul J. Lucas
- 11457. By [u'Nicolae Brinza <email address hidden>']
-
Modified files that use the process module to request version 1.0, in preparation of the new version of the module. Approved: Matthias Brantner, Nicolae Brinza
- 11458. By [u'Juan Zacarias <email address hidden>']
-
Windows fix for src/util/stl_util.h Approved: Paul J. Lucas, Juan Zacarias
- 11459. By [<email address hidden>']
-
Consolidate all test driver sources into one place. Eliminate stale and unused scripts and source. Approved: Juan Zacarias, Chris Hillery
- 11460. By [u'sorin.marian.nasoi <email address hidden>', u'Cezar Andrei <email address hidden>']
-
Fixes for bug1167400 validate type failures (at least 9) Approved: Sorin Marian Nasoi, Cezar Andrei
- 11461. By [u'sorin.marian.nasoi <email address hidden>']
-
updated DISPUTED test-cases according to the latest comments in W3C bug #21568 Approved: Chris Hillery, Sorin Marian Nasoi
- 11462. By [u'Paul J. Lucas <email address hidden>']
-
Fix the use of setlocale(3) in locale.cpp reported by Federico Cavalieri. Approved: Federico Cavalieri, Paul J. Lucas
- 11463. By [u'Paul J. Lucas <email address hidden>']
-
Now using proper types for xs:integer and friends. Approved: Matthias Brantner, Paul J. Lucas
Rodolfo Ochoa (rodolfo-ochoa) wrote : | # |
added:
- openssl
- curl
- 11464. By [u'Paul J. Lucas <email address hidden>']
-
Undid some of my previous changes regarding which std exception is thrown by IntegerImpl. Now, invalid_argument is used when the argument is not a valid integer; range_error is used when the value is a valid integer, but out of range for the type (or a valid floating point constant like INF). Generally, invalid_argument will map to FOCA0002 and range_error will map to FORG0001.
This fixes several "wrongError" FOTS tests. Approved: Matthias Brantner, Paul J. Lucas
- 11465. By [u'Markos Zaharioudakis <email address hidden>']
-
Fixed and optimized deep-equal (bug #1180023) Approved: Markos Zaharioudakis
- 11466. By [<email address hidden>']
-
If specified EXTERNAL jar is a symlink, install the target of the symlink. Approved: Juan Zacarias, Chris Hillery
- 11467. By [<email address hidden>']
-
Bump all tagged modules to zorba-2.9. Approved: Juan Zacarias, Chris Hillery
- 11468. By [u'sorin.marian.nasoi <email address hidden>']
-
- split the XQ10 from XQ30 reporting; by default XQ30 reporting is assumed.
- this is also a partial fix for lp:1018201 : the FOTS driver can now generate separate conformance results for XQuery 1.0 and XQuery 3.0. Approved: Chris Hillery, Markos Zaharioudakis, Sorin Marian Nasoi - 11469. By [u'Markos Zaharioudakis <email address hidden>']
-
1, Implemented document-ordering elimination for general FLWOR.
2. No need to apply document ordering on the domain expression of a FOR clause, if the FOR clause is followed by an orderby or groupby clause.
3. Must apply document ordering on the domain expression of a FOR clause, if the FOR clause is followed by a sequential clause.
4. Applied count optimization to the return clause of general FLWORs Approved: Markos Zaharioudakis - 11470. By [u'Paul J. Lucas <email address hidden>']
-
Corrected time-zone units and did a clean-up of the TimeZone class. Approved: Matthias Brantner, Paul J. Lucas
- 11471. By [u'Paul J. Lucas <email address hidden>']
-
Now adhere to the spec regarding negative numbers in English. Approved: Matthias Brantner, Paul J. Lucas
- 11472. By [u'Paul J. Lucas <email address hidden>']
-
Removed #if 0's to enable new XML output code. Approved: Matthias Brantner, Paul J. Lucas
- 11473. By [u'Markos Zaharioudakis <email address hidden>']
-
1. Implemented flwor-merge optimization for general FLWOR.
2. Removed gflwor_expr_kind
Approved: Markos Zaharioudakis - 11474. By [u'Markos Zaharioudakis <email address hidden>']
-
fixed xray performance regression + cleanup Approved: Markos Zaharioudakis
- 11475. By [u'sorin.marian.nasoi <email address hidden>']
-
- bumped FOTS snapshot to May 22nd and updated failures accordingly
- fixed query and added some useful trace info Approved: Chris Hillery, Sorin Marian Nasoi
Rodolfo Ochoa (rodolfo-ochoa) wrote : | # |
I was able to run it successfully on:
- WinXP with VS2010
- Win7 with VS2012
Rodolfo Ochoa (rodolfo-ochoa) wrote : | # |
TODO:
swig
php
python
ruby
java
- jni
- xmlbeans
- xslfop
- pdfbox
- fontbox
- KV-client oracle-nosql
- jemp-box
- commons logging
- sqlite3
- libarchive
- libcouchbase
- c-client
- imagemagick
- 11476. By [u'Markos Zaharioudakis <email address hidden>']
-
Removed binary-format and save-options parameters from XQuery:
:saveExecutionP lan (also fixes bug #1069586) Approved: Markos Zaharioudakis - 11477. By [u'Markos Zaharioudakis <email address hidden>']
-
disabled throwing of error XPST0005 for path exprs (also fixes bug #1090514) Approved: Markos Zaharioudakis
- 11478. By [u'Paul J. Lucas <email address hidden>']
-
Removed unncessary (and now wrong) cast. Approved: Matthias Brantner, Paul J. Lucas
- 11479. By [<email address hidden>']
-
Bump certain non-core modules to zorba-2.9.1 tag. Approved: Juan Zacarias, Chris Hillery
- 11480. By [u'Markos Zaharioudakis <email address hidden>']
-
Removed the Batcher class from the runtime (saves 10% off the size of the zorba library) Approved: Markos Zaharioudakis
- 11481. By [u'Rodolfo Ochoa <<email address hidden>', u'Juan Zacarias<email address hidden>']
-
php swig was creating the zorba_api.so with a wrong name. Approved: Juan Zacarias, Chris Hillery
- 11482. By [u'Federico Cavalieri <federico.cavalieri@28msec.com>']
-
Fixed casts to and from null Approved: Markos Zaharioudakis, Matthias Brantner
- 11483. By [u'sorin.marian.nasoi <email address hidden>']
-
- bumped FOTS to May 30th
- removed DISPUTED test-cases related to W3C bug #21868
- set the newly added 'serialization' dependency to false because Zorba does not support the option to set the serialization parameters in the query prolog
- added lp:1185989 for all test-cases that end in Seg Fault on Fedora 64 bit Approved: Sorin Marian Nasoi, Chris Hillery - 11484. By [u'Markos Zaharioudakis <email address hidden>']
-
1. Potential fix for bug #1185989
2. Some optimization for the hoisting rule.
Approved: Markos Zaharioudakis - 11485. By [u'Markos Zaharioudakis <email address hidden>']
-
caching of the index view expression Approved: Markos Zaharioudakis
- 11486. By [u'sorin.marian.nasoi <email address hidden>']
-
removed list of test-cases that used to Seg Fault on Fedora 64 bit Approved: Markos Zaharioudakis, Sorin Marian Nasoi
- 11487. By [u'Markos Zaharioudakis <email address hidden>']
-
fixes for bugs 1186114 and 1186110 Approved: Markos Zaharioudakis
- 11488. By [u'Paul J. Lucas <email address hidden>']
-
Removed erroneous (?) ZORBA_ASSERT.
Other minor fixes. Approved: William Candillon, Paul J. Lucas - 11489. By [u'Markos Zaharioudakis <email address hidden>']
-
fixed memory error in UserDefinedXQTy
pe::isSuperType Of() Approved: Markos Zaharioudakis - 11490. By [u'Paul J. Lucas <email address hidden>']
-
Removed category enum and everything that goes along with it. Approved: Chris Hillery, Paul J. Lucas
- 11491. By [u'sorin.marian.nasoi <email address hidden>']
-
- partial fix for lp:1182910: updated function names from fn:map and fn:map-pairs to fn:for-each and fn:for-each-pair
- updated order of params for functions: fn:for-each, fn:for-each-pair, fn:filter, fn:fold-right, fn:fold-left
- updated XQuery 3.0 F&O spec for test xquery_30 Approved: Sorin Marian Nasoi, Nicolae Brinza - 11492. By [u'sorin.marian.nasoi <email address hidden>']
-
- bumped FOTS snapshot to May 5th and updated expected failures accordingly Approved: Chris Hillery, Sorin Marian Nasoi
- 11493. By [u'Markos Zaharioudakis <email address hidden>']
-
relaxed type restrictions for jsoniq navigation and related functions Approved: Markos Zaharioudakis
- 11494. By [u'Paul J. Lucas <email address hidden>']
-
Now converting regex in fn:tokenize(). Approved: Matthias Brantner, Paul J. Lucas
- 11495. By [u'sorin.marian.nasoi <email address hidden>']
-
- bumped FOTS version
- added LP/W3C bug numbers to all expected FOTS failures
- added the description of the test-case as part of FOTS driver output Approved: Sorin Marian Nasoi, Chris Hillery - 11496. By [u'Paul J. Lucas <email address hidden>', u'Juan Zacarias <email address hidden>']
-
Fixes for Windows. Approved: Paul J. Lucas, Juan Zacarias
- 11497. By [u'Markos Zaharioudakis <email address hidden>']
-
allow item()* as the input of jn:keys and jn:members functions Approved: Markos Zaharioudakis
- 11498. By [u'Markos Zaharioudakis <email address hidden>']
-
no math prefix required for jsoniq Approved: Markos Zaharioudakis
- 11499. By [u'sorin.marian.nasoi <email address hidden>']
-
- bumped FOTS snapshot to May 11th
- updated DISPUTED test-cases
Approved: Chris Hillery, Sorin Marian Nasoi - 11500. By [u'Markos Zaharioudakis <email address hidden>']
-
1. optimization: replaced use of create_value_type() in runtime with getTypeCode()
2. optimized switch expression Approved: Markos Zaharioudakis - 11501. By [u'Markos Zaharioudakis <email address hidden>']
-
fix hof regressions caused by Sorin/Nicolai checkin in 11491 Approved: Markos Zaharioudakis
- 11502. By [u'Paul J. Lucas <email address hidden>']
-
Fixed fn:replace() replacement string that has > 9 $ substitutions. Approved: Matthias Brantner, Paul J. Lucas
- 11503. By [u'Nicolae Brinza <email address hidden>', u'Matthias Brantner <matthias.brantner@28msec.com>']
-
The grouping variable in a group by clause is now optional. Approved: Matthias Brantner, Nicolae Brinza
- 11504. By [u'Paul J. Lucas <email address hidden>', <email address hidden>']
-
Removed plethora of file classes; moved much of fs_util to the public API to take its place. Approved: Chris Hillery, Matthias Brantner, Paul J. Lucas
- 11505. By [<email address hidden>']
-
Restore normal trunk branches for modules. Approved: Paul J. Lucas, Chris Hillery
- 11506. By [u'Paul J. Lucas <email address hidden>']
-
Removed redundant typedef and #includes. Approved: Matthias Brantner, Paul J. Lucas
- 11507. By [u'sorin.marian.nasoi <email address hidden>']
-
- temporary fix for lp:1187807: FOTS driver adds a base-uri in the prolog; the complete/clean fix requires lp:1133806 to be fixed. Approved: Sorin Marian Nasoi, Chris Hillery
- 11508. By [u'Paul J. Lucas <email address hidden>']
-
Made base-name/dir-name "external," hence implemented in C++ rather than XQuery. The C++ implementation is trivial and the XQuery implementation was dozens of lines. The XQuery implementation hangs (after fs_util merge) for some bizarre reason and it's not worth debugging when the C++ implementation is much better. Approved: Matthias Brantner, Paul J. Lucas
- 11509. By [u'Paul J. Lucas <email address hidden>']
-
Relocated some headers to zorba/include/util. Approved: Chris Hillery, Paul J. Lucas
- 11510. By [<email address hidden>']
-
Relocated some headers to zorba/include/util. Approved: Chris Hillery, Paul J. Lucas
- 11511. By [u'Paul J. Lucas <email address hidden>']
-
Fix file::create-dir(): if the directory exists, do nothing. Approved: Ghislain Fourny, Paul J. Lucas
- 11512. By [u'sorin.marian.nasoi <email address hidden>']
-
- updated FOTS snapshot to June 13th
- updated expected FOTS failure Approved: Chris Hillery, Sorin Marian Nasoi - 11513. By [u'Markos Zaharioudakis <email address hidden>']
-
"Fixed bug #1190407 (wrong rewrite of if-then-else return clause in case of general flwor) Approved: Markos Zaharioudakis
- 11514. By [u'Paul J. Lucas <email address hidden>']
-
file:create-
directory( ) now creates intermediate directories.
(Also fixed error messages off-by-one bug in error_util.) Approved: Ghislain Fourny, Paul J. Lucas - 11515. By [u'Matthias Brantner <matthias.brantner@28msec.com>']
-
remove ZORBA_WITH_JSON flag Approved: Paul J. Lucas, Matthias Brantner
- 11516. By [u'Markos Zaharioudakis <email address hidden>']
-
Optimized implementation of function caching and removed the restriction on the return type. Approved: Markos Zaharioudakis
- 11517. By [u'Markos Zaharioudakis <email address hidden>']
-
1. New syntax for array unboxing and navigation: $a[] and $a[[3]]
2. Fixed serialization bug for hybrid sequences with json items Approved: Markos Zaharioudakis - 11518. By [u'Paul J. Lucas <email address hidden>']
-
Eliminated MAX_PATH use on *nix (it's PATH_MAX there anyway). In sole remaining use of PATH_MAX in fs::curdir(), its use is mitigated by increasing the buffer size as needed.
Also cleaned-up:
* Wide-to-narrow (and vice versa) WIN32 character conversion
* Mutex use. Approved: Juan Zacarias, Matthias Brantner, Paul J. Lucas - 11519. By [u'Markos Zaharioudakis <email address hidden>']
-
updated test result Approved: Markos Zaharioudakis
- 11520. By [u'Paul J. Lucas <email address hidden>']
-
* Added zorba/include/
zorba/internal/ README. txt.
* Added/cleaned-up some C++ documentation.
* Fixed bug #1190710 (fn-format-date failures). Approved: Matthias Brantner, Paul J. Lucas - 11521. By [u'Markos Zaharioudakis <email address hidden>']
-
Fixed bug #1188280 (casting xs:id to xs:ncname) Approved: Markos Zaharioudakis
- 11522. By [u'Markos Zaharioudakis <email address hidden>']
-
fixed bug in new array navigation Approved: Markos Zaharioudakis
- 11523. By [u'Markos Zaharioudakis <email address hidden>']
-
re-enabled jsoniq tests and fixed the failing ones Approved: Markos Zaharioudakis
- 11524. By [u'Paul J. Lucas <email address hidden>']
-
Updated FOFD1340 to be an error for $picture, $language, $calendar, or $place based on e-mail reply on W3C mailing list. Approved: Matthias Brantner, Paul J. Lucas
- 11525. By [u'Markos Zaharioudakis <email address hidden>']
-
duplicate elimination for the jn:keys() function Approved: Markos Zaharioudakis
- 11526. By [u'Markos Zaharioudakis <email address hidden>']
-
Fixed bug #1188304 Approved: Markos Zaharioudakis
- 11527. By [u'sorin.marian.nasoi <email address hidden>']
-
corrected LP bug number Approved: Chris Hillery, Sorin Marian Nasoi
- 11528. By [u'Markos Zaharioudakis <email address hidden>']
-
fixed bug in casting to xs:NCName + fixed bug in computed PI constructor Approved: Markos Zaharioudakis
- 11529. By [u'Paul J. Lucas <email address hidden>']
-
* Added numeric_type to json::token.
* Removed createJSONNumber().
* Added constructors and assignment operators to Integer, Decimal, and Float that take a string type.
* Clean-up of now unnecessary use of c_str(). Approved: Matthias Brantner, Paul J. Lucas - 11530. By [<email address hidden>']
-
Moved "tutorial" schema into same pool as http-test-data; updated URIs. Approved: Markos Zaharioudakis, Chris Hillery
- 11531. By [u'Markos Zaharioudakis <email address hidden>']
-
1. Check that namespace uri used in default namespace declaration is a valid one
2. fixed error messages for XQST0070 and XQST0036
Approved: Markos Zaharioudakis - 11532. By [u'Paul J. Lucas <email address hidden>']
-
* Added hexbinary:
:streambuf and friends.
* Fixed buffer overflow bug in base64::streambuf: :xsputn( ). Approved: Federico Cavalieri, Matthias Brantner, Paul J. Lucas - 11533. By [u'sorin.marian.nasoi <email address hidden>']
-
New and improved XQDoc.
Each module is completely decoupled from one to another and therefore more reusable. This will enable more people like 28msec to reuse this components and improve their maturity.
As an example, the HTML generation, the navigation generation, and the batch processing are completely decoupled.
Moreover, the schema and example resolution now is more modular for the Zorba and 28msec website. Approved: Sorin Marian Nasoi, Chris Hillery - 11534. By [u'Markos Zaharioudakis <email address hidden>']
-
some error cleanup in translator.cpp Approved: Markos Zaharioudakis
- 11535. By [u'sorin.marian.nasoi <email address hidden>']
-
- removed ACE folder from the list of folders in the installed documentation Approved: Ghislain Fourny, Sorin Marian Nasoi
- 11536. By [u'Markos Zaharioudakis <email address hidden>']
-
Fixed bug #1188285 Approved: Markos Zaharioudakis
- 11537. By [u'Markos Zaharioudakis <email address hidden>']
-
Fixed bug #1188281 (casting to xs:anySimpleType not allowed) Approved: Markos Zaharioudakis
- 11538. By [u'Markos Zaharioudakis <email address hidden>']
-
Fixed bug #1188095 (do correct normalization for fn:string-
length( ))) Approved: Markos Zaharioudakis - 11539. By [u'Markos Zaharioudakis <email address hidden>']
-
No node ordering/distinct required for self axis. Approved: Markos Zaharioudakis
- 11540. By [u'Paul J. Lucas <email address hidden>']
-
Added ZORBA_IO_NS_PREFIX. Approved: Matthias Brantner, Paul J. Lucas
- 11541. By [u'Paul J. Lucas <email address hidden>']
-
"Fix" for building on Windows. Approved: Juan Zacarias, Paul J. Lucas
- 11542. By [u'Paul J. Lucas <email address hidden>', u'Matthias Brantner <matthias.brantner@28msec.com>']
-
Converted module to zorba.io. Approved: Matthias Brantner, Paul J. Lucas
- 11543. By [<email address hidden>']
-
Re-enabling tests which pass on the new RQ machine. Approved: Matthias Brantner, Chris Hillery
- 11544. By Paul J. Lucas
-
Relocated and renamed Zorba errors & warnings "modules."
Approved: Chris Hillery, Paul J. Lucas - 11545. By Paul J. Lucas
-
Cleaned up both public and internal API.
Approved: Chris Hillery, Paul J. Lucas - 11546. By [u'Markos Zaharioudakis <email address hidden>']
-
API change - Fixed bug #938574 (changed the names and semantics of the NsScoping enum) Approved: Markos Zaharioudakis
- 11547. By Markos Zaharioudakis
-
ZORBA_FOR_
ONE_THREAD_ ONLY is now ON by default
Approved: Markos Zaharioudakis
Chris Hillery (ceejatec) wrote : | # |
Oops, forgot to comment:
1. Need to fix merge conflict.
2. There are some code changes in here as well. I assume they are the "Removing some warnings" comment? If so, please mention that in the commit message for this proposal, along with the main changes.
- 11548. By Chris Hillery
-
Updated node-position module to Zorba 3.0 format.
Approved: Juan Zacarias, Chris Hillery - 11549. By Markos Zaharioudakis
-
Some work towards multi-threading
1. Fixed a couple of threading bugs in qname pool
2. Redefined free() method for root_static_context and for builtin functions
3. Annotations are not RCObjects anymore
4. Use atomic ints are counters in RCObjects
5. No query cloning in testdriver_mt
Approved: Markos Zaharioudakis - 11550. By Chris Hillery
-
Update "JSON" module: now known as "json-xml", function names changed, namespace changed to zorba.io, moved out of unnecessary subdirectories.
Approved: Paul J. Lucas, Chris Hillery - 11551. By sorin.marian.nasoi <email address hidden>
-
- fixed examples links in the XQDoc documentation
Approved: Sorin Marian Nasoi, Chris Hillery - 11552. By sorin.marian.nasoi <email address hidden>
-
- bumped QT test-suite version
Approved: Chris Hillery, Sorin Marian Nasoi - 11553. By sorin.marian.nasoi <email address hidden>
-
- since ICU does not support "FULLY-NORMALIZED" normalization form Zorba does not support it either: updated the Zorba Manifest to reflect this.
Approved: Chris Hillery, Sorin Marian Nasoi - 11554. By Chris Hillery
-
Remove "system" module dependency from core tests.
Approved: Juan Zacarias, Chris Hillery - 11555. By Chris Hillery
-
Don't check %private variables.
Approved: Rodolfo Ochoa, Chris Hillery - 11556. By Chris Hillery
-
Update base64 module to Zorba 3.0 standards.
Approved: Luis Rodriguez Gonzalez, Chris Hillery - 11557. By Chris Hillery
-
Update core math and random modules to Zorba 3.0 standards.
Approved: Luis Rodriguez Gonzalez, Chris Hillery - 11558. By Paul J. Lucas
-
The JSON parser now reports different start/end line/col for invalid numbers, literals, and string literals.
Approved: William Candillon, Paul J. Lucas - 11559. By Paul J. Lucas
-
No longer throwing expensive ZorbaExceptions for "castable as".
Approved: Matthias Brantner, Paul J. Lucas - 11560. By sorin.marian.nasoi <email address hidden>
-
- test-cases that are not run because they use an environment that requires setting of a COLLATION or COLLECTION are marked 'n/a' instead of 'notRun'.
For more details please see W3C bug #22423.
Approved: Chris Hillery, Sorin Marian Nasoi - 11561. By Paul J. Lucas
-
Added operator<< for enums; moved to .cpp.
Approved: Matthias Brantner, Paul J. Lucas - 11562. By Matthias Brantner
-
improve error message for invalid serialization version parameter
Approved: Chris Hillery, Matthias Brantner - 11563. By sorin.marian.nasoi <email address hidden>
-
bump QT snapshot
Approved: Chris Hillery, Sorin Marian Nasoi - 11564. By Federico Cavalieri
-
Added JSON HTTP client module.
Fixed initialization, error reporting and encoding bugs in the XML HTTP client.
Reimplemented XML HTTP client on top of the JSON HTTP client module.
Approved: Chris Hillery, Cezar Andrei - 11565. By Matthias Brantner
-
Updated String module to Zorba 3.0 format.
Approved: Matthias Brantner, Chris Hillery - 11566. By Chris Hillery
-
Updated reference module to Zorba 3.0 standards. Removed node-reference module (use reference module instead).
Approved: Matthias Brantner, Chris Hillery - 11567. By Federico Cavalieri
-
HTTP client request/response conversion in a separate module
Approved: Cezar Andrei, Chris Hillery - 11568. By Nicolae Brinza
-
Implemented the Skip-items facility
Approved: Matthias Brantner, Nicolae Brinza - 11569. By Juan Zacarias
-
Fix for python installer on Windows.
Approved: Rodolfo Ochoa, Juan Zacarias - 11570. By Paul J. Lucas
-
Now converting json-items to/from XDM and no longer converting to/from strings.
Approved: Matthias Brantner, Paul J. Lucas - 11571. By Markos Zaharioudakis
-
added a DynamicContextI
mpl::setVariabl e() function + cosmetic
Approved: Markos Zaharioudakis - 11572. By Markos Zaharioudakis
-
Fixed an error message
Approved: Markos Zaharioudakis - 11573. By Markos Zaharioudakis
-
added/clened-up comments
Approved: Markos Zaharioudakis - 11574. By Markos Zaharioudakis
-
renamed files implementing our various item sequences + fixed bug in SingletonItemSe
quence: :next()
Approved: Markos Zaharioudakis - 11575. By Markos Zaharioudakis
-
renamed item_sequence_
chainer. h + cosmetic
Approved: Markos Zaharioudakis - 11576. By Markos Zaharioudakis
-
renamed files implementing our various item iterators + cosmetic
Approved: Markos Zaharioudakis - 11577. By Paul J. Lucas
-
Replaced public Base64 API with internal one that's much better.
Approved: Matthias Brantner, Paul J. Lucas - 11578. By Paul J. Lucas
-
Might as well change the public HexBinary API to match the new Base64 public API.
Approved: Matthias Brantner, Paul J. Lucas - 11579. By Markos Zaharioudakis
-
More work tawards thread-safe zorba:
1. XmlDataManager is not a singleton anymore
2. synchronize Item::getRefCount() method
3. fixed memory leak related to function annotations
4. removed 2 non-const global variables from locale
5. do not set annotations for builtin functions in the translator
6. make set_length() method a noop if this is the empty string
7. fixed a bug in StaticContext::validate( )
8. datetime module is a pure builtin module
9. no stable ids for iterators in multi-threaded mode (for now at least)
10. bug fix in URI.cpp
11. thread-safe MAPM
Approved: Markos Zaharioudakis - 11580. By Markos Zaharioudakis
-
re-enabled html module
Approved: Markos Zaharioudakis - 11581. By Markos Zaharioudakis
-
re-enabled languages and schema tools modules
Approved: Markos Zaharioudakis - 11582. By sorin.marian.nasoi <email address hidden>
-
- bumped QT snapshot to August 5th
- removed the environment checking for the default collection and collations other tahn Unicode Codepoint Collection
- added necessary dependencies in FOTSZorbaManifest for 'non_unicode_codepoint_ collation' and 'non_empty_ sequence_ collection'
Approved: Chris Hillery, Sorin Marian Nasoi - 11583. By Markos Zaharioudakis
-
removed StaticContextIm
pl::checkInvoka ble() method ==> small optimization for invoke()
changed static base uri for root static context
Approved: Markos Zaharioudakis - 11584. By Markos Zaharioudakis
-
destroy the XmlDataManager before shuting down the store in zorbacmd
Approved: Markos Zaharioudakis - 11585. By Matthias Brantner
-
Added arbitrary encoding support.
Added missing functions from spec.
Approved: Matthias Brantner, Paul J. Lucas - 11586. By Juan Zacarias
-
Windows move for cmake
Approved: Chris Hillery, Juan Zacarias - 11587. By Juan Zacarias
-
Fixes for Windows64
Approved: Juan Zacarias, Chris Hillery - 11588. By Paul J. Lucas
-
Optimization for same sentence/paragraph.
Approved: Matthias Brantner, Paul J. Lucas - 11589. By Chris Hillery
-
Updated "xml" module to Zorba 3.0 standards. Deleted backwards-
compatible x:parse- xml-fragment( ) functions.
Approved: Luis Rodriguez Gonzalez, Chris Hillery - 11590. By Chris Hillery
-
Corrected zorba errors/warnings URIs.
Approved: Matthias Brantner, Chris Hillery - 11591. By Paul J. Lucas
-
Changed write-text() signature to accept only xs:string.
Approved: Matthias Brantner, Paul J. Lucas - 11592. By Chris Hillery
-
Change most non-module Zorba namespace URIs from www.zorba-
xquery. com to zorba.io. Also replace functx module URI with correct version (no trailing slash).
Approved: Sorin Marian Nasoi, Chris Hillery - 11593. By Paul J. Lucas
-
Fixed bug 1210628.
Approved: Matthias Brantner, Paul J. Lucas - 11594. By Markos Zaharioudakis
-
don't do unnecessary implicit iteration for jsoniq navigation
Approved: Markos Zaharioudakis - 11595. By Markos Zaharioudakis
-
removed jn:null() + allow empty seq as input to jn:size()
Approved: Markos Zaharioudakis - 11596. By sorin.marian.nasoi <email address hidden>
-
Re-added changes that were wrongfully reverted in r11402.1.5.
Approved: Chris Hillery, Sorin Marian Nasoi - 11597. By Chris Hillery
-
Update 3.0 for xqxq
Renamed xqxq module to zorba-query module (zq module)
Approved: Sorin Marian Nasoi, Chris Hillery - 11598. By Paul J. Lucas
-
Fixed stemmer files location in NOTICE.
Removed unused base64 class.
Fixed typos in comments.
Clean-up.
Approved: Matthias Brantner, Paul J. Lucas - 11599. By Markos Zaharioudakis
-
1. EBV on jsoniq items returns true instead of error
2. Updated signature (and implementation) of jn and libjn functions according to latest spec
3. Removed from libjn functions that were also in jn
4. Removed jn:json-doc functionApproved: Markos Zaharioudakis
- 11600. By Markos Zaharioudakis
-
made $objects() equivalent to jn:keys($objects) + optimized jsoniq navigation
Approved: Markos Zaharioudakis - 11601. By Paul J. Lucas
-
Reworked public Zorba_Serialize
rOption so it's better between C & C++.
Now allow any ICU-supported encoding.
Approved: Matthias Brantner, Paul J. Lucas - 11602. By Paul J. Lucas
-
Removed wrong assert() for invalid XML.
Approved: Matthias Brantner, Paul J. Lucas - 11603. By Markos Zaharioudakis
-
implicit iteration for jsoniq delete and replace exprs
Approved: Markos Zaharioudakis - 11604. By Markos Zaharioudakis
-
implicit iteration for jsoniq rename exprs
Approved: Markos Zaharioudakis - 11605. By sorin.marian.nasoi <email address hidden>
-
- removed all files that were used by the Doxygen HTML generation (HTML header, footer, stylesheet) and also the images used in the Docygen HTML pages (style/*.png and style/*.gif)
- removed all HTML pages from the list of files installed in the 'doc' component
- updated the install target for the C examples from 'doc' to 'c_example'Updated the doxygen config files (for c,csharp,
cxx,java, php,python, ruby,xqj, zorba):
- now 'make doc' does not generate HTML documentation for Doxygen, it only generates the Docygen XML's
- all the deprecated params in doxy.config.in files (SHOW_DIRECTORIES, USE_INLINE_TREES, HTML_ALIGN_MEMBERS) were removed
Approved: Chris Hillery, Sorin Marian Nasoi - 11606. By Federico Cavalieri
-
Fixed bug 1207668
Approved: Paul J. Lucas, Matthias Brantner - 11607. By Rodolfo Ochoa
-
merge from branch
- 11608. By Rodolfo Ochoa
-
fix for building openssl and libxml2
- 11609. By Rodolfo Ochoa
-
Added SWIG, added cleanup to fix xerces
- 11610. By Rodolfo Ochoa
-
Added ruby and python
Unmerged revisions
- 11610. By Rodolfo Ochoa
-
Added ruby and python
- 11609. By Rodolfo Ochoa
-
Added SWIG, added cleanup to fix xerces
- 11608. By Rodolfo Ochoa
-
fix for building openssl and libxml2
- 11607. By Rodolfo Ochoa
-
merge from branch
Preview Diff
1 | === added directory 'scripts/winports' | |||
2 | === added file 'scripts/winports/CMakeLists.txt' | |||
3 | --- scripts/winports/CMakeLists.txt 1970-01-01 00:00:00 +0000 | |||
4 | +++ scripts/winports/CMakeLists.txt 2013-09-12 22:32:36 +0000 | |||
5 | @@ -0,0 +1,741 @@ | |||
6 | 1 | CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0) | ||
7 | 2 | INCLUDE(ExternalProject) | ||
8 | 3 | PROJECT(winports) | ||
9 | 4 | |||
10 | 5 | SET(SCRIPTS_DIR "scripts") | ||
11 | 6 | FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}") | ||
12 | 7 | ############################################################################## | ||
13 | 8 | ############################################################################## | ||
14 | 9 | # PATCH | ||
15 | 10 | ############################################################################## | ||
16 | 11 | SET(PATCH_PAK patch-2.5.9) | ||
17 | 12 | EXTERNALPROJECT_ADD ( | ||
18 | 13 | ${PATCH_PAK} | ||
19 | 14 | URL http://kent.dl.sourceforge.net/project/gnuwin32/patch/2.5.9-7/patch-2.5.9-7-bin.zip | ||
20 | 15 | URL_MD5 b9c8b31d62f4b2e4f1887bbb63e8a905 | ||
21 | 16 | PREFIX ${PATCH_PAK} | ||
22 | 17 | #DEPENDS ${LIBXML2_PAK} | ||
23 | 18 | PATCH_COMMAND "" | ||
24 | 19 | CONFIGURE_COMMAND "" | ||
25 | 20 | BUILD_COMMAND "" | ||
26 | 21 | INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory | ||
27 | 22 | ${CMAKE_CURRENT_BINARY_DIR}/${PATCH_PAK}/src/${PATCH_PAK}/bin | ||
28 | 23 | ${CMAKE_CURRENT_BINARY_DIR}/${PATCH_PAK}/bin | ||
29 | 24 | ) | ||
30 | 25 | SET(PATCH_EXE ${CMAKE_CURRENT_BINARY_DIR}/${PATCH_PAK}/bin/patch.exe) | ||
31 | 26 | |||
32 | 27 | ############################################################################## | ||
33 | 28 | ############################################################################## | ||
34 | 29 | # GRAPHVIZ | ||
35 | 30 | ############################################################################## | ||
36 | 31 | SET(GRAPHVIZ_PAK graphviz-2.30.1) | ||
37 | 32 | EXTERNALPROJECT_ADD ( | ||
38 | 33 | ${GRAPHVIZ_PAK} | ||
39 | 34 | URL http://www.graphviz.org/pub/graphviz/stable/windows/graphviz-2.30.1.zip | ||
40 | 35 | URL_MD5 4a28bddcdfd00f8d1afffd91ee098172 | ||
41 | 36 | PREFIX ${GRAPHVIZ_PAK} | ||
42 | 37 | PATCH_COMMAND "" | ||
43 | 38 | CONFIGURE_COMMAND "" | ||
44 | 39 | BUILD_COMMAND "" | ||
45 | 40 | INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory | ||
46 | 41 | ${CMAKE_CURRENT_BINARY_DIR}/${GRAPHVIZ_PAK}/src/${GRAPHVIZ_PAK} | ||
47 | 42 | ${CMAKE_CURRENT_BINARY_DIR}/${GRAPHVIZ_PAK} | ||
48 | 43 | ) | ||
49 | 44 | |||
50 | 45 | ############################################################################# | ||
51 | 46 | ############################################################################## | ||
52 | 47 | # GEOS | ||
53 | 48 | ############################################################################## | ||
54 | 49 | SET(GEOS_PAK geos-3.3.8) | ||
55 | 50 | #LIBGEOS PATCH FILE | ||
56 | 51 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos.patch " | ||
57 | 52 | 90a91,93 | ||
58 | 53 | > !ELSEIF \"$(_NMAKE_VER)\" == \"11.00.60315.1\" | ||
59 | 54 | > GEOS_MSVC = 11.0 | ||
60 | 55 | > GEOS_MSC = 1700 | ||
61 | 56 | ") | ||
62 | 57 | #PATCH FILE | ||
63 | 58 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_patch.cmake " | ||
64 | 59 | EXECUTE_PROCESS(COMMAND ${PATCH_EXE} nmake.opt ${CMAKE_CURRENT_BINARY_DIR}/libgeos.patch -f | ||
65 | 60 | WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" ) | ||
66 | 61 | ") | ||
67 | 62 | |||
68 | 63 | #CONFIGURE FILE | ||
69 | 64 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_configure.cmake " | ||
70 | 65 | EXECUTE_PROCESS( | ||
71 | 66 | COMMAND autogen.bat | ||
72 | 67 | WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" | ||
73 | 68 | ) | ||
74 | 69 | ") | ||
75 | 70 | #BUILD FILE | ||
76 | 71 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_build.cmake " | ||
77 | 72 | SET(ENV{INCLUDE} \"\$ENV{INCLUDE};C:\\\\Program Files (x86)\\\\Microsoft SDKs\\\\Windows\\\\v7.1A\\\\Include\") | ||
78 | 73 | SET(ENV{INCLUDE} \"\$ENV{INCLUDE};C:\\\\Program Files (x86)\\\\Microsoft SDKs\\\\Windows\\\\v7.0A\\\\Include\") | ||
79 | 74 | EXECUTE_PROCESS( | ||
80 | 75 | COMMAND nmake /f makefile.vc MSVC_VER=1700 | ||
81 | 76 | WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" | ||
82 | 77 | ) | ||
83 | 78 | ") | ||
84 | 79 | #INSTALL FILE | ||
85 | 80 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_install.cmake " | ||
86 | 81 | FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/bin) | ||
87 | 82 | FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/lib) | ||
88 | 83 | EXECUTE_PROCESS( | ||
89 | 84 | COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}/src/geos.dll ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/bin/geos.dll | ||
90 | 85 | WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" ) | ||
91 | 86 | EXECUTE_PROCESS( | ||
92 | 87 | COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}/src/geos.lib ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/lib/geos.lib | ||
93 | 88 | WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" ) | ||
94 | 89 | EXECUTE_PROCESS( | ||
95 | 90 | COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}/src/geos_c.dll ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/bin/geos_c.dll | ||
96 | 91 | WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" ) | ||
97 | 92 | EXECUTE_PROCESS( | ||
98 | 93 | COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}/src/geos_c_i.lib ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/lib/geos_c_i.lib | ||
99 | 94 | WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" ) | ||
100 | 95 | EXECUTE_PROCESS( | ||
101 | 96 | COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}/src/geos_i.lib ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/lib/geos_i.lib | ||
102 | 97 | WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" ) | ||
103 | 98 | EXECUTE_PROCESS( | ||
104 | 99 | COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}/include ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/include | ||
105 | 100 | WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" ) | ||
106 | 101 | ") | ||
107 | 102 | EXTERNALPROJECT_ADD ( | ||
108 | 103 | ${GEOS_PAK} | ||
109 | 104 | URL http://download.osgeo.org/geos/geos-3.3.8.tar.bz2 | ||
110 | 105 | URL_MD5 75be476d0831a2d14958fed76ca266de | ||
111 | 106 | PREFIX ${GEOS_PAK} | ||
112 | 107 | DEPENDS ${PATCH_PAK} | ||
113 | 108 | PATCH_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_patch.cmake | ||
114 | 109 | CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_configure.cmake | ||
115 | 110 | BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_build.cmake | ||
116 | 111 | INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_install.cmake | ||
117 | 112 | ) | ||
118 | 113 | |||
119 | 114 | ############################################################################## | ||
120 | 115 | ############################################################################## | ||
121 | 116 | # DOXYGEN | ||
122 | 117 | ############################################################################## | ||
123 | 118 | SET(DOXYGEN_PAK doxygen-1.8.4) | ||
124 | 119 | EXTERNALPROJECT_ADD ( | ||
125 | 120 | ${DOXYGEN_PAK} | ||
126 | 121 | #URL http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.4.windows.x64.bin.zip | ||
127 | 122 | #URL_MD5 bcbb2140bba22a95cd915ba19340851a | ||
128 | 123 | |||
129 | 124 | URL http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.4.windows.bin.zip | ||
130 | 125 | URL_MD5 af35822049dac03e5ed96aaa672f9dc2 | ||
131 | 126 | PREFIX ${DOXYGEN_PAK} | ||
132 | 127 | PATCH_COMMAND "" | ||
133 | 128 | CONFIGURE_COMMAND "" | ||
134 | 129 | BUILD_COMMAND "" | ||
135 | 130 | INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory | ||
136 | 131 | ${CMAKE_CURRENT_BINARY_DIR}/${DOXYGEN_PAK}/src/${DOXYGEN_PAK} | ||
137 | 132 | ${CMAKE_CURRENT_BINARY_DIR}/${DOXYGEN_PAK} | ||
138 | 133 | ) | ||
139 | 134 | |||
140 | 135 | ############################################################################## | ||
141 | 136 | ############################################################################## | ||
142 | 137 | # TIDY | ||
143 | 138 | ############################################################################## | ||
144 | 139 | #PATCH FILE | ||
145 | 140 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_patch.cmake " | ||
146 | 141 | FILE(GLOB TIDY_PROJECT \"${CMAKE_CURRENT_BINARY_DIR}/tidy/src/tidy/build/msvc/*.*\") | ||
147 | 142 | FOREACH(TIDY_FILE \${TIDY_PROJECT}) | ||
148 | 143 | FILE(READ \${TIDY_FILE} FILE_TO_CHANGE) | ||
149 | 144 | STRING(REPLACE \"\\n\" \"\\n\" FILE_TO_CHANGE \"\${FILE_TO_CHANGE}\") | ||
150 | 145 | FILE(WRITE \${TIDY_FILE} \${FILE_TO_CHANGE}) | ||
151 | 146 | ENDFOREACH() | ||
152 | 147 | ") | ||
153 | 148 | #CONFIGURE FILE | ||
154 | 149 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_configure.cmake " | ||
155 | 150 | EXECUTE_PROCESS( | ||
156 | 151 | COMMAND devenv tidy.dsw /Upgrade | ||
157 | 152 | WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/tidy/src/tidy/build/msvc/\" | ||
158 | 153 | ) | ||
159 | 154 | ") | ||
160 | 155 | #BUILD FILE | ||
161 | 156 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_build.cmake " | ||
162 | 157 | EXECUTE_PROCESS( | ||
163 | 158 | COMMAND devenv tidy.sln /Build \"Release|Win32\" | ||
164 | 159 | WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/tidy/src/tidy/build/msvc/\" | ||
165 | 160 | ) | ||
166 | 161 | ") | ||
167 | 162 | #INSTALL FILE | ||
168 | 163 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_install.cmake " | ||
169 | 164 | EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E copy | ||
170 | 165 | ${CMAKE_CURRENT_BINARY_DIR}/tidy/src/tidy/build/msvc/Release/tidy.exe | ||
171 | 166 | ${CMAKE_CURRENT_BINARY_DIR}/tidy/tidy.exe | ||
172 | 167 | WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\" ) | ||
173 | 168 | EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E copy | ||
174 | 169 | ${CMAKE_CURRENT_BINARY_DIR}/tidy/src/tidy/build/msvc/ReleaseDLL/libtidy.dll | ||
175 | 170 | ${CMAKE_CURRENT_BINARY_DIR}/tidy/libtidy.dll | ||
176 | 171 | WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\" ) | ||
177 | 172 | EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E copy | ||
178 | 173 | ${CMAKE_CURRENT_BINARY_DIR}/tidy/src/tidy/build/msvc/ReleaseDLL/libtidy.lib | ||
179 | 174 | ${CMAKE_CURRENT_BINARY_DIR}/tidy/libtidy.lib | ||
180 | 175 | WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\" ) | ||
181 | 176 | ") | ||
182 | 177 | EXTERNALPROJECT_ADD ( | ||
183 | 178 | tidy | ||
184 | 179 | URL http://tidy.cvs.sourceforge.net/viewvc/tidy/tidy/?view=tar | ||
185 | 180 | |||
186 | 181 | PREFIX tidy | ||
187 | 182 | PATCH_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_patch.cmake | ||
188 | 183 | CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_configure.cmake | ||
189 | 184 | BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_build.cmake | ||
190 | 185 | INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_install.cmake | ||
191 | 186 | ) | ||
192 | 187 | |||
193 | 188 | ############################################################################## | ||
194 | 189 | ############################################################################## | ||
195 | 190 | # ZLIB | ||
196 | 191 | ############################################################################## | ||
197 | 192 | SET(ZLIB1_PAK zlib-1.2.8) | ||
198 | 193 | EXTERNALPROJECT_ADD( | ||
199 | 194 | ${ZLIB1_PAK} | ||
200 | 195 | URL http://zlib.net/zlib128-dll.zip | ||
201 | 196 | PREFIX ${ZLIB1_PAK} | ||
202 | 197 | URL_MD5 42eccc2af5bac6b7a1188d7817d03549 | ||
203 | 198 | PATCH_COMMAND "" | ||
204 | 199 | CONFIGURE_COMMAND "" | ||
205 | 200 | BUILD_COMMAND "" | ||
206 | 201 | INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory | ||
207 | 202 | ${CMAKE_CURRENT_BINARY_DIR}/${ZLIB1_PAK}/src/${ZLIB1_PAK} | ||
208 | 203 | ${CMAKE_CURRENT_BINARY_DIR}/${ZLIB1_PAK} | ||
209 | 204 | ) | ||
210 | 205 | |||
211 | 206 | ############################################################################## | ||
212 | 207 | ############################################################################## | ||
213 | 208 | # PERL | ||
214 | 209 | ############################################################################## | ||
215 | 210 | SET(PERL_PAK perl-5.16.3.1) | ||
216 | 211 | EXTERNALPROJECT_ADD( | ||
217 | 212 | ${PERL_PAK} | ||
218 | 213 | URL http://strawberryperl.com/download/5.16.3.1/strawberry-perl-5.16.3.1-32bit-portable.zip | ||
219 | 214 | URL_MD5 8f3ef667e9a2b7fc402610da29bb8074 | ||
220 | 215 | PREFIX ${PERL_PAK} | ||
221 | 216 | #SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/perl-5.16.3.1 | ||
222 | 217 | PATCH_COMMAND "" | ||
223 | 218 | CONFIGURE_COMMAND "" | ||
224 | 219 | BUILD_COMMAND "" | ||
225 | 220 | INSTALL_COMMAND "" | ||
226 | 221 | ) | ||
227 | 222 | SET(PERL_PATH ${CMAKE_CURRENT_BINARY_DIR}/${PERL_PAK}/src/${PERL_PAK}/perl/bin/) | ||
228 | 223 | |||
229 | 224 | ############################################################################## | ||
230 | 225 | ############################################################################## | ||
231 | 226 | # OPENSSL | ||
232 | 227 | ############################################################################## | ||
233 | 228 | SET(OPENSSL_PAK openssl-1.0.1e) | ||
234 | 229 | #Patch for linux archiver | ||
235 | 230 | ADD_SUBDIRECTORY(openssl) | ||
236 | 231 | |||
237 | 232 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libopenssl_configure.cmake " | ||
238 | 233 | |||
239 | 234 | SET(ENV{PATH} \"\$ENV{PATH};${PERL_PATH}\") | ||
240 | 235 | |||
241 | 236 | EXECUTE_PROCESS( | ||
242 | 237 | COMMAND perl | ||
243 | 238 | Configure enable-camellia | ||
244 | 239 | --openssldir=${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK} | ||
245 | 240 | VC-WIN32 | ||
246 | 241 | WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK}/src/${OPENSSL_PAK}\" | ||
247 | 242 | ) | ||
248 | 243 | |||
249 | 244 | EXECUTE_PROCESS( | ||
250 | 245 | COMMAND \"${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK}/src/${OPENSSL_PAK}/ms/do_nt.bat\" | ||
251 | 246 | WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK}/src/${OPENSSL_PAK}\" | ||
252 | 247 | ) | ||
253 | 248 | ") | ||
254 | 249 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libopenssl_nmake.cmake " | ||
255 | 250 | SET(ENV{PATH} \"\$ENV{PATH};${PERL_PATH}\") | ||
256 | 251 | EXECUTE_PROCESS( | ||
257 | 252 | COMMAND nmake /f ms/ntdll.mak | ||
258 | 253 | WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK}/src/${OPENSSL_PAK}\" | ||
259 | 254 | ) | ||
260 | 255 | ") | ||
261 | 256 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libopenssl_install.cmake " | ||
262 | 257 | SET(ENV{PATH} \"\$ENV{PATH};${PERL_PATH}\") | ||
263 | 258 | EXECUTE_PROCESS( | ||
264 | 259 | COMMAND nmake /f ms/ntdll.mak install | ||
265 | 260 | WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK}/src/${OPENSSL_PAK}\" | ||
266 | 261 | ) | ||
267 | 262 | ") | ||
268 | 263 | |||
269 | 264 | |||
270 | 265 | EXTERNALPROJECT_ADD( | ||
271 | 266 | ${OPENSSL_PAK} | ||
272 | 267 | #fixed file | ||
273 | 268 | URL file://${CMAKE_CURRENT_BINARY_DIR}/openssl-1.0.1e.zip | ||
274 | 269 | DEPENDS opensslzip ${PERL_PAK} | ||
275 | 270 | PREFIX ${OPENSSL_PAK} | ||
276 | 271 | CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libopenssl_configure.cmake | ||
277 | 272 | BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libopenssl_nmake.cmake | ||
278 | 273 | INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libopenssl_install.cmake | ||
279 | 274 | ) | ||
280 | 275 | SET(OPENSSL_ROOT ${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK}) | ||
281 | 276 | |||
282 | 277 | |||
283 | 278 | ############################################################################## | ||
284 | 279 | ############################################################################## | ||
285 | 280 | # LIBCURL | ||
286 | 281 | ############################################################################## | ||
287 | 282 | SET(LIBCURL_PAK libcurl-7.29.0) | ||
288 | 283 | EXTERNALPROJECT_ADD( | ||
289 | 284 | ${LIBCURL_PAK} | ||
290 | 285 | URL http://curl.haxx.se/download/curl-7.29.0.tar.gz | ||
291 | 286 | URL_MD5 4f57d3b4a3963038bd5e04dbff385390 | ||
292 | 287 | PREFIX ${LIBCURL_PAK} | ||
293 | 288 | CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/${LIBCURL_PAK} | ||
294 | 289 | -DBUILD_CURL_EXE=ON -DBUILD_CURL_TESTS=OFF | ||
295 | 290 | -DCMAKE_USE_OPENSSL=ON -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT} | ||
296 | 291 | -DCURL_ZLIB=ON | ||
297 | 292 | -DHTTP_ONLY=OFF | ||
298 | 293 | -DCMAKE_BUILD_TYPE=RELEASE | ||
299 | 294 | ) | ||
300 | 295 | |||
301 | 296 | ############################################################################## | ||
302 | 297 | ############################################################################## | ||
303 | 298 | # LIBICONV | ||
304 | 299 | ############################################################################## | ||
305 | 300 | SET(LIBICONV_PAK libiconv-1.14) | ||
306 | 301 | EXTERNALPROJECT_ADD( | ||
307 | 302 | ${LIBICONV_PAK} | ||
308 | 303 | DEPENDS ${PATCH_PAK} | ||
309 | 304 | URL http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz | ||
310 | 305 | URL_MD5 e34509b1623cec449dfeb73d7ce9c6c6 | ||
311 | 306 | PREFIX ${LIBICONV_PAK} | ||
312 | 307 | CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/${LIBICONV_PAK} -DCMAKE_BUILD_TYPE=RELEASE | ||
313 | 308 | PATCH_COMMAND ${CMAKE_COMMAND} -D PATCH_COMMAND=${PATCH_EXE} -D CMAKELISTS_DIR=${CMAKE_CURRENT_SOURCE_DIR}/libiconv -P ${CMAKE_CURRENT_SOURCE_DIR}/libiconv/move.cmake | ||
314 | 309 | ) | ||
315 | 310 | |||
316 | 311 | ############################################################################## | ||
317 | 312 | ############################################################################## | ||
318 | 313 | # LIBXML2 | ||
319 | 314 | ############################################################################## | ||
320 | 315 | SET(LIBXML2_PAK libxml2-2.9.1) | ||
321 | 316 | SET(LIBXML2_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${LIBXML2_PAK}/src/${LIBXML2_PAK}/win32) | ||
322 | 317 | #CONFIGURE FILE | ||
323 | 318 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxml2_configure.cmake " | ||
324 | 319 | EXECUTE_PROCESS( | ||
325 | 320 | COMMAND assoc .js=JSFile | ||
326 | 321 | ) | ||
327 | 322 | EXECUTE_PROCESS( | ||
328 | 323 | COMMAND cscript configure.js compiler=msvc | ||
329 | 324 | prefix=..\\\\..\\\\.. | ||
330 | 325 | iconv=no | ||
331 | 326 | zlib=yes | ||
332 | 327 | include=${CMAKE_CURRENT_BINARY_DIR}/${ZLIB1_PAK}/include | ||
333 | 328 | lib=${CMAKE_CURRENT_BINARY_DIR}/${ZLIB1_PAK}/lib | ||
334 | 329 | WORKING_DIRECTORY \"${LIBXML2_WIN32_DIR}\" | ||
335 | 330 | )" | ||
336 | 331 | ) | ||
337 | 332 | #MAKE FILE | ||
338 | 333 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxml2_nmake.cmake " | ||
339 | 334 | EXECUTE_PROCESS( | ||
340 | 335 | COMMAND nmake /f Makefile.msvc | ||
341 | 336 | WORKING_DIRECTORY \"${LIBXML2_WIN32_DIR}\" | ||
342 | 337 | )" | ||
343 | 338 | ) | ||
344 | 339 | #MAKE INSTALL FILE | ||
345 | 340 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxml2_nmake_install.cmake " | ||
346 | 341 | EXECUTE_PROCESS( | ||
347 | 342 | COMMAND nmake /f Makefile.msvc install | ||
348 | 343 | WORKING_DIRECTORY \"${LIBXML2_WIN32_DIR}\" | ||
349 | 344 | )" | ||
350 | 345 | ) | ||
351 | 346 | #CONFIGURE, MAKE AND INSTALL | ||
352 | 347 | EXTERNALPROJECT_ADD( | ||
353 | 348 | ${LIBXML2_PAK} | ||
354 | 349 | URL ftp://xmlsoft.org/libxml2/libxml2-2.9.1.tar.gz | ||
355 | 350 | URL_MD5 9c0cfef285d5c4a5c80d00904ddab380 | ||
356 | 351 | PREFIX ${LIBXML2_PAK} | ||
357 | 352 | DEPENDS ${ZLIB1_PAK} ${LIBICONV_PAK} | ||
358 | 353 | CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxml2_configure.cmake | ||
359 | 354 | BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxml2_nmake.cmake | ||
360 | 355 | INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxml2_nmake_install.cmake | ||
361 | 356 | ) | ||
362 | 357 | |||
363 | 358 | |||
364 | 359 | ############################################################################## | ||
365 | 360 | ############################################################################## | ||
366 | 361 | # LIBXSLT | ||
367 | 362 | ############################################################################## | ||
368 | 363 | SET(LIBXSLT_PAK libxslt-1.1.28) | ||
369 | 364 | SET(LIBXSLT_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${LIBXSLT_PAK}/src/${LIBXSLT_PAK}/win32) | ||
370 | 365 | #CONFIGURE FILE | ||
371 | 366 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_configure.cmake " | ||
372 | 367 | EXECUTE_PROCESS( | ||
373 | 368 | COMMAND cscript configure.js compiler=msvc | ||
374 | 369 | prefix=..\\\\..\\\\.. | ||
375 | 370 | iconv=no | ||
376 | 371 | zlib=yes | ||
377 | 372 | xslt_debug=no | ||
378 | 373 | include=${CMAKE_CURRENT_BINARY_DIR}/${LIBXML2_PAK}/include/libxml2 | ||
379 | 374 | lib=${CMAKE_CURRENT_BINARY_DIR}/${LIBXML2_PAK}/lib | ||
380 | 375 | WORKING_DIRECTORY \"${LIBXSLT_WIN32_DIR}\" | ||
381 | 376 | ) " | ||
382 | 377 | ) | ||
383 | 378 | #MAKE FILE | ||
384 | 379 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_nmake.cmake " | ||
385 | 380 | EXECUTE_PROCESS( | ||
386 | 381 | COMMAND nmake /f Makefile.msvc | ||
387 | 382 | WORKING_DIRECTORY \"${LIBXSLT_WIN32_DIR}\" | ||
388 | 383 | ) " | ||
389 | 384 | ) | ||
390 | 385 | #MAKE INSTALL FILE | ||
391 | 386 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_nmake_install.cmake " | ||
392 | 387 | EXECUTE_PROCESS( | ||
393 | 388 | COMMAND nmake /f Makefile.msvc install | ||
394 | 389 | WORKING_DIRECTORY \"${LIBXSLT_WIN32_DIR}\" | ||
395 | 390 | ) " | ||
396 | 391 | ) | ||
397 | 392 | #MAKE PATCH FILE | ||
398 | 393 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_patch.cmake | ||
399 | 394 | " | ||
400 | 395 | FILE(READ \"${LIBXSLT_WIN32_DIR}/Makefile.msvc\" LIBXSLT_MAKEFILE) | ||
401 | 396 | STRING(REPLACE \"LDFLAGS = $(LDFLAGS) /OPT:NOWIN98\" \"#LDFLAGS = $(LDFLAGS) /OPT:NOWIN98\" LIBXSLT_MAKEFILE \"\${LIBXSLT_MAKEFILE}\") | ||
402 | 397 | FILE(WRITE \"${LIBXSLT_WIN32_DIR}/Makefile.msvc\" \${LIBXSLT_MAKEFILE}) | ||
403 | 398 | " | ||
404 | 399 | ) | ||
405 | 400 | #CONFIGURE, MAKE AND INSTALL | ||
406 | 401 | EXTERNALPROJECT_ADD ( | ||
407 | 402 | ${LIBXSLT_PAK} | ||
408 | 403 | URL ftp://xmlsoft.org/libxslt/libxslt-1.1.28.tar.gz | ||
409 | 404 | URL_MD5 9667bf6f9310b957254fdcf6596600b7 | ||
410 | 405 | PREFIX ${LIBXSLT_PAK} | ||
411 | 406 | DEPENDS ${LIBXML2_PAK} | ||
412 | 407 | PATCH_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_patch.cmake | ||
413 | 408 | CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_configure.cmake | ||
414 | 409 | BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_nmake.cmake | ||
415 | 410 | INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_nmake_install.cmake | ||
416 | 411 | ) | ||
417 | 412 | |||
418 | 413 | ############################################################################## | ||
419 | 414 | ############################################################################## | ||
420 | 415 | # ICU | ||
421 | 416 | ############################################################################## | ||
422 | 417 | SET(LIBICU_PAK icu4c-4_8_1_1) | ||
423 | 418 | SET(LIBICU_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${LIBICU_PAK}/src/${LIBICU_PAK}/source/allinone) | ||
424 | 419 | SET(LIBICU_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${LIBICU_PAK} ) | ||
425 | 420 | SET(LIBICU_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${LIBICU_PAK}/src/${LIBICU_PAK} ) | ||
426 | 421 | #CONFIGURE FILE | ||
427 | 422 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libicu_configure.cmake " | ||
428 | 423 | EXECUTE_PROCESS( | ||
429 | 424 | COMMAND devenv /upgrade allinone.sln | ||
430 | 425 | WORKING_DIRECTORY \"${LIBICU_WIN32_DIR}\" | ||
431 | 426 | ) " | ||
432 | 427 | ) | ||
433 | 428 | #BUILD FILE | ||
434 | 429 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libicu_build.cmake " | ||
435 | 430 | EXECUTE_PROCESS( | ||
436 | 431 | COMMAND devenv allinone.sln /build \"Release|Win32\" | ||
437 | 432 | WORKING_DIRECTORY \"${LIBICU_WIN32_DIR}\" | ||
438 | 433 | ) " | ||
439 | 434 | ) | ||
440 | 435 | #INSTALL FILE | ||
441 | 436 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libicu_install.cmake " | ||
442 | 437 | EXECUTE_PROCESS ( | ||
443 | 438 | COMMAND ${CMAKE_COMMAND} -E copy_directory \"${LIBICU_BUILD_DIR}/bin\" \"${LIBICU_INSTALL_DIR}/bin\" | ||
444 | 439 | WORKING_DIRECTORY \"${LIBICU_INSTALL_DIR}/bin\" | ||
445 | 440 | ) | ||
446 | 441 | EXECUTE_PROCESS ( | ||
447 | 442 | COMMAND ${CMAKE_COMMAND} -E copy_directory \"${LIBICU_BUILD_DIR}/include\" \"${LIBICU_INSTALL_DIR}/include\" | ||
448 | 443 | WORKING_DIRECTORY \"${LIBICU_INSTALL_DIR}/include\" | ||
449 | 444 | ) | ||
450 | 445 | EXECUTE_PROCESS ( | ||
451 | 446 | COMMAND ${CMAKE_COMMAND} -E copy_directory \"${LIBICU_BUILD_DIR}/lib\" \"${LIBICU_INSTALL_DIR}/lib\" | ||
452 | 447 | WORKING_DIRECTORY \"${LIBICU_INSTALL_DIR}/lib\" | ||
453 | 448 | ) " | ||
454 | 449 | ) | ||
455 | 450 | #CONFIGURE, MAKE AND INSTALL | ||
456 | 451 | EXTERNALPROJECT_ADD ( | ||
457 | 452 | ${LIBICU_PAK} | ||
458 | 453 | #ICU 5.1 | ||
459 | 454 | #URL http://download.icu-project.org/files/icu4c/51.1/icu4c-51_1-src.zip | ||
460 | 455 | #URL_MD5 b4303a43caa79018e3b6ec18148fdb1a | ||
461 | 456 | #ICU 4.8 | ||
462 | 457 | URL http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.zip | ||
463 | 458 | URL_MD5 890862544bdb9012f5758bd76e82c2b4 | ||
464 | 459 | PREFIX ${LIBICU_PAK} | ||
465 | 460 | CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libicu_configure.cmake | ||
466 | 461 | BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libicu_build.cmake | ||
467 | 462 | INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libicu_install.cmake | ||
468 | 463 | ) | ||
469 | 464 | |||
470 | 465 | ############################################################################## | ||
471 | 466 | ############################################################################## | ||
472 | 467 | # XERCES | ||
473 | 468 | ############################################################################## | ||
474 | 469 | SET(XERCES_PAK xerces-c-3.1.1) | ||
475 | 470 | SET(XERCES_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${XERCES_PAK}/src/${XERCES_PAK}/projects/Win32/VC10/xerces-all) | ||
476 | 471 | SET(XERCES_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${XERCES_PAK} ) | ||
477 | 472 | SET(XERCES_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${XERCES_PAK}/src/${XERCES_PAK} ) | ||
478 | 473 | #CONFIGURE FILE | ||
479 | 474 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libXERCES_configure.cmake " | ||
480 | 475 | EXECUTE_PROCESS( | ||
481 | 476 | COMMAND devenv /upgrade xerces-all.sln | ||
482 | 477 | WORKING_DIRECTORY \"${XERCES_WIN32_DIR}\" | ||
483 | 478 | ) " | ||
484 | 479 | ) | ||
485 | 480 | #BUILD FILE | ||
486 | 481 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libXERCES_build.cmake " | ||
487 | 482 | EXECUTE_PROCESS( | ||
488 | 483 | COMMAND devenv xerces-all.sln /build \"Release|Win32\" | ||
489 | 484 | WORKING_DIRECTORY \"${XERCES_WIN32_DIR}\" | ||
490 | 485 | ) " | ||
491 | 486 | ) | ||
492 | 487 | #INSTALL FILE | ||
493 | 488 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libXERCES_install.cmake | ||
494 | 489 | " | ||
495 | 490 | FILE(MAKE_DIRECTORY \"${XERCES_INSTALL_DIR}/lib\") | ||
496 | 491 | EXECUTE_PROCESS ( | ||
497 | 492 | COMMAND ${CMAKE_COMMAND} -E copy_directory \"${XERCES_BUILD_DIR}/src\" \"${XERCES_INSTALL_DIR}/include\" | ||
498 | 493 | WORKING_DIRECTORY \"${XERCES_INSTALL_DIR}\" | ||
499 | 494 | ) | ||
500 | 495 | EXECUTE_PROCESS ( | ||
501 | 496 | COMMAND ${CMAKE_COMMAND} -E copy_directory \"${XERCES_BUILD_DIR}/Build/Win32/VC10/Release\" \"${XERCES_INSTALL_DIR}/bin\" | ||
502 | 497 | WORKING_DIRECTORY \"${XERCES_INSTALL_DIR}\" | ||
503 | 498 | ) | ||
504 | 499 | EXECUTE_PROCESS ( | ||
505 | 500 | COMMAND ${CMAKE_COMMAND} -E copy \"${XERCES_BUILD_DIR}/Build/Win32/VC10/Release/xerces-c_3.lib\" \"${XERCES_INSTALL_DIR}/lib/xerces-c_3.lib\" | ||
506 | 501 | WORKING_DIRECTORY \"${XERCES_INSTALL_DIR}\" | ||
507 | 502 | ) | ||
508 | 503 | FILE(GLOB_RECURSE XERCES_CPP_FILES \"${XERCES_INSTALL_DIR}/include/*.cpp\") | ||
509 | 504 | FOREACH(XERCES_CPP IN ITEMS \${XERCES_CPP_FILES}) | ||
510 | 505 | FILE(REMOVE \${XERCES_CPP}) | ||
511 | 506 | ENDFOREACH() | ||
512 | 507 | |||
513 | 508 | ") | ||
514 | 509 | #CONFIGURE, MAKE AND INSTALL | ||
515 | 510 | EXTERNALPROJECT_ADD ( | ||
516 | 511 | ${XERCES_PAK} | ||
517 | 512 | URL http://www.apache.org/dist/xerces/c/3/sources/xerces-c-3.1.1.zip | ||
518 | 513 | URL_MD5 a42e0a35b8be37667bb7df6fb51feded | ||
519 | 514 | PREFIX ${XERCES_PAK} | ||
520 | 515 | #DEPENDS ${LIBXML2_PAK} | ||
521 | 516 | #PATCH_COMMAND echo %cd% | ||
522 | 517 | CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libXERCES_configure.cmake | ||
523 | 518 | BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libXERCES_build.cmake | ||
524 | 519 | INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libXERCES_install.cmake | ||
525 | 520 | ) | ||
526 | 521 | |||
527 | 522 | ############################################################################## | ||
528 | 523 | ############################################################################## | ||
529 | 524 | # SWIG 2.0.10 | ||
530 | 525 | ############################################################################## | ||
531 | 526 | SET(SWIG_PAK swigwin-2.0.10) | ||
532 | 527 | EXTERNALPROJECT_ADD( | ||
533 | 528 | ${SWIG_PAK} | ||
534 | 529 | URL http://hivelocity.dl.sourceforge.net/project/swig/swigwin/swigwin-2.0.10/swigwin-2.0.10.zip | ||
535 | 530 | URL_MD5 d41d8cd98f00b204e9800998ecf8427e | ||
536 | 531 | PREFIX ${SWIG_PAK} | ||
537 | 532 | PATCH_COMMAND "" | ||
538 | 533 | CONFIGURE_COMMAND "" | ||
539 | 534 | BUILD_COMMAND "" | ||
540 | 535 | INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory | ||
541 | 536 | ${CMAKE_CURRENT_BINARY_DIR}/${SWIG_PAK}/src/${SWIG_PAK} | ||
542 | 537 | ${CMAKE_CURRENT_BINARY_DIR}/${SWIG_PAK} | ||
543 | 538 | ) | ||
544 | 539 | |||
545 | 540 | ############################################################################## | ||
546 | 541 | ############################################################################## | ||
547 | 542 | # PYTHON 2.7.5 | ||
548 | 543 | ############################################################################## | ||
549 | 544 | SET(PYTHON_PAK python-2.7.5) | ||
550 | 545 | SET(PYTHON_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PCBuild) | ||
551 | 546 | #CONFIGURE FILE | ||
552 | 547 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/python_configure.cmake " | ||
553 | 548 | EXECUTE_PROCESS( | ||
554 | 549 | COMMAND devenv /upgrade pcbuild.sln | ||
555 | 550 | WORKING_DIRECTORY \"${PYTHON_WIN32_DIR}\" | ||
556 | 551 | ) | ||
557 | 552 | ") | ||
558 | 553 | #BUILD FILE | ||
559 | 554 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/python_build.cmake " | ||
560 | 555 | EXECUTE_PROCESS( | ||
561 | 556 | COMMAND devenv pcbuild.sln /build \"Debug|Win32\" | ||
562 | 557 | WORKING_DIRECTORY \"${PYTHON_WIN32_DIR}\" | ||
563 | 558 | ) | ||
564 | 559 | EXECUTE_PROCESS( | ||
565 | 560 | COMMAND devenv pcbuild.sln /build \"Release|Win32\" | ||
566 | 561 | WORKING_DIRECTORY \"${PYTHON_WIN32_DIR}\" | ||
567 | 562 | ) | ||
568 | 563 | ") | ||
569 | 564 | #INSTALL FILE | ||
570 | 565 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/python_install.cmake " | ||
571 | 566 | FILE(RENAME ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/Doc | ||
572 | 567 | ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/Doc ) | ||
573 | 568 | FILE(RENAME ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/Lib | ||
574 | 569 | ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/Lib ) | ||
575 | 570 | FILE(RENAME ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/Tools | ||
576 | 571 | ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/Tools ) | ||
577 | 572 | FILE(RENAME ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/Include | ||
578 | 573 | ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/Include ) | ||
579 | 574 | |||
580 | 575 | #all .h | ||
581 | 576 | FILE(GLOB PYTHON_FILES | ||
582 | 577 | \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PC/*.h\") | ||
583 | 578 | FOREACH(PYTHON_FILE \${PYTHON_FILES}) | ||
584 | 579 | CONFIGURE_FILE(\${PYTHON_FILE} \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/Include\" COPYONLY) | ||
585 | 580 | ENDFOREACH() | ||
586 | 581 | |||
587 | 582 | #all dlls | ||
588 | 583 | FILE(MAKE_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/DLLs\") | ||
589 | 584 | FILE(GLOB PYTHON_FILES | ||
590 | 585 | \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PCBuild/*.pyd\" | ||
591 | 586 | \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PCBuild/*.dll\") | ||
592 | 587 | FOREACH(PYTHON_FILE \${PYTHON_FILES}) | ||
593 | 588 | CONFIGURE_FILE(\${PYTHON_FILE} \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/DLLs\" COPYONLY) | ||
594 | 589 | ENDFOREACH() | ||
595 | 590 | |||
596 | 591 | #exe and dlls | ||
597 | 592 | FILE(GLOB PYTHON_FILES | ||
598 | 593 | \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PCBuild/*.exe\" | ||
599 | 594 | \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PCBuild/*.dll\") | ||
600 | 595 | FOREACH(PYTHON_FILE \${PYTHON_FILES}) | ||
601 | 596 | CONFIGURE_FILE(\${PYTHON_FILE} \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}\" COPYONLY) | ||
602 | 597 | ENDFOREACH() | ||
603 | 598 | |||
604 | 599 | # libs | ||
605 | 600 | FILE(MAKE_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/libs\") | ||
606 | 601 | FILE(GLOB PYTHON_FILES | ||
607 | 602 | \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PCBuild/*.lib\") | ||
608 | 603 | FOREACH(PYTHON_FILE \${PYTHON_FILES}) | ||
609 | 604 | CONFIGURE_FILE(\${PYTHON_FILE} \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/libs\" COPYONLY) | ||
610 | 605 | ENDFOREACH() | ||
611 | 606 | ") | ||
612 | 607 | |||
613 | 608 | EXTERNALPROJECT_ADD( | ||
614 | 609 | ${PYTHON_PAK} | ||
615 | 610 | URL http://www.python.org/ftp/python/2.7.5/Python-2.7.5.tgz | ||
616 | 611 | URL_MD5 b4f01a1d0ba0b46b05c73b2ac909b1df | ||
617 | 612 | PREFIX ${PYTHON_PAK} | ||
618 | 613 | PATCH_COMMAND "" | ||
619 | 614 | CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/python_configure.cmake | ||
620 | 615 | BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/python_build.cmake | ||
621 | 616 | INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/python_install.cmake | ||
622 | 617 | ) | ||
623 | 618 | |||
624 | 619 | ############################################################################## | ||
625 | 620 | ############################################################################## | ||
626 | 621 | # RUBY 2.0.0 | ||
627 | 622 | ############################################################################## | ||
628 | 623 | SET(RUBY_PAK ruby-2.0.0) | ||
629 | 624 | SET(RUBY_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${RUBY_PAK}/src/${RUBY_PAK}/Win32) | ||
630 | 625 | SET(RUBY_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${RUBY_PAK} ) | ||
631 | 626 | SET(RUBY_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${RUBY_PAK}/build ) | ||
632 | 627 | FILE(MAKE_DIRECTORY ${RUBY_BUILD_DIR}) | ||
633 | 628 | #CONFIGURE FILE | ||
634 | 629 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/ruby_configure.cmake " | ||
635 | 630 | EXECUTE_PROCESS( | ||
636 | 631 | COMMAND \"${RUBY_WIN32_DIR}/configure.bat --prefix=\\\"\\\"\" | ||
637 | 632 | WORKING_DIRECTORY \"${RUBY_BUILD_DIR}\" | ||
638 | 633 | ) | ||
639 | 634 | ") | ||
640 | 635 | #BUILD FILE | ||
641 | 636 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/ruby_build.cmake " | ||
642 | 637 | EXECUTE_PROCESS( | ||
643 | 638 | COMMAND nmake | ||
644 | 639 | WORKING_DIRECTORY \"${RUBY_BUILD_DIR}\" | ||
645 | 640 | ) | ||
646 | 641 | ") | ||
647 | 642 | #INSTALL FILE | ||
648 | 643 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/ruby_install.cmake " | ||
649 | 644 | EXECUTE_PROCESS( | ||
650 | 645 | COMMAND nmake DESTDIR=${RUBY_INSTALL_DIR} install | ||
651 | 646 | WORKING_DIRECTORY \"${RUBY_BUILD_DIR}\" | ||
652 | 647 | ) | ||
653 | 648 | ") | ||
654 | 649 | |||
655 | 650 | EXTERNALPROJECT_ADD( | ||
656 | 651 | ${RUBY_PAK} | ||
657 | 652 | URL http://cache.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p247.tar.gz | ||
658 | 653 | URL_MD5 c351450a0bed670e0f5ca07da3458a5b | ||
659 | 654 | PREFIX ${RUBY_PAK} | ||
660 | 655 | PATCH_COMMAND "" | ||
661 | 656 | CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/ruby_configure.cmake | ||
662 | 657 | BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/ruby_build.cmake | ||
663 | 658 | INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/ruby_install.cmake | ||
664 | 659 | ) | ||
665 | 660 | |||
666 | 661 | ############################################################################## | ||
667 | 662 | ############################################################################## | ||
668 | 663 | # PHP 5.5 | ||
669 | 664 | ############################################################################## | ||
670 | 665 | SET(PHP_PAK php-5.5) | ||
671 | 666 | SET(PHP_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PHP_PAK}/src/${PHP_PAK}/Win32) | ||
672 | 667 | SET(PHP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PHP_PAK} ) | ||
673 | 668 | SET(PHP_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PHP_PAK}/build ) | ||
674 | 669 | |||
675 | 670 | FILE(MAKE_DIRECTORY ${PHP_BUILD_DIR}) | ||
676 | 671 | #CONFIGURE FILE | ||
677 | 672 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/php_configure.cmake " | ||
678 | 673 | EXECUTE_PROCESS( | ||
679 | 674 | COMMAND \"${PHP_WIN32_DIR}/configure.bat\" | ||
680 | 675 | WORKING_DIRECTORY \"${PHP_BUILD_DIR}\" | ||
681 | 676 | ) | ||
682 | 677 | ") | ||
683 | 678 | #BUILD FILE | ||
684 | 679 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/php_build.cmake " | ||
685 | 680 | EXECUTE_PROCESS( | ||
686 | 681 | COMMAND nmake | ||
687 | 682 | WORKING_DIRECTORY \"${PHP_BUILD_DIR}\" | ||
688 | 683 | ) | ||
689 | 684 | ") | ||
690 | 685 | #INSTALL FILE | ||
691 | 686 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/php_install.cmake " | ||
692 | 687 | EXECUTE_PROCESS( | ||
693 | 688 | COMMAND nmake DESTDIR=${PHP_INSTALL_DIR} install | ||
694 | 689 | WORKING_DIRECTORY \"${PHP_BUILD_DIR}\" | ||
695 | 690 | ) | ||
696 | 691 | FILE(RENAME ${PHP_INSTALL_DIR}/usr/bin ${PHP_INSTALL_DIR}/bin) | ||
697 | 692 | FILE(RENAME ${PHP_INSTALL_DIR}/usr/include ${PHP_INSTALL_DIR}/include) | ||
698 | 693 | FILE(RENAME ${PHP_INSTALL_DIR}/usr/lib ${PHP_INSTALL_DIR}/lib) | ||
699 | 694 | FILE(RENAME ${PHP_INSTALL_DIR}/usr/share ${PHP_INSTALL_DIR}/share) | ||
700 | 695 | ") | ||
701 | 696 | |||
702 | 697 | EXTERNALPROJECT_ADD( | ||
703 | 698 | ${PHP_PAK} | ||
704 | 699 | URL http://cache.php-lang.org/pub/php/2.0/php-2.0.0-p247.tar.gz | ||
705 | 700 | URL_MD5 c351450a0bed670e0f5ca07da3458a5b | ||
706 | 701 | PREFIX ${PHP_PAK} | ||
707 | 702 | PATCH_COMMAND "" | ||
708 | 703 | CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/php_configure.cmake | ||
709 | 704 | BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/php_build.cmake | ||
710 | 705 | INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/php_install.cmake | ||
711 | 706 | ) | ||
712 | 707 | |||
713 | 708 | ############################################################################## | ||
714 | 709 | ############################################################################## | ||
715 | 710 | # CLEANUP | ||
716 | 711 | ############################################################################## | ||
717 | 712 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/cleanup.cmake " | ||
718 | 713 | FILE(GLOB TEMP_FILES \"${CMAKE_CURRENT_BINARY_DIR}/lib*.cmake\" \"${CMAKE_CURRENT_BINARY_DIR}/python*.cmake\") | ||
719 | 714 | FOREACH(TEMP_F \${TEMP_FILES}) | ||
720 | 715 | FILE(REMOVE \${TEMP_F}) | ||
721 | 716 | ENDFOREACH() | ||
722 | 717 | ") | ||
723 | 718 | EXTERNALPROJECT_ADD ( | ||
724 | 719 | CLEANUP | ||
725 | 720 | URL ${CMAKE_CURRENT_SOURCE_DIR}/cleanup.zip | ||
726 | 721 | PREFIX CLEANUP | ||
727 | 722 | DEPENDS opensslzip tidy | ||
728 | 723 | ${DOXYGEN_PAK} ${GEOS_PAK} ${GRAPHVIZ_PAK} ${LIBICU_PAK} ${LIBCURL_PAK} ${LIBXSLT_PAK} ${LIBXML2_PAK} | ||
729 | 724 | ${PERL_PAK} ${ZLIB1_PAK} ${SWIG_PAK} ${XERCES_PAK} ${OPENSSL_PAK} ${PYTHON_PAK} ${RUBY_PAK} | ||
730 | 725 | CONFIGURE_COMMAND "" | ||
731 | 726 | BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/cleanup.cmake | ||
732 | 727 | INSTALL_COMMAND "" | ||
733 | 728 | ) | ||
734 | 729 | |||
735 | 730 | ############################################################################## | ||
736 | 731 | ############################################################################## | ||
737 | 732 | # | ||
738 | 733 | ############################################################################## | ||
739 | 734 | |||
740 | 735 | |||
741 | 736 | |||
742 | 737 | |||
743 | 738 | MESSAGE(STATUS "Directory to set with ZORBA_THIRD_PARTY_REQUIREMENTS: " ${CMAKE_CURRENT_BINARY_DIR}) | ||
744 | 739 | |||
745 | 740 | |||
746 | 741 | |||
747 | 0 | 742 | ||
748 | === added file 'scripts/winports/cleanup.zip' | |||
749 | 1 | Binary files scripts/winports/cleanup.zip 1970-01-01 00:00:00 +0000 and scripts/winports/cleanup.zip 2013-09-12 22:32:36 +0000 differ | 743 | Binary files scripts/winports/cleanup.zip 1970-01-01 00:00:00 +0000 and scripts/winports/cleanup.zip 2013-09-12 22:32:36 +0000 differ |
750 | === added file 'scripts/winports/download.cmake' | |||
751 | --- scripts/winports/download.cmake 1970-01-01 00:00:00 +0000 | |||
752 | +++ scripts/winports/download.cmake 2013-09-12 22:32:36 +0000 | |||
753 | @@ -0,0 +1,45 @@ | |||
754 | 1 | ############################################################################## | ||
755 | 2 | ############################################################################## | ||
756 | 3 | # DOWNLOAD_EXTRACT | ||
757 | 4 | ############################################################################## | ||
758 | 5 | # This function downloads a package from PACKAGE_URL | ||
759 | 6 | # and verifies that PACKAGE_MD5 corresponds | ||
760 | 7 | # then, if WITH_DIR is set to YES, it creates PACKAGE_NAME directory | ||
761 | 8 | # and extract the content of the downloaded file in this directory | ||
762 | 9 | # if WITH_DIR is set to NO, it extracts the file in CMAKE_CURRENT_BINARY_DIR directory | ||
763 | 10 | # | ||
764 | 11 | FUNCTION (DOWNLOAD_EXTRACT PACKAGE_NAME WITH_DIR PACKAGE_URL PACKAGE_MD5) | ||
765 | 12 | SET(FINAL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}\\${PACKAGE_NAME}) | ||
766 | 13 | IF(EXISTS ${FINAL_DESTINATION}) | ||
767 | 14 | MESSAGE(STATUS "Package ${PACKAGE_NAME} already in place: ${FINAL_DESTINATION}") | ||
768 | 15 | RETURN() | ||
769 | 16 | ENDIF(EXISTS ${FINAL_DESTINATION}) | ||
770 | 17 | |||
771 | 18 | MESSAGE(STATUS "Setting up ${PACKAGE_NAME}") | ||
772 | 19 | |||
773 | 20 | SET(DOWNLOAD_PACKAGE YES) | ||
774 | 21 | |||
775 | 22 | IF(WITH_DIR) | ||
776 | 23 | FILE(MAKE_DIRECTORY ${FINAL_DESTINATION}) | ||
777 | 24 | ELSE(WITH_DIR) | ||
778 | 25 | SET(FINAL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}) | ||
779 | 26 | ENDIF(WITH_DIR) | ||
780 | 27 | |||
781 | 28 | IF (EXISTS ${LIB_DOWNLOADS}\\${PACKAGE_NAME}.zip) | ||
782 | 29 | FILE(MD5 ${LIB_DOWNLOADS}\\${PACKAGE_NAME}.zip EXIST_MD5) | ||
783 | 30 | IF (${EXIST_MD5} STREQUAL ${PACKAGE_MD5}) | ||
784 | 31 | MESSAGE(STATUS "${PACKAGE_NAME} already downloaded.") | ||
785 | 32 | SET(DOWNLOAD_PACKAGE NO) | ||
786 | 33 | ENDIF (${EXIST_MD5} STREQUAL ${PACKAGE_MD5}) | ||
787 | 34 | ENDIF (EXISTS ${LIB_DOWNLOADS}\\${PACKAGE_NAME}.zip) | ||
788 | 35 | |||
789 | 36 | IF (DOWNLOAD_PACKAGE) | ||
790 | 37 | FILE(DOWNLOAD ${PACKAGE_URL} ${LIB_DOWNLOADS}\\${PACKAGE_NAME}.zip SHOW_PROGRESS EXPECTED_MD5 "${PACKAGE_MD5}" ) | ||
791 | 38 | ENDIF (DOWNLOAD_PACKAGE) | ||
792 | 39 | |||
793 | 40 | MESSAGE(STATUS "Extracting ${PACKAGE_NAME}") | ||
794 | 41 | EXECUTE_PROCESS( | ||
795 | 42 | COMMAND ${CMAKE_COMMAND} -E tar xzf ${LIB_DOWNLOADS}\\${PACKAGE_NAME}.zip | ||
796 | 43 | WORKING_DIRECTORY ${FINAL_DESTINATION} | ||
797 | 44 | ) | ||
798 | 45 | ENDFUNCTION (DOWNLOAD_EXTRACT) | ||
799 | 0 | 46 | ||
800 | === added directory 'scripts/winports/libiconv' | |||
801 | === added file 'scripts/winports/libiconv/CMakeLists.txt' | |||
802 | --- scripts/winports/libiconv/CMakeLists.txt 1970-01-01 00:00:00 +0000 | |||
803 | +++ scripts/winports/libiconv/CMakeLists.txt 2013-09-12 22:32:36 +0000 | |||
804 | @@ -0,0 +1,31 @@ | |||
805 | 1 | CMAKE_MINIMUM_REQUIRED(VERSION 2.6) | ||
806 | 2 | PROJECT(libiconv) | ||
807 | 3 | |||
808 | 4 | ADD_DEFINITIONS(-DLIBICONV_PLUG -DBUILDING_LIBICONV -DBUILDING_LIBCHARSET) | ||
809 | 5 | SET(PATCH_COMMAND @PATCH_COMMAND@) | ||
810 | 6 | |||
811 | 7 | CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libcharset/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/libcharset/config.h COPYONLY) | ||
812 | 8 | CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libcharset/include/localcharset.h.build.in ${CMAKE_CURRENT_SOURCE_DIR}/libcharset/include/localcharset.h COPYONLY) | ||
813 | 9 | CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/iconv.h.build.in ${CMAKE_CURRENT_SOURCE_DIR}/include/iconv.h COPYONLY) | ||
814 | 10 | CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h COPYONLY) | ||
815 | 11 | |||
816 | 12 | EXECUTE_PROCESS( COMMAND ${PATCH_COMMAND} config.h config.h.patch -R WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) | ||
817 | 13 | EXECUTE_PROCESS( COMMAND ${PATCH_COMMAND} lib/iconv.c iconv.c.patch -R WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) | ||
818 | 14 | EXECUTE_PROCESS( COMMAND ${PATCH_COMMAND} include/iconv.h iconv.h.patch -R WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) | ||
819 | 15 | EXECUTE_PROCESS( COMMAND ${PATCH_COMMAND} windows/libiconv.rc libiconv.rc.patch -R WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) | ||
820 | 16 | EXECUTE_PROCESS( COMMAND ${PATCH_COMMAND} libcharset/lib/localcharset.c localcharset.c.patch -R WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) | ||
821 | 17 | EXECUTE_PROCESS( COMMAND ${PATCH_COMMAND} libcharset/include/localcharset.h localcharset.h.patch -R WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} ) | ||
822 | 18 | |||
823 | 19 | INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libcharset) | ||
824 | 20 | INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libcharset/include) | ||
825 | 21 | INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include) | ||
826 | 22 | INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lib) | ||
827 | 23 | |||
828 | 24 | |||
829 | 25 | ADD_LIBRARY(iconv SHARED lib/iconv.c lib/relocatable.c libcharset/lib/localcharset.c windows/libiconv.rc) | ||
830 | 26 | |||
831 | 27 | INSTALL(TARGETS iconv DESTINATION bin ) | ||
832 | 28 | INSTALL(TARGETS iconv DESTINATION lib ) | ||
833 | 29 | INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libcharset/include/localcharset.h DESTINATION include) | ||
834 | 30 | INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/iconv.h DESTINATION include) | ||
835 | 31 | |||
836 | 0 | 32 | ||
837 | === added file 'scripts/winports/libiconv/config.h.patch' | |||
838 | --- scripts/winports/libiconv/config.h.patch 1970-01-01 00:00:00 +0000 | |||
839 | +++ scripts/winports/libiconv/config.h.patch 2013-09-12 22:32:36 +0000 | |||
840 | @@ -0,0 +1,4 @@ | |||
841 | 1 | 30c30 | ||
842 | 2 | < //#undef EILSEQ | ||
843 | 3 | --- | ||
844 | 4 | > #undef EILSEQ | ||
845 | 0 | 5 | ||
846 | === added file 'scripts/winports/libiconv/iconv.c.patch' | |||
847 | --- scripts/winports/libiconv/iconv.c.patch 1970-01-01 00:00:00 +0000 | |||
848 | +++ scripts/winports/libiconv/iconv.c.patch 2013-09-12 22:32:36 +0000 | |||
849 | @@ -0,0 +1,4 @@ | |||
850 | 1 | 247c247 | ||
851 | 2 | < const char* * inbuf, size_t *inbytesleft, | ||
852 | 3 | --- | ||
853 | 4 | > ICONV_CONST char* * inbuf, size_t *inbytesleft, | ||
854 | 0 | 5 | ||
855 | === added file 'scripts/winports/libiconv/iconv.h.patch' | |||
856 | --- scripts/winports/libiconv/iconv.h.patch 1970-01-01 00:00:00 +0000 | |||
857 | +++ scripts/winports/libiconv/iconv.h.patch 2013-09-12 22:32:36 +0000 | |||
858 | @@ -0,0 +1,34 @@ | |||
859 | 1 | 26,29c26,27 | ||
860 | 2 | < #if BUILDING_LIBICONV | ||
861 | 3 | < #define LIBICONV_DLL_EXPORTED __declspec(dllexport) | ||
862 | 4 | < #elif USING_STATIC_LIBICONV | ||
863 | 5 | < #define LIBICONV_DLL_EXPORTED | ||
864 | 6 | --- | ||
865 | 7 | > #if @HAVE_VISIBILITY@ && BUILDING_LIBICONV | ||
866 | 8 | > #define LIBICONV_DLL_EXPORTED __attribute__((__visibility__("default"))) | ||
867 | 9 | 31c29 | ||
868 | 10 | < #define LIBICONV_DLL_EXPORTED __declspec(dllimport) | ||
869 | 11 | --- | ||
870 | 12 | > #define LIBICONV_DLL_EXPORTED | ||
871 | 13 | 33c31 | ||
872 | 14 | < extern LIBICONV_DLL_EXPORTED int _libiconv_version; /* Likewise */ | ||
873 | 15 | --- | ||
874 | 16 | > extern LIBICONV_DLL_EXPORTED @DLL_VARIABLE@ int _libiconv_version; /* Likewise */ | ||
875 | 17 | 91c89 | ||
876 | 18 | < extern LIBICONV_DLL_EXPORTED size_t iconv (iconv_t cd, const char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft); | ||
877 | 19 | --- | ||
878 | 20 | > extern LIBICONV_DLL_EXPORTED size_t iconv (iconv_t cd, @ICONV_CONST@ char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft); | ||
879 | 21 | 109,110c107,108 | ||
880 | 22 | < #if USE_MBSTATE_T | ||
881 | 23 | < #if BROKEN_WCHAR_H | ||
882 | 24 | --- | ||
883 | 25 | > #if @USE_MBSTATE_T@ | ||
884 | 26 | > #if @BROKEN_WCHAR_H@ | ||
885 | 27 | 130c128 | ||
886 | 28 | < #if USE_MBSTATE_T | ||
887 | 29 | --- | ||
888 | 30 | > #if @USE_MBSTATE_T@ | ||
889 | 31 | 177c175 | ||
890 | 32 | < #if HAVE_WCHAR_T | ||
891 | 33 | --- | ||
892 | 34 | > #if @HAVE_WCHAR_T@ | ||
893 | 0 | 35 | ||
894 | === added file 'scripts/winports/libiconv/libiconv.rc.patch' | |||
895 | --- scripts/winports/libiconv/libiconv.rc.patch 1970-01-01 00:00:00 +0000 | |||
896 | +++ scripts/winports/libiconv/libiconv.rc.patch 2013-09-12 22:32:36 +0000 | |||
897 | @@ -0,0 +1,5 @@ | |||
898 | 1 | 2,5d1 | ||
899 | 2 | < #define PACKAGE_VERSION_MAJOR 1 | ||
900 | 3 | < #define PACKAGE_VERSION_MINOR 14 | ||
901 | 4 | < #define PACKAGE_VERSION_SUBMINOR 0 | ||
902 | 5 | < #define PACKAGE_VERSION_STRING "1.14" | ||
903 | 0 | 6 | ||
904 | === added file 'scripts/winports/libiconv/localcharset.c.patch' | |||
905 | --- scripts/winports/libiconv/localcharset.c.patch 1970-01-01 00:00:00 +0000 | |||
906 | +++ scripts/winports/libiconv/localcharset.c.patch 2013-09-12 22:32:36 +0000 | |||
907 | @@ -0,0 +1,8 @@ | |||
908 | 1 | 77,79c77,79 | ||
909 | 2 | < //#ifndef LIBDIR | ||
910 | 3 | < //# include "configmake.h" | ||
911 | 4 | < //#endif | ||
912 | 5 | --- | ||
913 | 6 | > #ifndef LIBDIR | ||
914 | 7 | > # include "configmake.h" | ||
915 | 8 | > #endif | ||
916 | 0 | 9 | ||
917 | === added file 'scripts/winports/libiconv/localcharset.h.patch' | |||
918 | --- scripts/winports/libiconv/localcharset.h.patch 1970-01-01 00:00:00 +0000 | |||
919 | +++ scripts/winports/libiconv/localcharset.h.patch 2013-09-12 22:32:36 +0000 | |||
920 | @@ -0,0 +1,14 @@ | |||
921 | 1 | 23,26c23,24 | ||
922 | 2 | < #ifdef BUILDING_LIBCHARSET | ||
923 | 3 | < #define LIBCHARSET_DLL_EXPORTED __declspec(dllexport) | ||
924 | 4 | < #elif USING_STATIC_LIBICONV | ||
925 | 5 | < #define LIBCHARSET_DLL_EXPORTED | ||
926 | 6 | --- | ||
927 | 7 | > #if @HAVE_VISIBILITY@ && BUILDING_LIBCHARSET | ||
928 | 8 | > #define LIBCHARSET_DLL_EXPORTED __attribute__((__visibility__("default"))) | ||
929 | 9 | 28c26 | ||
930 | 10 | < #define LIBCHARSET_DLL_EXPORTED __declspec(dllimport) | ||
931 | 11 | --- | ||
932 | 12 | > #define LIBCHARSET_DLL_EXPORTED | ||
933 | 13 | 30a29 | ||
934 | 14 | > | ||
935 | 0 | 15 | ||
936 | === added file 'scripts/winports/libiconv/move.cmake' | |||
937 | --- scripts/winports/libiconv/move.cmake 1970-01-01 00:00:00 +0000 | |||
938 | +++ scripts/winports/libiconv/move.cmake 2013-09-12 22:32:36 +0000 | |||
939 | @@ -0,0 +1,7 @@ | |||
940 | 1 | CONFIGURE_FILE(${CMAKELISTS_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt) | ||
941 | 2 | CONFIGURE_FILE(${CMAKELISTS_DIR}/config.h.patch ${CMAKE_CURRENT_SOURCE_DIR}/config.h.patch COPYONLY) | ||
942 | 3 | CONFIGURE_FILE(${CMAKELISTS_DIR}/iconv.c.patch ${CMAKE_CURRENT_SOURCE_DIR}/iconv.c.patch COPYONLY) | ||
943 | 4 | CONFIGURE_FILE(${CMAKELISTS_DIR}/iconv.h.patch ${CMAKE_CURRENT_SOURCE_DIR}/iconv.h.patch COPYONLY) | ||
944 | 5 | CONFIGURE_FILE(${CMAKELISTS_DIR}/libiconv.rc.patch ${CMAKE_CURRENT_SOURCE_DIR}/libiconv.rc.patch COPYONLY) | ||
945 | 6 | CONFIGURE_FILE(${CMAKELISTS_DIR}/localcharset.c.patch ${CMAKE_CURRENT_SOURCE_DIR}/localcharset.c.patch COPYONLY) | ||
946 | 7 | CONFIGURE_FILE(${CMAKELISTS_DIR}/localcharset.h.patch ${CMAKE_CURRENT_SOURCE_DIR}/localcharset.h.patch COPYONLY) | ||
947 | 0 | 8 | ||
948 | === added directory 'scripts/winports/openssl' | |||
949 | === added file 'scripts/winports/openssl/CMakeLists.txt' | |||
950 | --- scripts/winports/openssl/CMakeLists.txt 1970-01-01 00:00:00 +0000 | |||
951 | +++ scripts/winports/openssl/CMakeLists.txt 2013-09-12 22:32:36 +0000 | |||
952 | @@ -0,0 +1,170 @@ | |||
953 | 1 | CMAKE_MINIMUM_REQUIRED(VERSION 2.8) | ||
954 | 2 | INCLUDE(ExternalProject) | ||
955 | 3 | |||
956 | 4 | ############################################################################## | ||
957 | 5 | ############################################################################## | ||
958 | 6 | # PREPARE OPENSSL | ||
959 | 7 | ############################################################################## | ||
960 | 8 | ############################################################################## | ||
961 | 9 | |||
962 | 10 | SET (GNU_BIN ${CMAKE_CURRENT_BINARY_DIR}/bin) | ||
963 | 11 | FILE(MAKE_DIRECTORY ${GNU_BIN}) | ||
964 | 12 | |||
965 | 13 | ############################################################################## | ||
966 | 14 | ############################################################################## | ||
967 | 15 | # GZIP | ||
968 | 16 | ############################################################################## | ||
969 | 17 | #FILE(DOWNLOAD ${PACKAGE_URL} ${LIB_DOWNLOADS}\\${PACKAGE_NAME}.zip SHOW_PROGRESS EXPECTED_MD5 "${PACKAGE_MD5}" ) | ||
970 | 18 | SET(GZIP_PAK gzip-1.3.12-1) | ||
971 | 19 | EXTERNALPROJECT_ADD ( | ||
972 | 20 | ${GZIP_PAK} | ||
973 | 21 | URL http://hivelocity.dl.sourceforge.net/project/gnuwin32/gzip/1.3.12-1/gzip-1.3.12-1-bin.zip | ||
974 | 22 | URL_MD5 b24802293f74ab11aaa5786f36c59819 | ||
975 | 23 | PREFIX ${GZIP_PAK} | ||
976 | 24 | CONFIGURE_COMMAND "" | ||
977 | 25 | BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory | ||
978 | 26 | ${CMAKE_CURRENT_BINARY_DIR}/${GZIP_PAK}/src/${GZIP_PAK}/bin | ||
979 | 27 | ${GNU_BIN} | ||
980 | 28 | INSTALL_COMMAND "" | ||
981 | 29 | ) | ||
982 | 30 | |||
983 | 31 | ############################################################################## | ||
984 | 32 | ############################################################################## | ||
985 | 33 | # ZIP | ||
986 | 34 | ############################################################################## | ||
987 | 35 | SET(ZIP_PAK zip-3.0) | ||
988 | 36 | EXTERNALPROJECT_ADD ( | ||
989 | 37 | ${ZIP_PAK} | ||
990 | 38 | URL http://superb-dca3.dl.sourceforge.net/project/gnuwin32/zip/3.0/zip-3.0-bin.zip | ||
991 | 39 | URL_MD5 5b268fe06ce5f89bc5762805a7a9d7aa | ||
992 | 40 | DEPENDS ${GZIP_PAK} | ||
993 | 41 | PREFIX ${ZIP_PAK} | ||
994 | 42 | CONFIGURE_COMMAND "" | ||
995 | 43 | BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory | ||
996 | 44 | ${CMAKE_CURRENT_BINARY_DIR}/${ZIP_PAK}/src/${ZIP_PAK}/bin | ||
997 | 45 | ${GNU_BIN} | ||
998 | 46 | INSTALL_COMMAND "" | ||
999 | 47 | ) | ||
1000 | 48 | |||
1001 | 49 | ############################################################################## | ||
1002 | 50 | ############################################################################## | ||
1003 | 51 | # BZIP2 | ||
1004 | 52 | ############################################################################## | ||
1005 | 53 | SET(BZIP2_PAK bzip2-1.0.5) | ||
1006 | 54 | EXTERNALPROJECT_ADD ( | ||
1007 | 55 | ${BZIP2_PAK} | ||
1008 | 56 | URL http://hivelocity.dl.sourceforge.net/project/gnuwin32/bzip2/1.0.5/bzip2-1.0.5-bin.zip | ||
1009 | 57 | URL_MD5 a1155c41b1954a2f6da1014c7c1a1263 | ||
1010 | 58 | DEPENDS ${ZIP_PAK} | ||
1011 | 59 | PREFIX ${BZIP2_PAK} | ||
1012 | 60 | CONFIGURE_COMMAND "" | ||
1013 | 61 | BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory | ||
1014 | 62 | ${CMAKE_CURRENT_BINARY_DIR}/${BZIP2_PAK}/src/${BZIP2_PAK}/bin | ||
1015 | 63 | ${GNU_BIN} | ||
1016 | 64 | INSTALL_COMMAND "" | ||
1017 | 65 | ) | ||
1018 | 66 | |||
1019 | 67 | ############################################################################## | ||
1020 | 68 | ############################################################################## | ||
1021 | 69 | # BSDTAR | ||
1022 | 70 | ############################################################################## | ||
1023 | 71 | SET(BSDTAR_PAK libarchive-2.4.12-1) | ||
1024 | 72 | EXTERNALPROJECT_ADD ( | ||
1025 | 73 | ${BSDTAR_PAK} | ||
1026 | 74 | URL http://iweb.dl.sourceforge.net/project/gnuwin32/libarchive/2.4.12-1/libarchive-2.4.12-1-bin.zip | ||
1027 | 75 | URL_MD5 f2bd5a4ee39d9fc64b456d516f90afad | ||
1028 | 76 | DEPENDS ${BZIP2_PAK} | ||
1029 | 77 | PREFIX ${BSDTAR_PAK} | ||
1030 | 78 | CONFIGURE_COMMAND "" | ||
1031 | 79 | BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory | ||
1032 | 80 | ${CMAKE_CURRENT_BINARY_DIR}/${BSDTAR_PAK}/src/${BSDTAR_PAK}/bin | ||
1033 | 81 | ${GNU_BIN} | ||
1034 | 82 | INSTALL_COMMAND "" | ||
1035 | 83 | ) | ||
1036 | 84 | |||
1037 | 85 | ############################################################################## | ||
1038 | 86 | ############################################################################## | ||
1039 | 87 | # TAR | ||
1040 | 88 | ############################################################################## | ||
1041 | 89 | SET(TAR_PAK tar-1.13-1) | ||
1042 | 90 | EXTERNALPROJECT_ADD ( | ||
1043 | 91 | ${TAR_PAK} | ||
1044 | 92 | URL http://iweb.dl.sourceforge.net/project/gnuwin32/tar/1.13-1/tar-1.13-1-bin.zip | ||
1045 | 93 | URL_MD5 a92857ec82db569f0a8fa5370642dc69 | ||
1046 | 94 | DEPENDS ${BSDTAR_PAK} | ||
1047 | 95 | PREFIX ${TAR_PAK} | ||
1048 | 96 | CONFIGURE_COMMAND "" | ||
1049 | 97 | BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory | ||
1050 | 98 | ${CMAKE_CURRENT_BINARY_DIR}/${TAR_PAK}/src/${TAR_PAK}/bin | ||
1051 | 99 | ${GNU_BIN} | ||
1052 | 100 | INSTALL_COMMAND "" | ||
1053 | 101 | ) | ||
1054 | 102 | |||
1055 | 103 | ############################################################################## | ||
1056 | 104 | ############################################################################## | ||
1057 | 105 | # LIBINTL | ||
1058 | 106 | ############################################################################## | ||
1059 | 107 | SET(LIBINTL_PAK libintl-0.11.5-2) | ||
1060 | 108 | EXTERNALPROJECT_ADD ( | ||
1061 | 109 | ${LIBINTL_PAK} | ||
1062 | 110 | URL http://kent.dl.sourceforge.net/project/gnuwin32/libintl/0.11.5-2/libintl-0.11.5-2-bin.zip | ||
1063 | 111 | URL_MD5 220c1168c34fe0f4f3ed50fa50b66942 | ||
1064 | 112 | DEPENDS ${TAR_PAK} | ||
1065 | 113 | PREFIX ${LIBINTL_PAK} | ||
1066 | 114 | CONFIGURE_COMMAND "" | ||
1067 | 115 | BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory | ||
1068 | 116 | ${CMAKE_CURRENT_BINARY_DIR}/${LIBINTL_PAK}/src/${LIBINTL_PAK}/bin | ||
1069 | 117 | ${GNU_BIN} | ||
1070 | 118 | INSTALL_COMMAND "" | ||
1071 | 119 | ) | ||
1072 | 120 | ############################################################################## | ||
1073 | 121 | ############################################################################## | ||
1074 | 122 | # ZLIB | ||
1075 | 123 | ############################################################################## | ||
1076 | 124 | SET(ZLIB_PAK zlib128-dll) | ||
1077 | 125 | EXTERNALPROJECT_ADD ( | ||
1078 | 126 | ${ZLIB_PAK} | ||
1079 | 127 | URL http://softlayer-dal.dl.sourceforge.net/project/libpng/zlib/1.2.8/zlib128-dll.zip | ||
1080 | 128 | URL_MD5 42eccc2af5bac6b7a1188d7817d03549 | ||
1081 | 129 | DEPENDS ${LIBINTL_PAK} | ||
1082 | 130 | PREFIX ${ZLIB_PAK} | ||
1083 | 131 | CONFIGURE_COMMAND "" | ||
1084 | 132 | BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory | ||
1085 | 133 | ${CMAKE_CURRENT_BINARY_DIR}/${ZLIB_PAK}/src/${ZLIB_PAK} | ||
1086 | 134 | ${GNU_BIN} | ||
1087 | 135 | INSTALL_COMMAND "" | ||
1088 | 136 | ) | ||
1089 | 137 | |||
1090 | 138 | |||
1091 | 139 | ############################################################################## | ||
1092 | 140 | ############################################################################## | ||
1093 | 141 | # OPENSSL | ||
1094 | 142 | ############################################################################## | ||
1095 | 143 | FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libopenssl_tar.cmake " | ||
1096 | 144 | SET(ENV{PATH} \"\$ENV{PATH};${GNU_BIN}\") | ||
1097 | 145 | FILE(DOWNLOAD http://www.openssl.org/source/openssl-1.0.1e.tar.gz ${CMAKE_CURRENT_BINARY_DIR}/openssl.tar.gz SHOW_PROGRESS) | ||
1098 | 146 | EXECUTE_PROCESS( COMMAND bsdtar -xf openssl.tar.gz WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) | ||
1099 | 147 | MESSAGE(STATUS \"Re-extracting to avoid previous path errors.\") | ||
1100 | 148 | EXECUTE_PROCESS( COMMAND bsdtar -xf openssl.tar.gz WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) | ||
1101 | 149 | MESSAGE(STATUS \"Compresing in a Zip file.\") | ||
1102 | 150 | EXECUTE_PROCESS( COMMAND zip -rq openssl-1.0.1e.zip openssl-1.0.1e WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} ) | ||
1103 | 151 | |||
1104 | 152 | ") | ||
1105 | 153 | |||
1106 | 154 | |||
1107 | 155 | SET(LIBOPENSSL_ZIP_PAK opensslzip) | ||
1108 | 156 | EXTERNALPROJECT_ADD ( | ||
1109 | 157 | ${LIBOPENSSL_ZIP_PAK} | ||
1110 | 158 | # dummy file | ||
1111 | 159 | URL http://kent.dl.sourceforge.net/project/gnuwin32/patch/2.5.9-7/patch-2.5.9-7-bin.zip | ||
1112 | 160 | URL_MD5 b9c8b31d62f4b2e4f1887bbb63e8a905 | ||
1113 | 161 | DEPENDS ${ZLIB_PAK} | ||
1114 | 162 | PREFIX ${LIBOPENSSL_ZIP_PAK} | ||
1115 | 163 | CONFIGURE_COMMAND "" | ||
1116 | 164 | BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/libopenssl_tar.cmake | ||
1117 | 165 | INSTALL_COMMAND ${CMAKE_COMMAND} -E copy | ||
1118 | 166 | ${CMAKE_CURRENT_BINARY_DIR}/openssl-1.0.1e.zip | ||
1119 | 167 | ${CMAKE_CURRENT_BINARY_DIR}/../openssl-1.0.1e.zip | ||
1120 | 168 | ) | ||
1121 | 169 | |||
1122 | 170 | |||
1123 | 0 | 171 | ||
1124 | === modified file 'src/compiler/parser/jsoniq_parser.cpp' | |||
1125 | --- src/compiler/parser/jsoniq_parser.cpp 2013-09-12 08:50:38 +0000 | |||
1126 | +++ src/compiler/parser/jsoniq_parser.cpp 2013-09-12 22:32:36 +0000 | |||
1127 | @@ -29,7 +29,7 @@ | |||
1128 | 29 | 29 | ||
1129 | 30 | This special exception was added by the Free Software Foundation in | 30 | This special exception was added by the Free Software Foundation in |
1130 | 31 | version 2.2 of Bison. */ | 31 | version 2.2 of Bison. */ |
1132 | 32 | 32 | #include "stdafx.h" | |
1133 | 33 | // Take the name prefix into account. | 33 | // Take the name prefix into account. |
1134 | 34 | #define yylex zorbalex | 34 | #define yylex zorbalex |
1135 | 35 | 35 | ||
1136 | 36 | 36 | ||
1137 | === modified file 'src/compiler/parser/jsoniq_scanner.cpp' | |||
1138 | --- src/compiler/parser/jsoniq_scanner.cpp 2013-09-11 15:56:29 +0000 | |||
1139 | +++ src/compiler/parser/jsoniq_scanner.cpp 2013-09-12 22:32:36 +0000 | |||
1140 | @@ -1,3 +1,4 @@ | |||
1141 | 1 | #include "stdafx.h" | ||
1142 | 1 | #line 2 "jsoniq_scanner.yy.cpp" | 2 | #line 2 "jsoniq_scanner.yy.cpp" |
1143 | 2 | 3 | ||
1144 | 3 | #line 4 "jsoniq_scanner.yy.cpp" | 4 | #line 4 "jsoniq_scanner.yy.cpp" |
1145 | 4 | 5 | ||
1146 | === modified file 'src/runtime/hof/fn_hof_functions_impl.cpp' | |||
1147 | --- src/runtime/hof/fn_hof_functions_impl.cpp 2013-07-02 21:32:23 +0000 | |||
1148 | +++ src/runtime/hof/fn_hof_functions_impl.cpp 2013-09-12 22:32:36 +0000 | |||
1149 | @@ -81,7 +81,7 @@ | |||
1150 | 81 | 81 | ||
1151 | 82 | try | 82 | try |
1152 | 83 | { | 83 | { |
1154 | 84 | arity = to_xs_unsignedLong(arityItem->getIntegerValue()); | 84 | arity = static_cast<csize>(to_xs_unsignedLong(arityItem->getIntegerValue())); |
1155 | 85 | } | 85 | } |
1156 | 86 | catch ( std::range_error const& ) | 86 | catch ( std::range_error const& ) |
1157 | 87 | { | 87 | { |
1158 | 88 | 88 | ||
1159 | === modified file 'src/runtime/uris/uris_impl.cpp' | |||
1160 | --- src/runtime/uris/uris_impl.cpp 2013-06-11 23:38:49 +0000 | |||
1161 | +++ src/runtime/uris/uris_impl.cpp 2013-09-12 22:32:36 +0000 | |||
1162 | @@ -223,7 +223,7 @@ | |||
1163 | 223 | 223 | ||
1164 | 224 | GENV_ITEMFACTORY->createJSONObject(result, lNames, lValues); | 224 | GENV_ITEMFACTORY->createJSONObject(result, lNames, lValues); |
1165 | 225 | 225 | ||
1167 | 226 | STACK_PUSH(result, state ); | 226 | STACK_PUSH(!!result, state ); |
1168 | 227 | 227 | ||
1169 | 228 | STACK_END (state); | 228 | STACK_END (state); |
1170 | 229 | } | 229 | } |
1171 | 230 | 230 | ||
1172 | === modified file 'test/unit/external_function.cpp' | |||
1173 | --- test/unit/external_function.cpp 2013-05-28 00:58:27 +0000 | |||
1174 | +++ test/unit/external_function.cpp 2013-09-12 22:32:36 +0000 | |||
1175 | @@ -209,7 +209,7 @@ | |||
1176 | 209 | // evaluate the function and check if it was really called | 209 | // evaluate the function and check if it was really called |
1177 | 210 | std::cout << lQuery << std::endl; | 210 | std::cout << lQuery << std::endl; |
1178 | 211 | if (!lCalled) { | 211 | if (!lCalled) { |
1180 | 212 | return 2; | 212 | return true; |
1181 | 213 | } | 213 | } |
1182 | 214 | } | 214 | } |
1183 | 215 | 215 |
I'm proposing a Winports CMake script, that so far it downloads and compile:
- icu
- xerces
- libxml2
- libxslt
- zlib