Merge lp:~zorba-coders/zorba/bug1151967 into lp:zorba

Proposed by Rodolfo Ochoa
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
Reviewer Review Type Date Requested Status
Chris Hillery Approve
Rodolfo Ochoa Pending
Review via email: mp+162905@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Rodolfo Ochoa (rodolfo-ochoa) wrote :

I'm proposing a Winports CMake script, that so far it downloads and compile:
- icu
- xerces
- libxml2
- libxslt
- zlib

lp:~zorba-coders/zorba/bug1151967 updated
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:nonNegativeInteger, 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

Revision history for this message
Rodolfo Ochoa (rodolfo-ochoa) wrote :

added:
- openssl
- curl

lp:~zorba-coders/zorba/bug1151967 updated
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

Revision history for this message
Rodolfo Ochoa (rodolfo-ochoa) wrote :

I was able to run it successfully on:
- WinXP with VS2010
- Win7 with VS2012

Revision history for this message
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

lp:~zorba-coders/zorba/bug1151967 updated
11476. By [u'Markos Zaharioudakis <email address hidden>']

Removed binary-format and save-options parameters from XQuery::saveExecutionPlan (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 UserDefinedXQType::isSuperTypeOf() 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

Revision history for this message
Chris Hillery (ceejatec) :
review: Needs Fixing
Revision history for this message
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.

lp:~zorba-coders/zorba/bug1151967 updated
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 DynamicContextImpl::setVariable() 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 SingletonItemSequence::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 StaticContextImpl::checkInvokable() 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 function

Approved: 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_SerializerOption 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

Revision history for this message
Chris Hillery (ceejatec) :
review: Approve

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

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'scripts/winports'
=== added file 'scripts/winports/CMakeLists.txt'
--- scripts/winports/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ scripts/winports/CMakeLists.txt 2013-09-12 22:32:36 +0000
@@ -0,0 +1,741 @@
1CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
2INCLUDE(ExternalProject)
3PROJECT(winports)
4
5SET(SCRIPTS_DIR "scripts")
6FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}")
7##############################################################################
8##############################################################################
9# PATCH
10##############################################################################
11SET(PATCH_PAK patch-2.5.9)
12EXTERNALPROJECT_ADD (
13 ${PATCH_PAK}
14 URL http://kent.dl.sourceforge.net/project/gnuwin32/patch/2.5.9-7/patch-2.5.9-7-bin.zip
15 URL_MD5 b9c8b31d62f4b2e4f1887bbb63e8a905
16 PREFIX ${PATCH_PAK}
17 #DEPENDS ${LIBXML2_PAK}
18 PATCH_COMMAND ""
19 CONFIGURE_COMMAND ""
20 BUILD_COMMAND ""
21 INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
22 ${CMAKE_CURRENT_BINARY_DIR}/${PATCH_PAK}/src/${PATCH_PAK}/bin
23 ${CMAKE_CURRENT_BINARY_DIR}/${PATCH_PAK}/bin
24)
25SET(PATCH_EXE ${CMAKE_CURRENT_BINARY_DIR}/${PATCH_PAK}/bin/patch.exe)
26
27##############################################################################
28##############################################################################
29# GRAPHVIZ
30##############################################################################
31SET(GRAPHVIZ_PAK graphviz-2.30.1)
32EXTERNALPROJECT_ADD (
33 ${GRAPHVIZ_PAK}
34 URL http://www.graphviz.org/pub/graphviz/stable/windows/graphviz-2.30.1.zip
35 URL_MD5 4a28bddcdfd00f8d1afffd91ee098172
36 PREFIX ${GRAPHVIZ_PAK}
37 PATCH_COMMAND ""
38 CONFIGURE_COMMAND ""
39 BUILD_COMMAND ""
40 INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
41 ${CMAKE_CURRENT_BINARY_DIR}/${GRAPHVIZ_PAK}/src/${GRAPHVIZ_PAK}
42 ${CMAKE_CURRENT_BINARY_DIR}/${GRAPHVIZ_PAK}
43)
44
45#############################################################################
46##############################################################################
47# GEOS
48##############################################################################
49SET(GEOS_PAK geos-3.3.8)
50#LIBGEOS PATCH FILE
51FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos.patch "
5290a91,93
53> !ELSEIF \"$(_NMAKE_VER)\" == \"11.00.60315.1\"
54> GEOS_MSVC = 11.0
55> GEOS_MSC = 1700
56")
57#PATCH FILE
58FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_patch.cmake "
59 EXECUTE_PROCESS(COMMAND ${PATCH_EXE} nmake.opt ${CMAKE_CURRENT_BINARY_DIR}/libgeos.patch -f
60 WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" )
61")
62
63#CONFIGURE FILE
64FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_configure.cmake "
65 EXECUTE_PROCESS(
66 COMMAND autogen.bat
67 WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\"
68 )
69")
70#BUILD FILE
71FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_build.cmake "
72 SET(ENV{INCLUDE} \"\$ENV{INCLUDE};C:\\\\Program Files (x86)\\\\Microsoft SDKs\\\\Windows\\\\v7.1A\\\\Include\")
73 SET(ENV{INCLUDE} \"\$ENV{INCLUDE};C:\\\\Program Files (x86)\\\\Microsoft SDKs\\\\Windows\\\\v7.0A\\\\Include\")
74 EXECUTE_PROCESS(
75 COMMAND nmake /f makefile.vc MSVC_VER=1700
76 WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\"
77 )
78")
79#INSTALL FILE
80FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_install.cmake "
81 FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/bin)
82 FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/lib)
83 EXECUTE_PROCESS(
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
85 WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" )
86 EXECUTE_PROCESS(
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
88 WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" )
89 EXECUTE_PROCESS(
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
91 WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" )
92 EXECUTE_PROCESS(
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
94 WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" )
95 EXECUTE_PROCESS(
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
97 WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" )
98 EXECUTE_PROCESS(
99 COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}/include ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/include
100 WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" )
101")
102EXTERNALPROJECT_ADD (
103 ${GEOS_PAK}
104 URL http://download.osgeo.org/geos/geos-3.3.8.tar.bz2
105 URL_MD5 75be476d0831a2d14958fed76ca266de
106 PREFIX ${GEOS_PAK}
107 DEPENDS ${PATCH_PAK}
108 PATCH_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_patch.cmake
109 CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_configure.cmake
110 BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_build.cmake
111 INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_install.cmake
112)
113
114##############################################################################
115##############################################################################
116# DOXYGEN
117##############################################################################
118SET(DOXYGEN_PAK doxygen-1.8.4)
119EXTERNALPROJECT_ADD (
120 ${DOXYGEN_PAK}
121 #URL http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.4.windows.x64.bin.zip
122 #URL_MD5 bcbb2140bba22a95cd915ba19340851a
123
124 URL http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.4.windows.bin.zip
125 URL_MD5 af35822049dac03e5ed96aaa672f9dc2
126 PREFIX ${DOXYGEN_PAK}
127 PATCH_COMMAND ""
128 CONFIGURE_COMMAND ""
129 BUILD_COMMAND ""
130 INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
131 ${CMAKE_CURRENT_BINARY_DIR}/${DOXYGEN_PAK}/src/${DOXYGEN_PAK}
132 ${CMAKE_CURRENT_BINARY_DIR}/${DOXYGEN_PAK}
133)
134
135##############################################################################
136##############################################################################
137# TIDY
138##############################################################################
139#PATCH FILE
140FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_patch.cmake "
141 FILE(GLOB TIDY_PROJECT \"${CMAKE_CURRENT_BINARY_DIR}/tidy/src/tidy/build/msvc/*.*\")
142 FOREACH(TIDY_FILE \${TIDY_PROJECT})
143 FILE(READ \${TIDY_FILE} FILE_TO_CHANGE)
144 STRING(REPLACE \"\\n\" \"\\n\" FILE_TO_CHANGE \"\${FILE_TO_CHANGE}\")
145 FILE(WRITE \${TIDY_FILE} \${FILE_TO_CHANGE})
146 ENDFOREACH()
147")
148#CONFIGURE FILE
149FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_configure.cmake "
150 EXECUTE_PROCESS(
151 COMMAND devenv tidy.dsw /Upgrade
152 WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/tidy/src/tidy/build/msvc/\"
153 )
154")
155#BUILD FILE
156FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_build.cmake "
157 EXECUTE_PROCESS(
158 COMMAND devenv tidy.sln /Build \"Release|Win32\"
159 WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/tidy/src/tidy/build/msvc/\"
160 )
161")
162#INSTALL FILE
163FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_install.cmake "
164 EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E copy
165 ${CMAKE_CURRENT_BINARY_DIR}/tidy/src/tidy/build/msvc/Release/tidy.exe
166 ${CMAKE_CURRENT_BINARY_DIR}/tidy/tidy.exe
167 WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\" )
168 EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E copy
169 ${CMAKE_CURRENT_BINARY_DIR}/tidy/src/tidy/build/msvc/ReleaseDLL/libtidy.dll
170 ${CMAKE_CURRENT_BINARY_DIR}/tidy/libtidy.dll
171 WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\" )
172 EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E copy
173 ${CMAKE_CURRENT_BINARY_DIR}/tidy/src/tidy/build/msvc/ReleaseDLL/libtidy.lib
174 ${CMAKE_CURRENT_BINARY_DIR}/tidy/libtidy.lib
175 WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\" )
176")
177EXTERNALPROJECT_ADD (
178 tidy
179 URL http://tidy.cvs.sourceforge.net/viewvc/tidy/tidy/?view=tar
180
181 PREFIX tidy
182 PATCH_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_patch.cmake
183 CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_configure.cmake
184 BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_build.cmake
185 INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_install.cmake
186)
187
188##############################################################################
189##############################################################################
190# ZLIB
191##############################################################################
192SET(ZLIB1_PAK zlib-1.2.8)
193EXTERNALPROJECT_ADD(
194 ${ZLIB1_PAK}
195 URL http://zlib.net/zlib128-dll.zip
196 PREFIX ${ZLIB1_PAK}
197 URL_MD5 42eccc2af5bac6b7a1188d7817d03549
198 PATCH_COMMAND ""
199 CONFIGURE_COMMAND ""
200 BUILD_COMMAND ""
201 INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
202 ${CMAKE_CURRENT_BINARY_DIR}/${ZLIB1_PAK}/src/${ZLIB1_PAK}
203 ${CMAKE_CURRENT_BINARY_DIR}/${ZLIB1_PAK}
204)
205
206##############################################################################
207##############################################################################
208# PERL
209##############################################################################
210SET(PERL_PAK perl-5.16.3.1)
211EXTERNALPROJECT_ADD(
212 ${PERL_PAK}
213 URL http://strawberryperl.com/download/5.16.3.1/strawberry-perl-5.16.3.1-32bit-portable.zip
214 URL_MD5 8f3ef667e9a2b7fc402610da29bb8074
215 PREFIX ${PERL_PAK}
216 #SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/perl-5.16.3.1
217 PATCH_COMMAND ""
218 CONFIGURE_COMMAND ""
219 BUILD_COMMAND ""
220 INSTALL_COMMAND ""
221)
222SET(PERL_PATH ${CMAKE_CURRENT_BINARY_DIR}/${PERL_PAK}/src/${PERL_PAK}/perl/bin/)
223
224##############################################################################
225##############################################################################
226# OPENSSL
227##############################################################################
228SET(OPENSSL_PAK openssl-1.0.1e)
229#Patch for linux archiver
230ADD_SUBDIRECTORY(openssl)
231
232FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libopenssl_configure.cmake "
233
234 SET(ENV{PATH} \"\$ENV{PATH};${PERL_PATH}\")
235
236 EXECUTE_PROCESS(
237 COMMAND perl
238 Configure enable-camellia
239 --openssldir=${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK}
240 VC-WIN32
241 WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK}/src/${OPENSSL_PAK}\"
242 )
243
244 EXECUTE_PROCESS(
245 COMMAND \"${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK}/src/${OPENSSL_PAK}/ms/do_nt.bat\"
246 WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK}/src/${OPENSSL_PAK}\"
247 )
248")
249FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libopenssl_nmake.cmake "
250 SET(ENV{PATH} \"\$ENV{PATH};${PERL_PATH}\")
251 EXECUTE_PROCESS(
252 COMMAND nmake /f ms/ntdll.mak
253 WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK}/src/${OPENSSL_PAK}\"
254 )
255")
256FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libopenssl_install.cmake "
257 SET(ENV{PATH} \"\$ENV{PATH};${PERL_PATH}\")
258 EXECUTE_PROCESS(
259 COMMAND nmake /f ms/ntdll.mak install
260 WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK}/src/${OPENSSL_PAK}\"
261 )
262")
263
264
265EXTERNALPROJECT_ADD(
266 ${OPENSSL_PAK}
267 #fixed file
268 URL file://${CMAKE_CURRENT_BINARY_DIR}/openssl-1.0.1e.zip
269 DEPENDS opensslzip ${PERL_PAK}
270 PREFIX ${OPENSSL_PAK}
271 CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libopenssl_configure.cmake
272 BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libopenssl_nmake.cmake
273 INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libopenssl_install.cmake
274)
275SET(OPENSSL_ROOT ${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK})
276
277
278##############################################################################
279##############################################################################
280# LIBCURL
281##############################################################################
282SET(LIBCURL_PAK libcurl-7.29.0)
283EXTERNALPROJECT_ADD(
284 ${LIBCURL_PAK}
285 URL http://curl.haxx.se/download/curl-7.29.0.tar.gz
286 URL_MD5 4f57d3b4a3963038bd5e04dbff385390
287 PREFIX ${LIBCURL_PAK}
288 CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/${LIBCURL_PAK}
289 -DBUILD_CURL_EXE=ON -DBUILD_CURL_TESTS=OFF
290 -DCMAKE_USE_OPENSSL=ON -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT}
291 -DCURL_ZLIB=ON
292 -DHTTP_ONLY=OFF
293 -DCMAKE_BUILD_TYPE=RELEASE
294)
295
296##############################################################################
297##############################################################################
298# LIBICONV
299##############################################################################
300SET(LIBICONV_PAK libiconv-1.14)
301EXTERNALPROJECT_ADD(
302 ${LIBICONV_PAK}
303 DEPENDS ${PATCH_PAK}
304 URL http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz
305 URL_MD5 e34509b1623cec449dfeb73d7ce9c6c6
306 PREFIX ${LIBICONV_PAK}
307 CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/${LIBICONV_PAK} -DCMAKE_BUILD_TYPE=RELEASE
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
309)
310
311##############################################################################
312##############################################################################
313# LIBXML2
314##############################################################################
315SET(LIBXML2_PAK libxml2-2.9.1)
316SET(LIBXML2_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${LIBXML2_PAK}/src/${LIBXML2_PAK}/win32)
317#CONFIGURE FILE
318FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxml2_configure.cmake "
319 EXECUTE_PROCESS(
320 COMMAND assoc .js=JSFile
321 )
322 EXECUTE_PROCESS(
323 COMMAND cscript configure.js compiler=msvc
324 prefix=..\\\\..\\\\..
325 iconv=no
326 zlib=yes
327 include=${CMAKE_CURRENT_BINARY_DIR}/${ZLIB1_PAK}/include
328 lib=${CMAKE_CURRENT_BINARY_DIR}/${ZLIB1_PAK}/lib
329 WORKING_DIRECTORY \"${LIBXML2_WIN32_DIR}\"
330 )"
331)
332#MAKE FILE
333FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxml2_nmake.cmake "
334 EXECUTE_PROCESS(
335 COMMAND nmake /f Makefile.msvc
336 WORKING_DIRECTORY \"${LIBXML2_WIN32_DIR}\"
337 )"
338)
339#MAKE INSTALL FILE
340FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxml2_nmake_install.cmake "
341 EXECUTE_PROCESS(
342 COMMAND nmake /f Makefile.msvc install
343 WORKING_DIRECTORY \"${LIBXML2_WIN32_DIR}\"
344 )"
345)
346#CONFIGURE, MAKE AND INSTALL
347EXTERNALPROJECT_ADD(
348 ${LIBXML2_PAK}
349 URL ftp://xmlsoft.org/libxml2/libxml2-2.9.1.tar.gz
350 URL_MD5 9c0cfef285d5c4a5c80d00904ddab380
351 PREFIX ${LIBXML2_PAK}
352 DEPENDS ${ZLIB1_PAK} ${LIBICONV_PAK}
353 CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxml2_configure.cmake
354 BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxml2_nmake.cmake
355 INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxml2_nmake_install.cmake
356)
357
358
359##############################################################################
360##############################################################################
361# LIBXSLT
362##############################################################################
363SET(LIBXSLT_PAK libxslt-1.1.28)
364SET(LIBXSLT_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${LIBXSLT_PAK}/src/${LIBXSLT_PAK}/win32)
365#CONFIGURE FILE
366FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_configure.cmake "
367 EXECUTE_PROCESS(
368 COMMAND cscript configure.js compiler=msvc
369 prefix=..\\\\..\\\\..
370 iconv=no
371 zlib=yes
372 xslt_debug=no
373 include=${CMAKE_CURRENT_BINARY_DIR}/${LIBXML2_PAK}/include/libxml2
374 lib=${CMAKE_CURRENT_BINARY_DIR}/${LIBXML2_PAK}/lib
375 WORKING_DIRECTORY \"${LIBXSLT_WIN32_DIR}\"
376 ) "
377)
378#MAKE FILE
379FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_nmake.cmake "
380 EXECUTE_PROCESS(
381 COMMAND nmake /f Makefile.msvc
382 WORKING_DIRECTORY \"${LIBXSLT_WIN32_DIR}\"
383 ) "
384)
385#MAKE INSTALL FILE
386FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_nmake_install.cmake "
387 EXECUTE_PROCESS(
388 COMMAND nmake /f Makefile.msvc install
389 WORKING_DIRECTORY \"${LIBXSLT_WIN32_DIR}\"
390 ) "
391)
392#MAKE PATCH FILE
393FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_patch.cmake
394"
395 FILE(READ \"${LIBXSLT_WIN32_DIR}/Makefile.msvc\" LIBXSLT_MAKEFILE)
396 STRING(REPLACE \"LDFLAGS = $(LDFLAGS) /OPT:NOWIN98\" \"#LDFLAGS = $(LDFLAGS) /OPT:NOWIN98\" LIBXSLT_MAKEFILE \"\${LIBXSLT_MAKEFILE}\")
397 FILE(WRITE \"${LIBXSLT_WIN32_DIR}/Makefile.msvc\" \${LIBXSLT_MAKEFILE})
398"
399)
400#CONFIGURE, MAKE AND INSTALL
401EXTERNALPROJECT_ADD (
402 ${LIBXSLT_PAK}
403 URL ftp://xmlsoft.org/libxslt/libxslt-1.1.28.tar.gz
404 URL_MD5 9667bf6f9310b957254fdcf6596600b7
405 PREFIX ${LIBXSLT_PAK}
406 DEPENDS ${LIBXML2_PAK}
407 PATCH_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_patch.cmake
408 CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_configure.cmake
409 BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_nmake.cmake
410 INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_nmake_install.cmake
411)
412
413##############################################################################
414##############################################################################
415# ICU
416##############################################################################
417SET(LIBICU_PAK icu4c-4_8_1_1)
418SET(LIBICU_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${LIBICU_PAK}/src/${LIBICU_PAK}/source/allinone)
419SET(LIBICU_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${LIBICU_PAK} )
420SET(LIBICU_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${LIBICU_PAK}/src/${LIBICU_PAK} )
421#CONFIGURE FILE
422FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libicu_configure.cmake "
423 EXECUTE_PROCESS(
424 COMMAND devenv /upgrade allinone.sln
425 WORKING_DIRECTORY \"${LIBICU_WIN32_DIR}\"
426 ) "
427)
428#BUILD FILE
429FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libicu_build.cmake "
430 EXECUTE_PROCESS(
431 COMMAND devenv allinone.sln /build \"Release|Win32\"
432 WORKING_DIRECTORY \"${LIBICU_WIN32_DIR}\"
433 ) "
434)
435#INSTALL FILE
436FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libicu_install.cmake "
437 EXECUTE_PROCESS (
438 COMMAND ${CMAKE_COMMAND} -E copy_directory \"${LIBICU_BUILD_DIR}/bin\" \"${LIBICU_INSTALL_DIR}/bin\"
439 WORKING_DIRECTORY \"${LIBICU_INSTALL_DIR}/bin\"
440 )
441 EXECUTE_PROCESS (
442 COMMAND ${CMAKE_COMMAND} -E copy_directory \"${LIBICU_BUILD_DIR}/include\" \"${LIBICU_INSTALL_DIR}/include\"
443 WORKING_DIRECTORY \"${LIBICU_INSTALL_DIR}/include\"
444 )
445 EXECUTE_PROCESS (
446 COMMAND ${CMAKE_COMMAND} -E copy_directory \"${LIBICU_BUILD_DIR}/lib\" \"${LIBICU_INSTALL_DIR}/lib\"
447 WORKING_DIRECTORY \"${LIBICU_INSTALL_DIR}/lib\"
448 ) "
449)
450#CONFIGURE, MAKE AND INSTALL
451EXTERNALPROJECT_ADD (
452 ${LIBICU_PAK}
453 #ICU 5.1
454 #URL http://download.icu-project.org/files/icu4c/51.1/icu4c-51_1-src.zip
455 #URL_MD5 b4303a43caa79018e3b6ec18148fdb1a
456 #ICU 4.8
457 URL http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.zip
458 URL_MD5 890862544bdb9012f5758bd76e82c2b4
459 PREFIX ${LIBICU_PAK}
460 CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libicu_configure.cmake
461 BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libicu_build.cmake
462 INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libicu_install.cmake
463)
464
465##############################################################################
466##############################################################################
467# XERCES
468##############################################################################
469SET(XERCES_PAK xerces-c-3.1.1)
470SET(XERCES_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${XERCES_PAK}/src/${XERCES_PAK}/projects/Win32/VC10/xerces-all)
471SET(XERCES_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${XERCES_PAK} )
472SET(XERCES_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${XERCES_PAK}/src/${XERCES_PAK} )
473#CONFIGURE FILE
474FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libXERCES_configure.cmake "
475 EXECUTE_PROCESS(
476 COMMAND devenv /upgrade xerces-all.sln
477 WORKING_DIRECTORY \"${XERCES_WIN32_DIR}\"
478 ) "
479)
480#BUILD FILE
481FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libXERCES_build.cmake "
482 EXECUTE_PROCESS(
483 COMMAND devenv xerces-all.sln /build \"Release|Win32\"
484 WORKING_DIRECTORY \"${XERCES_WIN32_DIR}\"
485 ) "
486)
487#INSTALL FILE
488FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libXERCES_install.cmake
489"
490 FILE(MAKE_DIRECTORY \"${XERCES_INSTALL_DIR}/lib\")
491 EXECUTE_PROCESS (
492 COMMAND ${CMAKE_COMMAND} -E copy_directory \"${XERCES_BUILD_DIR}/src\" \"${XERCES_INSTALL_DIR}/include\"
493 WORKING_DIRECTORY \"${XERCES_INSTALL_DIR}\"
494 )
495 EXECUTE_PROCESS (
496 COMMAND ${CMAKE_COMMAND} -E copy_directory \"${XERCES_BUILD_DIR}/Build/Win32/VC10/Release\" \"${XERCES_INSTALL_DIR}/bin\"
497 WORKING_DIRECTORY \"${XERCES_INSTALL_DIR}\"
498 )
499 EXECUTE_PROCESS (
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\"
501 WORKING_DIRECTORY \"${XERCES_INSTALL_DIR}\"
502 )
503 FILE(GLOB_RECURSE XERCES_CPP_FILES \"${XERCES_INSTALL_DIR}/include/*.cpp\")
504 FOREACH(XERCES_CPP IN ITEMS \${XERCES_CPP_FILES})
505 FILE(REMOVE \${XERCES_CPP})
506 ENDFOREACH()
507
508")
509#CONFIGURE, MAKE AND INSTALL
510EXTERNALPROJECT_ADD (
511 ${XERCES_PAK}
512 URL http://www.apache.org/dist/xerces/c/3/sources/xerces-c-3.1.1.zip
513 URL_MD5 a42e0a35b8be37667bb7df6fb51feded
514 PREFIX ${XERCES_PAK}
515 #DEPENDS ${LIBXML2_PAK}
516 #PATCH_COMMAND echo %cd%
517 CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libXERCES_configure.cmake
518 BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libXERCES_build.cmake
519 INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libXERCES_install.cmake
520)
521
522##############################################################################
523##############################################################################
524# SWIG 2.0.10
525##############################################################################
526SET(SWIG_PAK swigwin-2.0.10)
527EXTERNALPROJECT_ADD(
528 ${SWIG_PAK}
529 URL http://hivelocity.dl.sourceforge.net/project/swig/swigwin/swigwin-2.0.10/swigwin-2.0.10.zip
530 URL_MD5 d41d8cd98f00b204e9800998ecf8427e
531 PREFIX ${SWIG_PAK}
532 PATCH_COMMAND ""
533 CONFIGURE_COMMAND ""
534 BUILD_COMMAND ""
535 INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
536 ${CMAKE_CURRENT_BINARY_DIR}/${SWIG_PAK}/src/${SWIG_PAK}
537 ${CMAKE_CURRENT_BINARY_DIR}/${SWIG_PAK}
538)
539
540##############################################################################
541##############################################################################
542# PYTHON 2.7.5
543##############################################################################
544SET(PYTHON_PAK python-2.7.5)
545SET(PYTHON_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PCBuild)
546#CONFIGURE FILE
547FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/python_configure.cmake "
548 EXECUTE_PROCESS(
549 COMMAND devenv /upgrade pcbuild.sln
550 WORKING_DIRECTORY \"${PYTHON_WIN32_DIR}\"
551 )
552")
553#BUILD FILE
554FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/python_build.cmake "
555 EXECUTE_PROCESS(
556 COMMAND devenv pcbuild.sln /build \"Debug|Win32\"
557 WORKING_DIRECTORY \"${PYTHON_WIN32_DIR}\"
558 )
559 EXECUTE_PROCESS(
560 COMMAND devenv pcbuild.sln /build \"Release|Win32\"
561 WORKING_DIRECTORY \"${PYTHON_WIN32_DIR}\"
562 )
563")
564#INSTALL FILE
565FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/python_install.cmake "
566 FILE(RENAME ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/Doc
567 ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/Doc )
568 FILE(RENAME ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/Lib
569 ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/Lib )
570 FILE(RENAME ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/Tools
571 ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/Tools )
572 FILE(RENAME ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/Include
573 ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/Include )
574
575 #all .h
576 FILE(GLOB PYTHON_FILES
577 \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PC/*.h\")
578 FOREACH(PYTHON_FILE \${PYTHON_FILES})
579 CONFIGURE_FILE(\${PYTHON_FILE} \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/Include\" COPYONLY)
580 ENDFOREACH()
581
582 #all dlls
583 FILE(MAKE_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/DLLs\")
584 FILE(GLOB PYTHON_FILES
585 \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PCBuild/*.pyd\"
586 \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PCBuild/*.dll\")
587 FOREACH(PYTHON_FILE \${PYTHON_FILES})
588 CONFIGURE_FILE(\${PYTHON_FILE} \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/DLLs\" COPYONLY)
589 ENDFOREACH()
590
591 #exe and dlls
592 FILE(GLOB PYTHON_FILES
593 \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PCBuild/*.exe\"
594 \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PCBuild/*.dll\")
595 FOREACH(PYTHON_FILE \${PYTHON_FILES})
596 CONFIGURE_FILE(\${PYTHON_FILE} \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}\" COPYONLY)
597 ENDFOREACH()
598
599 # libs
600 FILE(MAKE_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/libs\")
601 FILE(GLOB PYTHON_FILES
602 \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PCBuild/*.lib\")
603 FOREACH(PYTHON_FILE \${PYTHON_FILES})
604 CONFIGURE_FILE(\${PYTHON_FILE} \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/libs\" COPYONLY)
605 ENDFOREACH()
606")
607
608EXTERNALPROJECT_ADD(
609 ${PYTHON_PAK}
610 URL http://www.python.org/ftp/python/2.7.5/Python-2.7.5.tgz
611 URL_MD5 b4f01a1d0ba0b46b05c73b2ac909b1df
612 PREFIX ${PYTHON_PAK}
613 PATCH_COMMAND ""
614 CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/python_configure.cmake
615 BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/python_build.cmake
616 INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/python_install.cmake
617)
618
619##############################################################################
620##############################################################################
621# RUBY 2.0.0
622##############################################################################
623SET(RUBY_PAK ruby-2.0.0)
624SET(RUBY_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${RUBY_PAK}/src/${RUBY_PAK}/Win32)
625SET(RUBY_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${RUBY_PAK} )
626SET(RUBY_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${RUBY_PAK}/build )
627FILE(MAKE_DIRECTORY ${RUBY_BUILD_DIR})
628#CONFIGURE FILE
629FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/ruby_configure.cmake "
630 EXECUTE_PROCESS(
631 COMMAND \"${RUBY_WIN32_DIR}/configure.bat --prefix=\\\"\\\"\"
632 WORKING_DIRECTORY \"${RUBY_BUILD_DIR}\"
633 )
634")
635#BUILD FILE
636FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/ruby_build.cmake "
637 EXECUTE_PROCESS(
638 COMMAND nmake
639 WORKING_DIRECTORY \"${RUBY_BUILD_DIR}\"
640 )
641")
642#INSTALL FILE
643FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/ruby_install.cmake "
644 EXECUTE_PROCESS(
645 COMMAND nmake DESTDIR=${RUBY_INSTALL_DIR} install
646 WORKING_DIRECTORY \"${RUBY_BUILD_DIR}\"
647 )
648")
649
650EXTERNALPROJECT_ADD(
651 ${RUBY_PAK}
652 URL http://cache.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p247.tar.gz
653 URL_MD5 c351450a0bed670e0f5ca07da3458a5b
654 PREFIX ${RUBY_PAK}
655 PATCH_COMMAND ""
656 CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/ruby_configure.cmake
657 BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/ruby_build.cmake
658 INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/ruby_install.cmake
659)
660
661##############################################################################
662##############################################################################
663# PHP 5.5
664##############################################################################
665SET(PHP_PAK php-5.5)
666SET(PHP_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PHP_PAK}/src/${PHP_PAK}/Win32)
667SET(PHP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PHP_PAK} )
668SET(PHP_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PHP_PAK}/build )
669
670FILE(MAKE_DIRECTORY ${PHP_BUILD_DIR})
671#CONFIGURE FILE
672FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/php_configure.cmake "
673 EXECUTE_PROCESS(
674 COMMAND \"${PHP_WIN32_DIR}/configure.bat\"
675 WORKING_DIRECTORY \"${PHP_BUILD_DIR}\"
676 )
677")
678#BUILD FILE
679FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/php_build.cmake "
680 EXECUTE_PROCESS(
681 COMMAND nmake
682 WORKING_DIRECTORY \"${PHP_BUILD_DIR}\"
683 )
684")
685#INSTALL FILE
686FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/php_install.cmake "
687 EXECUTE_PROCESS(
688 COMMAND nmake DESTDIR=${PHP_INSTALL_DIR} install
689 WORKING_DIRECTORY \"${PHP_BUILD_DIR}\"
690 )
691 FILE(RENAME ${PHP_INSTALL_DIR}/usr/bin ${PHP_INSTALL_DIR}/bin)
692 FILE(RENAME ${PHP_INSTALL_DIR}/usr/include ${PHP_INSTALL_DIR}/include)
693 FILE(RENAME ${PHP_INSTALL_DIR}/usr/lib ${PHP_INSTALL_DIR}/lib)
694 FILE(RENAME ${PHP_INSTALL_DIR}/usr/share ${PHP_INSTALL_DIR}/share)
695")
696
697EXTERNALPROJECT_ADD(
698 ${PHP_PAK}
699 URL http://cache.php-lang.org/pub/php/2.0/php-2.0.0-p247.tar.gz
700 URL_MD5 c351450a0bed670e0f5ca07da3458a5b
701 PREFIX ${PHP_PAK}
702 PATCH_COMMAND ""
703 CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/php_configure.cmake
704 BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/php_build.cmake
705 INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/php_install.cmake
706)
707
708##############################################################################
709##############################################################################
710# CLEANUP
711##############################################################################
712FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/cleanup.cmake "
713 FILE(GLOB TEMP_FILES \"${CMAKE_CURRENT_BINARY_DIR}/lib*.cmake\" \"${CMAKE_CURRENT_BINARY_DIR}/python*.cmake\")
714 FOREACH(TEMP_F \${TEMP_FILES})
715 FILE(REMOVE \${TEMP_F})
716 ENDFOREACH()
717")
718EXTERNALPROJECT_ADD (
719 CLEANUP
720 URL ${CMAKE_CURRENT_SOURCE_DIR}/cleanup.zip
721 PREFIX CLEANUP
722 DEPENDS opensslzip tidy
723 ${DOXYGEN_PAK} ${GEOS_PAK} ${GRAPHVIZ_PAK} ${LIBICU_PAK} ${LIBCURL_PAK} ${LIBXSLT_PAK} ${LIBXML2_PAK}
724 ${PERL_PAK} ${ZLIB1_PAK} ${SWIG_PAK} ${XERCES_PAK} ${OPENSSL_PAK} ${PYTHON_PAK} ${RUBY_PAK}
725 CONFIGURE_COMMAND ""
726 BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/cleanup.cmake
727 INSTALL_COMMAND ""
728)
729
730##############################################################################
731##############################################################################
732#
733##############################################################################
734
735
736
737
738MESSAGE(STATUS "Directory to set with ZORBA_THIRD_PARTY_REQUIREMENTS: " ${CMAKE_CURRENT_BINARY_DIR})
739
740
741
0742
=== added file 'scripts/winports/cleanup.zip'
1Binary files scripts/winports/cleanup.zip 1970-01-01 00:00:00 +0000 and scripts/winports/cleanup.zip 2013-09-12 22:32:36 +0000 differ743Binary 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
=== added file 'scripts/winports/download.cmake'
--- scripts/winports/download.cmake 1970-01-01 00:00:00 +0000
+++ scripts/winports/download.cmake 2013-09-12 22:32:36 +0000
@@ -0,0 +1,45 @@
1##############################################################################
2##############################################################################
3# DOWNLOAD_EXTRACT
4##############################################################################
5# This function downloads a package from PACKAGE_URL
6# and verifies that PACKAGE_MD5 corresponds
7# then, if WITH_DIR is set to YES, it creates PACKAGE_NAME directory
8# and extract the content of the downloaded file in this directory
9# if WITH_DIR is set to NO, it extracts the file in CMAKE_CURRENT_BINARY_DIR directory
10#
11FUNCTION (DOWNLOAD_EXTRACT PACKAGE_NAME WITH_DIR PACKAGE_URL PACKAGE_MD5)
12 SET(FINAL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}\\${PACKAGE_NAME})
13 IF(EXISTS ${FINAL_DESTINATION})
14 MESSAGE(STATUS "Package ${PACKAGE_NAME} already in place: ${FINAL_DESTINATION}")
15 RETURN()
16 ENDIF(EXISTS ${FINAL_DESTINATION})
17
18 MESSAGE(STATUS "Setting up ${PACKAGE_NAME}")
19
20 SET(DOWNLOAD_PACKAGE YES)
21
22 IF(WITH_DIR)
23 FILE(MAKE_DIRECTORY ${FINAL_DESTINATION})
24 ELSE(WITH_DIR)
25 SET(FINAL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
26 ENDIF(WITH_DIR)
27
28 IF (EXISTS ${LIB_DOWNLOADS}\\${PACKAGE_NAME}.zip)
29 FILE(MD5 ${LIB_DOWNLOADS}\\${PACKAGE_NAME}.zip EXIST_MD5)
30 IF (${EXIST_MD5} STREQUAL ${PACKAGE_MD5})
31 MESSAGE(STATUS "${PACKAGE_NAME} already downloaded.")
32 SET(DOWNLOAD_PACKAGE NO)
33 ENDIF (${EXIST_MD5} STREQUAL ${PACKAGE_MD5})
34 ENDIF (EXISTS ${LIB_DOWNLOADS}\\${PACKAGE_NAME}.zip)
35
36 IF (DOWNLOAD_PACKAGE)
37 FILE(DOWNLOAD ${PACKAGE_URL} ${LIB_DOWNLOADS}\\${PACKAGE_NAME}.zip SHOW_PROGRESS EXPECTED_MD5 "${PACKAGE_MD5}" )
38 ENDIF (DOWNLOAD_PACKAGE)
39
40 MESSAGE(STATUS "Extracting ${PACKAGE_NAME}")
41 EXECUTE_PROCESS(
42 COMMAND ${CMAKE_COMMAND} -E tar xzf ${LIB_DOWNLOADS}\\${PACKAGE_NAME}.zip
43 WORKING_DIRECTORY ${FINAL_DESTINATION}
44 )
45ENDFUNCTION (DOWNLOAD_EXTRACT)
046
=== added directory 'scripts/winports/libiconv'
=== added file 'scripts/winports/libiconv/CMakeLists.txt'
--- scripts/winports/libiconv/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ scripts/winports/libiconv/CMakeLists.txt 2013-09-12 22:32:36 +0000
@@ -0,0 +1,31 @@
1CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
2PROJECT(libiconv)
3
4ADD_DEFINITIONS(-DLIBICONV_PLUG -DBUILDING_LIBICONV -DBUILDING_LIBCHARSET)
5SET(PATCH_COMMAND @PATCH_COMMAND@)
6
7CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libcharset/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/libcharset/config.h COPYONLY)
8CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libcharset/include/localcharset.h.build.in ${CMAKE_CURRENT_SOURCE_DIR}/libcharset/include/localcharset.h COPYONLY)
9CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/iconv.h.build.in ${CMAKE_CURRENT_SOURCE_DIR}/include/iconv.h COPYONLY)
10CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h COPYONLY)
11
12EXECUTE_PROCESS( COMMAND ${PATCH_COMMAND} config.h config.h.patch -R WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
13EXECUTE_PROCESS( COMMAND ${PATCH_COMMAND} lib/iconv.c iconv.c.patch -R WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
14EXECUTE_PROCESS( COMMAND ${PATCH_COMMAND} include/iconv.h iconv.h.patch -R WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
15EXECUTE_PROCESS( COMMAND ${PATCH_COMMAND} windows/libiconv.rc libiconv.rc.patch -R WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
16EXECUTE_PROCESS( COMMAND ${PATCH_COMMAND} libcharset/lib/localcharset.c localcharset.c.patch -R WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
17EXECUTE_PROCESS( COMMAND ${PATCH_COMMAND} libcharset/include/localcharset.h localcharset.h.patch -R WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
18
19INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libcharset)
20INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libcharset/include)
21INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
22INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lib)
23
24
25ADD_LIBRARY(iconv SHARED lib/iconv.c lib/relocatable.c libcharset/lib/localcharset.c windows/libiconv.rc)
26
27INSTALL(TARGETS iconv DESTINATION bin )
28INSTALL(TARGETS iconv DESTINATION lib )
29INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libcharset/include/localcharset.h DESTINATION include)
30INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/iconv.h DESTINATION include)
31
032
=== added file 'scripts/winports/libiconv/config.h.patch'
--- scripts/winports/libiconv/config.h.patch 1970-01-01 00:00:00 +0000
+++ scripts/winports/libiconv/config.h.patch 2013-09-12 22:32:36 +0000
@@ -0,0 +1,4 @@
130c30
2< //#undef EILSEQ
3---
4> #undef EILSEQ
05
=== added file 'scripts/winports/libiconv/iconv.c.patch'
--- scripts/winports/libiconv/iconv.c.patch 1970-01-01 00:00:00 +0000
+++ scripts/winports/libiconv/iconv.c.patch 2013-09-12 22:32:36 +0000
@@ -0,0 +1,4 @@
1247c247
2< const char* * inbuf, size_t *inbytesleft,
3---
4> ICONV_CONST char* * inbuf, size_t *inbytesleft,
05
=== added file 'scripts/winports/libiconv/iconv.h.patch'
--- scripts/winports/libiconv/iconv.h.patch 1970-01-01 00:00:00 +0000
+++ scripts/winports/libiconv/iconv.h.patch 2013-09-12 22:32:36 +0000
@@ -0,0 +1,34 @@
126,29c26,27
2< #if BUILDING_LIBICONV
3< #define LIBICONV_DLL_EXPORTED __declspec(dllexport)
4< #elif USING_STATIC_LIBICONV
5< #define LIBICONV_DLL_EXPORTED
6---
7> #if @HAVE_VISIBILITY@ && BUILDING_LIBICONV
8> #define LIBICONV_DLL_EXPORTED __attribute__((__visibility__("default")))
931c29
10< #define LIBICONV_DLL_EXPORTED __declspec(dllimport)
11---
12> #define LIBICONV_DLL_EXPORTED
1333c31
14< extern LIBICONV_DLL_EXPORTED int _libiconv_version; /* Likewise */
15---
16> extern LIBICONV_DLL_EXPORTED @DLL_VARIABLE@ int _libiconv_version; /* Likewise */
1791c89
18< extern LIBICONV_DLL_EXPORTED size_t iconv (iconv_t cd, const char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft);
19---
20> extern LIBICONV_DLL_EXPORTED size_t iconv (iconv_t cd, @ICONV_CONST@ char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft);
21109,110c107,108
22< #if USE_MBSTATE_T
23< #if BROKEN_WCHAR_H
24---
25> #if @USE_MBSTATE_T@
26> #if @BROKEN_WCHAR_H@
27130c128
28< #if USE_MBSTATE_T
29---
30> #if @USE_MBSTATE_T@
31177c175
32< #if HAVE_WCHAR_T
33---
34> #if @HAVE_WCHAR_T@
035
=== added file 'scripts/winports/libiconv/libiconv.rc.patch'
--- scripts/winports/libiconv/libiconv.rc.patch 1970-01-01 00:00:00 +0000
+++ scripts/winports/libiconv/libiconv.rc.patch 2013-09-12 22:32:36 +0000
@@ -0,0 +1,5 @@
12,5d1
2< #define PACKAGE_VERSION_MAJOR 1
3< #define PACKAGE_VERSION_MINOR 14
4< #define PACKAGE_VERSION_SUBMINOR 0
5< #define PACKAGE_VERSION_STRING "1.14"
06
=== added file 'scripts/winports/libiconv/localcharset.c.patch'
--- scripts/winports/libiconv/localcharset.c.patch 1970-01-01 00:00:00 +0000
+++ scripts/winports/libiconv/localcharset.c.patch 2013-09-12 22:32:36 +0000
@@ -0,0 +1,8 @@
177,79c77,79
2< //#ifndef LIBDIR
3< //# include "configmake.h"
4< //#endif
5---
6> #ifndef LIBDIR
7> # include "configmake.h"
8> #endif
09
=== added file 'scripts/winports/libiconv/localcharset.h.patch'
--- scripts/winports/libiconv/localcharset.h.patch 1970-01-01 00:00:00 +0000
+++ scripts/winports/libiconv/localcharset.h.patch 2013-09-12 22:32:36 +0000
@@ -0,0 +1,14 @@
123,26c23,24
2< #ifdef BUILDING_LIBCHARSET
3< #define LIBCHARSET_DLL_EXPORTED __declspec(dllexport)
4< #elif USING_STATIC_LIBICONV
5< #define LIBCHARSET_DLL_EXPORTED
6---
7> #if @HAVE_VISIBILITY@ && BUILDING_LIBCHARSET
8> #define LIBCHARSET_DLL_EXPORTED __attribute__((__visibility__("default")))
928c26
10< #define LIBCHARSET_DLL_EXPORTED __declspec(dllimport)
11---
12> #define LIBCHARSET_DLL_EXPORTED
1330a29
14>
015
=== added file 'scripts/winports/libiconv/move.cmake'
--- scripts/winports/libiconv/move.cmake 1970-01-01 00:00:00 +0000
+++ scripts/winports/libiconv/move.cmake 2013-09-12 22:32:36 +0000
@@ -0,0 +1,7 @@
1CONFIGURE_FILE(${CMAKELISTS_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt)
2CONFIGURE_FILE(${CMAKELISTS_DIR}/config.h.patch ${CMAKE_CURRENT_SOURCE_DIR}/config.h.patch COPYONLY)
3CONFIGURE_FILE(${CMAKELISTS_DIR}/iconv.c.patch ${CMAKE_CURRENT_SOURCE_DIR}/iconv.c.patch COPYONLY)
4CONFIGURE_FILE(${CMAKELISTS_DIR}/iconv.h.patch ${CMAKE_CURRENT_SOURCE_DIR}/iconv.h.patch COPYONLY)
5CONFIGURE_FILE(${CMAKELISTS_DIR}/libiconv.rc.patch ${CMAKE_CURRENT_SOURCE_DIR}/libiconv.rc.patch COPYONLY)
6CONFIGURE_FILE(${CMAKELISTS_DIR}/localcharset.c.patch ${CMAKE_CURRENT_SOURCE_DIR}/localcharset.c.patch COPYONLY)
7CONFIGURE_FILE(${CMAKELISTS_DIR}/localcharset.h.patch ${CMAKE_CURRENT_SOURCE_DIR}/localcharset.h.patch COPYONLY)
08
=== added directory 'scripts/winports/openssl'
=== added file 'scripts/winports/openssl/CMakeLists.txt'
--- scripts/winports/openssl/CMakeLists.txt 1970-01-01 00:00:00 +0000
+++ scripts/winports/openssl/CMakeLists.txt 2013-09-12 22:32:36 +0000
@@ -0,0 +1,170 @@
1CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
2INCLUDE(ExternalProject)
3
4##############################################################################
5##############################################################################
6# PREPARE OPENSSL
7##############################################################################
8##############################################################################
9
10SET (GNU_BIN ${CMAKE_CURRENT_BINARY_DIR}/bin)
11FILE(MAKE_DIRECTORY ${GNU_BIN})
12
13##############################################################################
14##############################################################################
15# GZIP
16##############################################################################
17#FILE(DOWNLOAD ${PACKAGE_URL} ${LIB_DOWNLOADS}\\${PACKAGE_NAME}.zip SHOW_PROGRESS EXPECTED_MD5 "${PACKAGE_MD5}" )
18SET(GZIP_PAK gzip-1.3.12-1)
19 EXTERNALPROJECT_ADD (
20 ${GZIP_PAK}
21 URL http://hivelocity.dl.sourceforge.net/project/gnuwin32/gzip/1.3.12-1/gzip-1.3.12-1-bin.zip
22 URL_MD5 b24802293f74ab11aaa5786f36c59819
23 PREFIX ${GZIP_PAK}
24 CONFIGURE_COMMAND ""
25 BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory
26 ${CMAKE_CURRENT_BINARY_DIR}/${GZIP_PAK}/src/${GZIP_PAK}/bin
27 ${GNU_BIN}
28 INSTALL_COMMAND ""
29)
30
31##############################################################################
32##############################################################################
33# ZIP
34##############################################################################
35SET(ZIP_PAK zip-3.0)
36EXTERNALPROJECT_ADD (
37 ${ZIP_PAK}
38 URL http://superb-dca3.dl.sourceforge.net/project/gnuwin32/zip/3.0/zip-3.0-bin.zip
39 URL_MD5 5b268fe06ce5f89bc5762805a7a9d7aa
40 DEPENDS ${GZIP_PAK}
41 PREFIX ${ZIP_PAK}
42 CONFIGURE_COMMAND ""
43 BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory
44 ${CMAKE_CURRENT_BINARY_DIR}/${ZIP_PAK}/src/${ZIP_PAK}/bin
45 ${GNU_BIN}
46 INSTALL_COMMAND ""
47)
48
49##############################################################################
50##############################################################################
51# BZIP2
52##############################################################################
53SET(BZIP2_PAK bzip2-1.0.5)
54EXTERNALPROJECT_ADD (
55 ${BZIP2_PAK}
56 URL http://hivelocity.dl.sourceforge.net/project/gnuwin32/bzip2/1.0.5/bzip2-1.0.5-bin.zip
57 URL_MD5 a1155c41b1954a2f6da1014c7c1a1263
58 DEPENDS ${ZIP_PAK}
59 PREFIX ${BZIP2_PAK}
60 CONFIGURE_COMMAND ""
61 BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory
62 ${CMAKE_CURRENT_BINARY_DIR}/${BZIP2_PAK}/src/${BZIP2_PAK}/bin
63 ${GNU_BIN}
64 INSTALL_COMMAND ""
65)
66
67##############################################################################
68##############################################################################
69# BSDTAR
70##############################################################################
71SET(BSDTAR_PAK libarchive-2.4.12-1)
72EXTERNALPROJECT_ADD (
73 ${BSDTAR_PAK}
74 URL http://iweb.dl.sourceforge.net/project/gnuwin32/libarchive/2.4.12-1/libarchive-2.4.12-1-bin.zip
75 URL_MD5 f2bd5a4ee39d9fc64b456d516f90afad
76 DEPENDS ${BZIP2_PAK}
77 PREFIX ${BSDTAR_PAK}
78 CONFIGURE_COMMAND ""
79 BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory
80 ${CMAKE_CURRENT_BINARY_DIR}/${BSDTAR_PAK}/src/${BSDTAR_PAK}/bin
81 ${GNU_BIN}
82 INSTALL_COMMAND ""
83)
84
85##############################################################################
86##############################################################################
87# TAR
88##############################################################################
89SET(TAR_PAK tar-1.13-1)
90EXTERNALPROJECT_ADD (
91 ${TAR_PAK}
92 URL http://iweb.dl.sourceforge.net/project/gnuwin32/tar/1.13-1/tar-1.13-1-bin.zip
93 URL_MD5 a92857ec82db569f0a8fa5370642dc69
94 DEPENDS ${BSDTAR_PAK}
95 PREFIX ${TAR_PAK}
96 CONFIGURE_COMMAND ""
97 BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory
98 ${CMAKE_CURRENT_BINARY_DIR}/${TAR_PAK}/src/${TAR_PAK}/bin
99 ${GNU_BIN}
100 INSTALL_COMMAND ""
101)
102
103##############################################################################
104##############################################################################
105# LIBINTL
106##############################################################################
107SET(LIBINTL_PAK libintl-0.11.5-2)
108EXTERNALPROJECT_ADD (
109 ${LIBINTL_PAK}
110 URL http://kent.dl.sourceforge.net/project/gnuwin32/libintl/0.11.5-2/libintl-0.11.5-2-bin.zip
111 URL_MD5 220c1168c34fe0f4f3ed50fa50b66942
112 DEPENDS ${TAR_PAK}
113 PREFIX ${LIBINTL_PAK}
114 CONFIGURE_COMMAND ""
115 BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory
116 ${CMAKE_CURRENT_BINARY_DIR}/${LIBINTL_PAK}/src/${LIBINTL_PAK}/bin
117 ${GNU_BIN}
118 INSTALL_COMMAND ""
119)
120##############################################################################
121##############################################################################
122# ZLIB
123##############################################################################
124SET(ZLIB_PAK zlib128-dll)
125EXTERNALPROJECT_ADD (
126 ${ZLIB_PAK}
127 URL http://softlayer-dal.dl.sourceforge.net/project/libpng/zlib/1.2.8/zlib128-dll.zip
128 URL_MD5 42eccc2af5bac6b7a1188d7817d03549
129 DEPENDS ${LIBINTL_PAK}
130 PREFIX ${ZLIB_PAK}
131 CONFIGURE_COMMAND ""
132 BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory
133 ${CMAKE_CURRENT_BINARY_DIR}/${ZLIB_PAK}/src/${ZLIB_PAK}
134 ${GNU_BIN}
135 INSTALL_COMMAND ""
136)
137
138
139##############################################################################
140##############################################################################
141# OPENSSL
142##############################################################################
143FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libopenssl_tar.cmake "
144 SET(ENV{PATH} \"\$ENV{PATH};${GNU_BIN}\")
145 FILE(DOWNLOAD http://www.openssl.org/source/openssl-1.0.1e.tar.gz ${CMAKE_CURRENT_BINARY_DIR}/openssl.tar.gz SHOW_PROGRESS)
146 EXECUTE_PROCESS( COMMAND bsdtar -xf openssl.tar.gz WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
147 MESSAGE(STATUS \"Re-extracting to avoid previous path errors.\")
148 EXECUTE_PROCESS( COMMAND bsdtar -xf openssl.tar.gz WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
149 MESSAGE(STATUS \"Compresing in a Zip file.\")
150 EXECUTE_PROCESS( COMMAND zip -rq openssl-1.0.1e.zip openssl-1.0.1e WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
151
152")
153
154
155SET(LIBOPENSSL_ZIP_PAK opensslzip)
156EXTERNALPROJECT_ADD (
157 ${LIBOPENSSL_ZIP_PAK}
158 # dummy file
159 URL http://kent.dl.sourceforge.net/project/gnuwin32/patch/2.5.9-7/patch-2.5.9-7-bin.zip
160 URL_MD5 b9c8b31d62f4b2e4f1887bbb63e8a905
161 DEPENDS ${ZLIB_PAK}
162 PREFIX ${LIBOPENSSL_ZIP_PAK}
163 CONFIGURE_COMMAND ""
164 BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/libopenssl_tar.cmake
165 INSTALL_COMMAND ${CMAKE_COMMAND} -E copy
166 ${CMAKE_CURRENT_BINARY_DIR}/openssl-1.0.1e.zip
167 ${CMAKE_CURRENT_BINARY_DIR}/../openssl-1.0.1e.zip
168)
169
170
0171
=== modified file 'src/compiler/parser/jsoniq_parser.cpp'
--- src/compiler/parser/jsoniq_parser.cpp 2013-09-12 08:50:38 +0000
+++ src/compiler/parser/jsoniq_parser.cpp 2013-09-12 22:32:36 +0000
@@ -29,7 +29,7 @@
29 29
30 This special exception was added by the Free Software Foundation in30 This special exception was added by the Free Software Foundation in
31 version 2.2 of Bison. */31 version 2.2 of Bison. */
3232#include "stdafx.h"
33// Take the name prefix into account.33// Take the name prefix into account.
34#define yylex zorbalex34#define yylex zorbalex
3535
3636
=== modified file 'src/compiler/parser/jsoniq_scanner.cpp'
--- src/compiler/parser/jsoniq_scanner.cpp 2013-09-11 15:56:29 +0000
+++ src/compiler/parser/jsoniq_scanner.cpp 2013-09-12 22:32:36 +0000
@@ -1,3 +1,4 @@
1#include "stdafx.h"
1#line 2 "jsoniq_scanner.yy.cpp"2#line 2 "jsoniq_scanner.yy.cpp"
23
3#line 4 "jsoniq_scanner.yy.cpp"4#line 4 "jsoniq_scanner.yy.cpp"
45
=== modified file 'src/runtime/hof/fn_hof_functions_impl.cpp'
--- src/runtime/hof/fn_hof_functions_impl.cpp 2013-07-02 21:32:23 +0000
+++ src/runtime/hof/fn_hof_functions_impl.cpp 2013-09-12 22:32:36 +0000
@@ -81,7 +81,7 @@
8181
82 try82 try
83 {83 {
84 arity = to_xs_unsignedLong(arityItem->getIntegerValue());84 arity = static_cast<csize>(to_xs_unsignedLong(arityItem->getIntegerValue()));
85 }85 }
86 catch ( std::range_error const& )86 catch ( std::range_error const& )
87 {87 {
8888
=== modified file 'src/runtime/uris/uris_impl.cpp'
--- src/runtime/uris/uris_impl.cpp 2013-06-11 23:38:49 +0000
+++ src/runtime/uris/uris_impl.cpp 2013-09-12 22:32:36 +0000
@@ -223,7 +223,7 @@
223223
224 GENV_ITEMFACTORY->createJSONObject(result, lNames, lValues);224 GENV_ITEMFACTORY->createJSONObject(result, lNames, lValues);
225225
226 STACK_PUSH(result, state );226 STACK_PUSH(!!result, state );
227227
228 STACK_END (state);228 STACK_END (state);
229}229}
230230
=== modified file 'test/unit/external_function.cpp'
--- test/unit/external_function.cpp 2013-05-28 00:58:27 +0000
+++ test/unit/external_function.cpp 2013-09-12 22:32:36 +0000
@@ -209,7 +209,7 @@
209 // evaluate the function and check if it was really called209 // evaluate the function and check if it was really called
210 std::cout << lQuery << std::endl;210 std::cout << lQuery << std::endl;
211 if (!lCalled) {211 if (!lCalled) {
212 return 2;212 return true;
213 }213 }
214 }214 }
215215

Subscribers

People subscribed via source and target branches