Zorba

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

  1. bug1151967
  2. Merge into trunk
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

Reply
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

Reply
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

Reply
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

Reply
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
Reply
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.

Reply
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
Reply

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
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+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0)
7+INCLUDE(ExternalProject)
8+PROJECT(winports)
9+
10+SET(SCRIPTS_DIR "scripts")
11+FILE(MAKE_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}")
12+##############################################################################
13+##############################################################################
14+# PATCH
15+##############################################################################
16+SET(PATCH_PAK patch-2.5.9)
17+EXTERNALPROJECT_ADD (
18+ ${PATCH_PAK}
19+ URL http://kent.dl.sourceforge.net/project/gnuwin32/patch/2.5.9-7/patch-2.5.9-7-bin.zip
20+ URL_MD5 b9c8b31d62f4b2e4f1887bbb63e8a905
21+ PREFIX ${PATCH_PAK}
22+ #DEPENDS ${LIBXML2_PAK}
23+ PATCH_COMMAND ""
24+ CONFIGURE_COMMAND ""
25+ BUILD_COMMAND ""
26+ INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
27+ ${CMAKE_CURRENT_BINARY_DIR}/${PATCH_PAK}/src/${PATCH_PAK}/bin
28+ ${CMAKE_CURRENT_BINARY_DIR}/${PATCH_PAK}/bin
29+)
30+SET(PATCH_EXE ${CMAKE_CURRENT_BINARY_DIR}/${PATCH_PAK}/bin/patch.exe)
31+
32+##############################################################################
33+##############################################################################
34+# GRAPHVIZ
35+##############################################################################
36+SET(GRAPHVIZ_PAK graphviz-2.30.1)
37+EXTERNALPROJECT_ADD (
38+ ${GRAPHVIZ_PAK}
39+ URL http://www.graphviz.org/pub/graphviz/stable/windows/graphviz-2.30.1.zip
40+ URL_MD5 4a28bddcdfd00f8d1afffd91ee098172
41+ PREFIX ${GRAPHVIZ_PAK}
42+ PATCH_COMMAND ""
43+ CONFIGURE_COMMAND ""
44+ BUILD_COMMAND ""
45+ INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
46+ ${CMAKE_CURRENT_BINARY_DIR}/${GRAPHVIZ_PAK}/src/${GRAPHVIZ_PAK}
47+ ${CMAKE_CURRENT_BINARY_DIR}/${GRAPHVIZ_PAK}
48+)
49+
50+#############################################################################
51+##############################################################################
52+# GEOS
53+##############################################################################
54+SET(GEOS_PAK geos-3.3.8)
55+#LIBGEOS PATCH FILE
56+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos.patch "
57+90a91,93
58+> !ELSEIF \"$(_NMAKE_VER)\" == \"11.00.60315.1\"
59+> GEOS_MSVC = 11.0
60+> GEOS_MSC = 1700
61+")
62+#PATCH FILE
63+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_patch.cmake "
64+ EXECUTE_PROCESS(COMMAND ${PATCH_EXE} nmake.opt ${CMAKE_CURRENT_BINARY_DIR}/libgeos.patch -f
65+ WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" )
66+")
67+
68+#CONFIGURE FILE
69+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_configure.cmake "
70+ EXECUTE_PROCESS(
71+ COMMAND autogen.bat
72+ WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\"
73+ )
74+")
75+#BUILD FILE
76+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_build.cmake "
77+ SET(ENV{INCLUDE} \"\$ENV{INCLUDE};C:\\\\Program Files (x86)\\\\Microsoft SDKs\\\\Windows\\\\v7.1A\\\\Include\")
78+ SET(ENV{INCLUDE} \"\$ENV{INCLUDE};C:\\\\Program Files (x86)\\\\Microsoft SDKs\\\\Windows\\\\v7.0A\\\\Include\")
79+ EXECUTE_PROCESS(
80+ COMMAND nmake /f makefile.vc MSVC_VER=1700
81+ WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\"
82+ )
83+")
84+#INSTALL FILE
85+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_install.cmake "
86+ FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/bin)
87+ FILE(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/lib)
88+ EXECUTE_PROCESS(
89+ 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+ WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" )
91+ EXECUTE_PROCESS(
92+ 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+ WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" )
94+ EXECUTE_PROCESS(
95+ 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+ WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" )
97+ EXECUTE_PROCESS(
98+ 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+ WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" )
100+ EXECUTE_PROCESS(
101+ 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+ WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" )
103+ EXECUTE_PROCESS(
104+ COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}/include ${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/include
105+ WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${GEOS_PAK}/src/${GEOS_PAK}\" )
106+")
107+EXTERNALPROJECT_ADD (
108+ ${GEOS_PAK}
109+ URL http://download.osgeo.org/geos/geos-3.3.8.tar.bz2
110+ URL_MD5 75be476d0831a2d14958fed76ca266de
111+ PREFIX ${GEOS_PAK}
112+ DEPENDS ${PATCH_PAK}
113+ PATCH_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_patch.cmake
114+ CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_configure.cmake
115+ BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_build.cmake
116+ INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libgeos_install.cmake
117+)
118+
119+##############################################################################
120+##############################################################################
121+# DOXYGEN
122+##############################################################################
123+SET(DOXYGEN_PAK doxygen-1.8.4)
124+EXTERNALPROJECT_ADD (
125+ ${DOXYGEN_PAK}
126+ #URL http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.4.windows.x64.bin.zip
127+ #URL_MD5 bcbb2140bba22a95cd915ba19340851a
128+
129+ URL http://ftp.stack.nl/pub/users/dimitri/doxygen-1.8.4.windows.bin.zip
130+ URL_MD5 af35822049dac03e5ed96aaa672f9dc2
131+ PREFIX ${DOXYGEN_PAK}
132+ PATCH_COMMAND ""
133+ CONFIGURE_COMMAND ""
134+ BUILD_COMMAND ""
135+ INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
136+ ${CMAKE_CURRENT_BINARY_DIR}/${DOXYGEN_PAK}/src/${DOXYGEN_PAK}
137+ ${CMAKE_CURRENT_BINARY_DIR}/${DOXYGEN_PAK}
138+)
139+
140+##############################################################################
141+##############################################################################
142+# TIDY
143+##############################################################################
144+#PATCH FILE
145+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_patch.cmake "
146+ FILE(GLOB TIDY_PROJECT \"${CMAKE_CURRENT_BINARY_DIR}/tidy/src/tidy/build/msvc/*.*\")
147+ FOREACH(TIDY_FILE \${TIDY_PROJECT})
148+ FILE(READ \${TIDY_FILE} FILE_TO_CHANGE)
149+ STRING(REPLACE \"\\n\" \"\\n\" FILE_TO_CHANGE \"\${FILE_TO_CHANGE}\")
150+ FILE(WRITE \${TIDY_FILE} \${FILE_TO_CHANGE})
151+ ENDFOREACH()
152+")
153+#CONFIGURE FILE
154+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_configure.cmake "
155+ EXECUTE_PROCESS(
156+ COMMAND devenv tidy.dsw /Upgrade
157+ WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/tidy/src/tidy/build/msvc/\"
158+ )
159+")
160+#BUILD FILE
161+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_build.cmake "
162+ EXECUTE_PROCESS(
163+ COMMAND devenv tidy.sln /Build \"Release|Win32\"
164+ WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/tidy/src/tidy/build/msvc/\"
165+ )
166+")
167+#INSTALL FILE
168+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_install.cmake "
169+ EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E copy
170+ ${CMAKE_CURRENT_BINARY_DIR}/tidy/src/tidy/build/msvc/Release/tidy.exe
171+ ${CMAKE_CURRENT_BINARY_DIR}/tidy/tidy.exe
172+ WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\" )
173+ EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E copy
174+ ${CMAKE_CURRENT_BINARY_DIR}/tidy/src/tidy/build/msvc/ReleaseDLL/libtidy.dll
175+ ${CMAKE_CURRENT_BINARY_DIR}/tidy/libtidy.dll
176+ WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\" )
177+ EXECUTE_PROCESS( COMMAND ${CMAKE_COMMAND} -E copy
178+ ${CMAKE_CURRENT_BINARY_DIR}/tidy/src/tidy/build/msvc/ReleaseDLL/libtidy.lib
179+ ${CMAKE_CURRENT_BINARY_DIR}/tidy/libtidy.lib
180+ WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}\" )
181+")
182+EXTERNALPROJECT_ADD (
183+ tidy
184+ URL http://tidy.cvs.sourceforge.net/viewvc/tidy/tidy/?view=tar
185+
186+ PREFIX tidy
187+ PATCH_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_patch.cmake
188+ CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_configure.cmake
189+ BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_build.cmake
190+ INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libtidy_install.cmake
191+)
192+
193+##############################################################################
194+##############################################################################
195+# ZLIB
196+##############################################################################
197+SET(ZLIB1_PAK zlib-1.2.8)
198+EXTERNALPROJECT_ADD(
199+ ${ZLIB1_PAK}
200+ URL http://zlib.net/zlib128-dll.zip
201+ PREFIX ${ZLIB1_PAK}
202+ URL_MD5 42eccc2af5bac6b7a1188d7817d03549
203+ PATCH_COMMAND ""
204+ CONFIGURE_COMMAND ""
205+ BUILD_COMMAND ""
206+ INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
207+ ${CMAKE_CURRENT_BINARY_DIR}/${ZLIB1_PAK}/src/${ZLIB1_PAK}
208+ ${CMAKE_CURRENT_BINARY_DIR}/${ZLIB1_PAK}
209+)
210+
211+##############################################################################
212+##############################################################################
213+# PERL
214+##############################################################################
215+SET(PERL_PAK perl-5.16.3.1)
216+EXTERNALPROJECT_ADD(
217+ ${PERL_PAK}
218+ URL http://strawberryperl.com/download/5.16.3.1/strawberry-perl-5.16.3.1-32bit-portable.zip
219+ URL_MD5 8f3ef667e9a2b7fc402610da29bb8074
220+ PREFIX ${PERL_PAK}
221+ #SOURCE_DIR ${CMAKE_CURRENT_BINARY_DIR}/perl-5.16.3.1
222+ PATCH_COMMAND ""
223+ CONFIGURE_COMMAND ""
224+ BUILD_COMMAND ""
225+ INSTALL_COMMAND ""
226+)
227+SET(PERL_PATH ${CMAKE_CURRENT_BINARY_DIR}/${PERL_PAK}/src/${PERL_PAK}/perl/bin/)
228+
229+##############################################################################
230+##############################################################################
231+# OPENSSL
232+##############################################################################
233+SET(OPENSSL_PAK openssl-1.0.1e)
234+#Patch for linux archiver
235+ADD_SUBDIRECTORY(openssl)
236+
237+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libopenssl_configure.cmake "
238+
239+ SET(ENV{PATH} \"\$ENV{PATH};${PERL_PATH}\")
240+
241+ EXECUTE_PROCESS(
242+ COMMAND perl
243+ Configure enable-camellia
244+ --openssldir=${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK}
245+ VC-WIN32
246+ WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK}/src/${OPENSSL_PAK}\"
247+ )
248+
249+ EXECUTE_PROCESS(
250+ COMMAND \"${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK}/src/${OPENSSL_PAK}/ms/do_nt.bat\"
251+ WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK}/src/${OPENSSL_PAK}\"
252+ )
253+")
254+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libopenssl_nmake.cmake "
255+ SET(ENV{PATH} \"\$ENV{PATH};${PERL_PATH}\")
256+ EXECUTE_PROCESS(
257+ COMMAND nmake /f ms/ntdll.mak
258+ WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK}/src/${OPENSSL_PAK}\"
259+ )
260+")
261+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libopenssl_install.cmake "
262+ SET(ENV{PATH} \"\$ENV{PATH};${PERL_PATH}\")
263+ EXECUTE_PROCESS(
264+ COMMAND nmake /f ms/ntdll.mak install
265+ WORKING_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK}/src/${OPENSSL_PAK}\"
266+ )
267+")
268+
269+
270+EXTERNALPROJECT_ADD(
271+ ${OPENSSL_PAK}
272+ #fixed file
273+ URL file://${CMAKE_CURRENT_BINARY_DIR}/openssl-1.0.1e.zip
274+ DEPENDS opensslzip ${PERL_PAK}
275+ PREFIX ${OPENSSL_PAK}
276+ CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libopenssl_configure.cmake
277+ BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libopenssl_nmake.cmake
278+ INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libopenssl_install.cmake
279+)
280+SET(OPENSSL_ROOT ${CMAKE_CURRENT_BINARY_DIR}/${OPENSSL_PAK})
281+
282+
283+##############################################################################
284+##############################################################################
285+# LIBCURL
286+##############################################################################
287+SET(LIBCURL_PAK libcurl-7.29.0)
288+EXTERNALPROJECT_ADD(
289+ ${LIBCURL_PAK}
290+ URL http://curl.haxx.se/download/curl-7.29.0.tar.gz
291+ URL_MD5 4f57d3b4a3963038bd5e04dbff385390
292+ PREFIX ${LIBCURL_PAK}
293+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/${LIBCURL_PAK}
294+ -DBUILD_CURL_EXE=ON -DBUILD_CURL_TESTS=OFF
295+ -DCMAKE_USE_OPENSSL=ON -DOPENSSL_ROOT_DIR=${OPENSSL_ROOT}
296+ -DCURL_ZLIB=ON
297+ -DHTTP_ONLY=OFF
298+ -DCMAKE_BUILD_TYPE=RELEASE
299+)
300+
301+##############################################################################
302+##############################################################################
303+# LIBICONV
304+##############################################################################
305+SET(LIBICONV_PAK libiconv-1.14)
306+EXTERNALPROJECT_ADD(
307+ ${LIBICONV_PAK}
308+ DEPENDS ${PATCH_PAK}
309+ URL http://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.14.tar.gz
310+ URL_MD5 e34509b1623cec449dfeb73d7ce9c6c6
311+ PREFIX ${LIBICONV_PAK}
312+ CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/${LIBICONV_PAK} -DCMAKE_BUILD_TYPE=RELEASE
313+ 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+)
315+
316+##############################################################################
317+##############################################################################
318+# LIBXML2
319+##############################################################################
320+SET(LIBXML2_PAK libxml2-2.9.1)
321+SET(LIBXML2_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${LIBXML2_PAK}/src/${LIBXML2_PAK}/win32)
322+#CONFIGURE FILE
323+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxml2_configure.cmake "
324+ EXECUTE_PROCESS(
325+ COMMAND assoc .js=JSFile
326+ )
327+ EXECUTE_PROCESS(
328+ COMMAND cscript configure.js compiler=msvc
329+ prefix=..\\\\..\\\\..
330+ iconv=no
331+ zlib=yes
332+ include=${CMAKE_CURRENT_BINARY_DIR}/${ZLIB1_PAK}/include
333+ lib=${CMAKE_CURRENT_BINARY_DIR}/${ZLIB1_PAK}/lib
334+ WORKING_DIRECTORY \"${LIBXML2_WIN32_DIR}\"
335+ )"
336+)
337+#MAKE FILE
338+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxml2_nmake.cmake "
339+ EXECUTE_PROCESS(
340+ COMMAND nmake /f Makefile.msvc
341+ WORKING_DIRECTORY \"${LIBXML2_WIN32_DIR}\"
342+ )"
343+)
344+#MAKE INSTALL FILE
345+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxml2_nmake_install.cmake "
346+ EXECUTE_PROCESS(
347+ COMMAND nmake /f Makefile.msvc install
348+ WORKING_DIRECTORY \"${LIBXML2_WIN32_DIR}\"
349+ )"
350+)
351+#CONFIGURE, MAKE AND INSTALL
352+EXTERNALPROJECT_ADD(
353+ ${LIBXML2_PAK}
354+ URL ftp://xmlsoft.org/libxml2/libxml2-2.9.1.tar.gz
355+ URL_MD5 9c0cfef285d5c4a5c80d00904ddab380
356+ PREFIX ${LIBXML2_PAK}
357+ DEPENDS ${ZLIB1_PAK} ${LIBICONV_PAK}
358+ CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxml2_configure.cmake
359+ BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxml2_nmake.cmake
360+ INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxml2_nmake_install.cmake
361+)
362+
363+
364+##############################################################################
365+##############################################################################
366+# LIBXSLT
367+##############################################################################
368+SET(LIBXSLT_PAK libxslt-1.1.28)
369+SET(LIBXSLT_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${LIBXSLT_PAK}/src/${LIBXSLT_PAK}/win32)
370+#CONFIGURE FILE
371+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_configure.cmake "
372+ EXECUTE_PROCESS(
373+ COMMAND cscript configure.js compiler=msvc
374+ prefix=..\\\\..\\\\..
375+ iconv=no
376+ zlib=yes
377+ xslt_debug=no
378+ include=${CMAKE_CURRENT_BINARY_DIR}/${LIBXML2_PAK}/include/libxml2
379+ lib=${CMAKE_CURRENT_BINARY_DIR}/${LIBXML2_PAK}/lib
380+ WORKING_DIRECTORY \"${LIBXSLT_WIN32_DIR}\"
381+ ) "
382+)
383+#MAKE FILE
384+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_nmake.cmake "
385+ EXECUTE_PROCESS(
386+ COMMAND nmake /f Makefile.msvc
387+ WORKING_DIRECTORY \"${LIBXSLT_WIN32_DIR}\"
388+ ) "
389+)
390+#MAKE INSTALL FILE
391+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_nmake_install.cmake "
392+ EXECUTE_PROCESS(
393+ COMMAND nmake /f Makefile.msvc install
394+ WORKING_DIRECTORY \"${LIBXSLT_WIN32_DIR}\"
395+ ) "
396+)
397+#MAKE PATCH FILE
398+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_patch.cmake
399+"
400+ FILE(READ \"${LIBXSLT_WIN32_DIR}/Makefile.msvc\" LIBXSLT_MAKEFILE)
401+ STRING(REPLACE \"LDFLAGS = $(LDFLAGS) /OPT:NOWIN98\" \"#LDFLAGS = $(LDFLAGS) /OPT:NOWIN98\" LIBXSLT_MAKEFILE \"\${LIBXSLT_MAKEFILE}\")
402+ FILE(WRITE \"${LIBXSLT_WIN32_DIR}/Makefile.msvc\" \${LIBXSLT_MAKEFILE})
403+"
404+)
405+#CONFIGURE, MAKE AND INSTALL
406+EXTERNALPROJECT_ADD (
407+ ${LIBXSLT_PAK}
408+ URL ftp://xmlsoft.org/libxslt/libxslt-1.1.28.tar.gz
409+ URL_MD5 9667bf6f9310b957254fdcf6596600b7
410+ PREFIX ${LIBXSLT_PAK}
411+ DEPENDS ${LIBXML2_PAK}
412+ PATCH_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_patch.cmake
413+ CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_configure.cmake
414+ BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_nmake.cmake
415+ INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libxslt_nmake_install.cmake
416+)
417+
418+##############################################################################
419+##############################################################################
420+# ICU
421+##############################################################################
422+SET(LIBICU_PAK icu4c-4_8_1_1)
423+SET(LIBICU_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${LIBICU_PAK}/src/${LIBICU_PAK}/source/allinone)
424+SET(LIBICU_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${LIBICU_PAK} )
425+SET(LIBICU_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${LIBICU_PAK}/src/${LIBICU_PAK} )
426+#CONFIGURE FILE
427+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libicu_configure.cmake "
428+ EXECUTE_PROCESS(
429+ COMMAND devenv /upgrade allinone.sln
430+ WORKING_DIRECTORY \"${LIBICU_WIN32_DIR}\"
431+ ) "
432+)
433+#BUILD FILE
434+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libicu_build.cmake "
435+ EXECUTE_PROCESS(
436+ COMMAND devenv allinone.sln /build \"Release|Win32\"
437+ WORKING_DIRECTORY \"${LIBICU_WIN32_DIR}\"
438+ ) "
439+)
440+#INSTALL FILE
441+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libicu_install.cmake "
442+ EXECUTE_PROCESS (
443+ COMMAND ${CMAKE_COMMAND} -E copy_directory \"${LIBICU_BUILD_DIR}/bin\" \"${LIBICU_INSTALL_DIR}/bin\"
444+ WORKING_DIRECTORY \"${LIBICU_INSTALL_DIR}/bin\"
445+ )
446+ EXECUTE_PROCESS (
447+ COMMAND ${CMAKE_COMMAND} -E copy_directory \"${LIBICU_BUILD_DIR}/include\" \"${LIBICU_INSTALL_DIR}/include\"
448+ WORKING_DIRECTORY \"${LIBICU_INSTALL_DIR}/include\"
449+ )
450+ EXECUTE_PROCESS (
451+ COMMAND ${CMAKE_COMMAND} -E copy_directory \"${LIBICU_BUILD_DIR}/lib\" \"${LIBICU_INSTALL_DIR}/lib\"
452+ WORKING_DIRECTORY \"${LIBICU_INSTALL_DIR}/lib\"
453+ ) "
454+)
455+#CONFIGURE, MAKE AND INSTALL
456+EXTERNALPROJECT_ADD (
457+ ${LIBICU_PAK}
458+ #ICU 5.1
459+ #URL http://download.icu-project.org/files/icu4c/51.1/icu4c-51_1-src.zip
460+ #URL_MD5 b4303a43caa79018e3b6ec18148fdb1a
461+ #ICU 4.8
462+ URL http://download.icu-project.org/files/icu4c/4.8.1.1/icu4c-4_8_1_1-src.zip
463+ URL_MD5 890862544bdb9012f5758bd76e82c2b4
464+ PREFIX ${LIBICU_PAK}
465+ CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libicu_configure.cmake
466+ BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libicu_build.cmake
467+ INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libicu_install.cmake
468+)
469+
470+##############################################################################
471+##############################################################################
472+# XERCES
473+##############################################################################
474+SET(XERCES_PAK xerces-c-3.1.1)
475+SET(XERCES_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${XERCES_PAK}/src/${XERCES_PAK}/projects/Win32/VC10/xerces-all)
476+SET(XERCES_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${XERCES_PAK} )
477+SET(XERCES_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${XERCES_PAK}/src/${XERCES_PAK} )
478+#CONFIGURE FILE
479+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libXERCES_configure.cmake "
480+ EXECUTE_PROCESS(
481+ COMMAND devenv /upgrade xerces-all.sln
482+ WORKING_DIRECTORY \"${XERCES_WIN32_DIR}\"
483+ ) "
484+)
485+#BUILD FILE
486+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libXERCES_build.cmake "
487+ EXECUTE_PROCESS(
488+ COMMAND devenv xerces-all.sln /build \"Release|Win32\"
489+ WORKING_DIRECTORY \"${XERCES_WIN32_DIR}\"
490+ ) "
491+)
492+#INSTALL FILE
493+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libXERCES_install.cmake
494+"
495+ FILE(MAKE_DIRECTORY \"${XERCES_INSTALL_DIR}/lib\")
496+ EXECUTE_PROCESS (
497+ COMMAND ${CMAKE_COMMAND} -E copy_directory \"${XERCES_BUILD_DIR}/src\" \"${XERCES_INSTALL_DIR}/include\"
498+ WORKING_DIRECTORY \"${XERCES_INSTALL_DIR}\"
499+ )
500+ EXECUTE_PROCESS (
501+ COMMAND ${CMAKE_COMMAND} -E copy_directory \"${XERCES_BUILD_DIR}/Build/Win32/VC10/Release\" \"${XERCES_INSTALL_DIR}/bin\"
502+ WORKING_DIRECTORY \"${XERCES_INSTALL_DIR}\"
503+ )
504+ EXECUTE_PROCESS (
505+ 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+ WORKING_DIRECTORY \"${XERCES_INSTALL_DIR}\"
507+ )
508+ FILE(GLOB_RECURSE XERCES_CPP_FILES \"${XERCES_INSTALL_DIR}/include/*.cpp\")
509+ FOREACH(XERCES_CPP IN ITEMS \${XERCES_CPP_FILES})
510+ FILE(REMOVE \${XERCES_CPP})
511+ ENDFOREACH()
512+
513+")
514+#CONFIGURE, MAKE AND INSTALL
515+EXTERNALPROJECT_ADD (
516+ ${XERCES_PAK}
517+ URL http://www.apache.org/dist/xerces/c/3/sources/xerces-c-3.1.1.zip
518+ URL_MD5 a42e0a35b8be37667bb7df6fb51feded
519+ PREFIX ${XERCES_PAK}
520+ #DEPENDS ${LIBXML2_PAK}
521+ #PATCH_COMMAND echo %cd%
522+ CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libXERCES_configure.cmake
523+ BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libXERCES_build.cmake
524+ INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/libXERCES_install.cmake
525+)
526+
527+##############################################################################
528+##############################################################################
529+# SWIG 2.0.10
530+##############################################################################
531+SET(SWIG_PAK swigwin-2.0.10)
532+EXTERNALPROJECT_ADD(
533+ ${SWIG_PAK}
534+ URL http://hivelocity.dl.sourceforge.net/project/swig/swigwin/swigwin-2.0.10/swigwin-2.0.10.zip
535+ URL_MD5 d41d8cd98f00b204e9800998ecf8427e
536+ PREFIX ${SWIG_PAK}
537+ PATCH_COMMAND ""
538+ CONFIGURE_COMMAND ""
539+ BUILD_COMMAND ""
540+ INSTALL_COMMAND ${CMAKE_COMMAND} -E copy_directory
541+ ${CMAKE_CURRENT_BINARY_DIR}/${SWIG_PAK}/src/${SWIG_PAK}
542+ ${CMAKE_CURRENT_BINARY_DIR}/${SWIG_PAK}
543+)
544+
545+##############################################################################
546+##############################################################################
547+# PYTHON 2.7.5
548+##############################################################################
549+SET(PYTHON_PAK python-2.7.5)
550+SET(PYTHON_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PCBuild)
551+#CONFIGURE FILE
552+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/python_configure.cmake "
553+ EXECUTE_PROCESS(
554+ COMMAND devenv /upgrade pcbuild.sln
555+ WORKING_DIRECTORY \"${PYTHON_WIN32_DIR}\"
556+ )
557+")
558+#BUILD FILE
559+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/python_build.cmake "
560+ EXECUTE_PROCESS(
561+ COMMAND devenv pcbuild.sln /build \"Debug|Win32\"
562+ WORKING_DIRECTORY \"${PYTHON_WIN32_DIR}\"
563+ )
564+ EXECUTE_PROCESS(
565+ COMMAND devenv pcbuild.sln /build \"Release|Win32\"
566+ WORKING_DIRECTORY \"${PYTHON_WIN32_DIR}\"
567+ )
568+")
569+#INSTALL FILE
570+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/python_install.cmake "
571+ FILE(RENAME ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/Doc
572+ ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/Doc )
573+ FILE(RENAME ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/Lib
574+ ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/Lib )
575+ FILE(RENAME ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/Tools
576+ ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/Tools )
577+ FILE(RENAME ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/Include
578+ ${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/Include )
579+
580+ #all .h
581+ FILE(GLOB PYTHON_FILES
582+ \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PC/*.h\")
583+ FOREACH(PYTHON_FILE \${PYTHON_FILES})
584+ CONFIGURE_FILE(\${PYTHON_FILE} \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/Include\" COPYONLY)
585+ ENDFOREACH()
586+
587+ #all dlls
588+ FILE(MAKE_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/DLLs\")
589+ FILE(GLOB PYTHON_FILES
590+ \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PCBuild/*.pyd\"
591+ \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PCBuild/*.dll\")
592+ FOREACH(PYTHON_FILE \${PYTHON_FILES})
593+ CONFIGURE_FILE(\${PYTHON_FILE} \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/DLLs\" COPYONLY)
594+ ENDFOREACH()
595+
596+ #exe and dlls
597+ FILE(GLOB PYTHON_FILES
598+ \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PCBuild/*.exe\"
599+ \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PCBuild/*.dll\")
600+ FOREACH(PYTHON_FILE \${PYTHON_FILES})
601+ CONFIGURE_FILE(\${PYTHON_FILE} \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}\" COPYONLY)
602+ ENDFOREACH()
603+
604+ # libs
605+ FILE(MAKE_DIRECTORY \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/libs\")
606+ FILE(GLOB PYTHON_FILES
607+ \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/src/${PYTHON_PAK}/PCBuild/*.lib\")
608+ FOREACH(PYTHON_FILE \${PYTHON_FILES})
609+ CONFIGURE_FILE(\${PYTHON_FILE} \"${CMAKE_CURRENT_BINARY_DIR}/${PYTHON_PAK}/libs\" COPYONLY)
610+ ENDFOREACH()
611+")
612+
613+EXTERNALPROJECT_ADD(
614+ ${PYTHON_PAK}
615+ URL http://www.python.org/ftp/python/2.7.5/Python-2.7.5.tgz
616+ URL_MD5 b4f01a1d0ba0b46b05c73b2ac909b1df
617+ PREFIX ${PYTHON_PAK}
618+ PATCH_COMMAND ""
619+ CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/python_configure.cmake
620+ BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/python_build.cmake
621+ INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/python_install.cmake
622+)
623+
624+##############################################################################
625+##############################################################################
626+# RUBY 2.0.0
627+##############################################################################
628+SET(RUBY_PAK ruby-2.0.0)
629+SET(RUBY_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${RUBY_PAK}/src/${RUBY_PAK}/Win32)
630+SET(RUBY_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${RUBY_PAK} )
631+SET(RUBY_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${RUBY_PAK}/build )
632+FILE(MAKE_DIRECTORY ${RUBY_BUILD_DIR})
633+#CONFIGURE FILE
634+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/ruby_configure.cmake "
635+ EXECUTE_PROCESS(
636+ COMMAND \"${RUBY_WIN32_DIR}/configure.bat --prefix=\\\"\\\"\"
637+ WORKING_DIRECTORY \"${RUBY_BUILD_DIR}\"
638+ )
639+")
640+#BUILD FILE
641+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/ruby_build.cmake "
642+ EXECUTE_PROCESS(
643+ COMMAND nmake
644+ WORKING_DIRECTORY \"${RUBY_BUILD_DIR}\"
645+ )
646+")
647+#INSTALL FILE
648+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/ruby_install.cmake "
649+ EXECUTE_PROCESS(
650+ COMMAND nmake DESTDIR=${RUBY_INSTALL_DIR} install
651+ WORKING_DIRECTORY \"${RUBY_BUILD_DIR}\"
652+ )
653+")
654+
655+EXTERNALPROJECT_ADD(
656+ ${RUBY_PAK}
657+ URL http://cache.ruby-lang.org/pub/ruby/2.0/ruby-2.0.0-p247.tar.gz
658+ URL_MD5 c351450a0bed670e0f5ca07da3458a5b
659+ PREFIX ${RUBY_PAK}
660+ PATCH_COMMAND ""
661+ CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/ruby_configure.cmake
662+ BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/ruby_build.cmake
663+ INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/ruby_install.cmake
664+)
665+
666+##############################################################################
667+##############################################################################
668+# PHP 5.5
669+##############################################################################
670+SET(PHP_PAK php-5.5)
671+SET(PHP_WIN32_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PHP_PAK}/src/${PHP_PAK}/Win32)
672+SET(PHP_INSTALL_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PHP_PAK} )
673+SET(PHP_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/${PHP_PAK}/build )
674+
675+FILE(MAKE_DIRECTORY ${PHP_BUILD_DIR})
676+#CONFIGURE FILE
677+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/php_configure.cmake "
678+ EXECUTE_PROCESS(
679+ COMMAND \"${PHP_WIN32_DIR}/configure.bat\"
680+ WORKING_DIRECTORY \"${PHP_BUILD_DIR}\"
681+ )
682+")
683+#BUILD FILE
684+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/php_build.cmake "
685+ EXECUTE_PROCESS(
686+ COMMAND nmake
687+ WORKING_DIRECTORY \"${PHP_BUILD_DIR}\"
688+ )
689+")
690+#INSTALL FILE
691+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/php_install.cmake "
692+ EXECUTE_PROCESS(
693+ COMMAND nmake DESTDIR=${PHP_INSTALL_DIR} install
694+ WORKING_DIRECTORY \"${PHP_BUILD_DIR}\"
695+ )
696+ FILE(RENAME ${PHP_INSTALL_DIR}/usr/bin ${PHP_INSTALL_DIR}/bin)
697+ FILE(RENAME ${PHP_INSTALL_DIR}/usr/include ${PHP_INSTALL_DIR}/include)
698+ FILE(RENAME ${PHP_INSTALL_DIR}/usr/lib ${PHP_INSTALL_DIR}/lib)
699+ FILE(RENAME ${PHP_INSTALL_DIR}/usr/share ${PHP_INSTALL_DIR}/share)
700+")
701+
702+EXTERNALPROJECT_ADD(
703+ ${PHP_PAK}
704+ URL http://cache.php-lang.org/pub/php/2.0/php-2.0.0-p247.tar.gz
705+ URL_MD5 c351450a0bed670e0f5ca07da3458a5b
706+ PREFIX ${PHP_PAK}
707+ PATCH_COMMAND ""
708+ CONFIGURE_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/php_configure.cmake
709+ BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/php_build.cmake
710+ INSTALL_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/php_install.cmake
711+)
712+
713+##############################################################################
714+##############################################################################
715+# CLEANUP
716+##############################################################################
717+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/cleanup.cmake "
718+ FILE(GLOB TEMP_FILES \"${CMAKE_CURRENT_BINARY_DIR}/lib*.cmake\" \"${CMAKE_CURRENT_BINARY_DIR}/python*.cmake\")
719+ FOREACH(TEMP_F \${TEMP_FILES})
720+ FILE(REMOVE \${TEMP_F})
721+ ENDFOREACH()
722+")
723+EXTERNALPROJECT_ADD (
724+ CLEANUP
725+ URL ${CMAKE_CURRENT_SOURCE_DIR}/cleanup.zip
726+ PREFIX CLEANUP
727+ DEPENDS opensslzip tidy
728+ ${DOXYGEN_PAK} ${GEOS_PAK} ${GRAPHVIZ_PAK} ${LIBICU_PAK} ${LIBCURL_PAK} ${LIBXSLT_PAK} ${LIBXML2_PAK}
729+ ${PERL_PAK} ${ZLIB1_PAK} ${SWIG_PAK} ${XERCES_PAK} ${OPENSSL_PAK} ${PYTHON_PAK} ${RUBY_PAK}
730+ CONFIGURE_COMMAND ""
731+ BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/${SCRIPTS_DIR}/cleanup.cmake
732+ INSTALL_COMMAND ""
733+)
734+
735+##############################################################################
736+##############################################################################
737+#
738+##############################################################################
739+
740+
741+
742+
743+MESSAGE(STATUS "Directory to set with ZORBA_THIRD_PARTY_REQUIREMENTS: " ${CMAKE_CURRENT_BINARY_DIR})
744+
745+
746+
747
748=== added file 'scripts/winports/cleanup.zip'
749Binary 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+##############################################################################
755+##############################################################################
756+# DOWNLOAD_EXTRACT
757+##############################################################################
758+# This function downloads a package from PACKAGE_URL
759+# and verifies that PACKAGE_MD5 corresponds
760+# then, if WITH_DIR is set to YES, it creates PACKAGE_NAME directory
761+# and extract the content of the downloaded file in this directory
762+# if WITH_DIR is set to NO, it extracts the file in CMAKE_CURRENT_BINARY_DIR directory
763+#
764+FUNCTION (DOWNLOAD_EXTRACT PACKAGE_NAME WITH_DIR PACKAGE_URL PACKAGE_MD5)
765+ SET(FINAL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR}\\${PACKAGE_NAME})
766+ IF(EXISTS ${FINAL_DESTINATION})
767+ MESSAGE(STATUS "Package ${PACKAGE_NAME} already in place: ${FINAL_DESTINATION}")
768+ RETURN()
769+ ENDIF(EXISTS ${FINAL_DESTINATION})
770+
771+ MESSAGE(STATUS "Setting up ${PACKAGE_NAME}")
772+
773+ SET(DOWNLOAD_PACKAGE YES)
774+
775+ IF(WITH_DIR)
776+ FILE(MAKE_DIRECTORY ${FINAL_DESTINATION})
777+ ELSE(WITH_DIR)
778+ SET(FINAL_DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
779+ ENDIF(WITH_DIR)
780+
781+ IF (EXISTS ${LIB_DOWNLOADS}\\${PACKAGE_NAME}.zip)
782+ FILE(MD5 ${LIB_DOWNLOADS}\\${PACKAGE_NAME}.zip EXIST_MD5)
783+ IF (${EXIST_MD5} STREQUAL ${PACKAGE_MD5})
784+ MESSAGE(STATUS "${PACKAGE_NAME} already downloaded.")
785+ SET(DOWNLOAD_PACKAGE NO)
786+ ENDIF (${EXIST_MD5} STREQUAL ${PACKAGE_MD5})
787+ ENDIF (EXISTS ${LIB_DOWNLOADS}\\${PACKAGE_NAME}.zip)
788+
789+ IF (DOWNLOAD_PACKAGE)
790+ FILE(DOWNLOAD ${PACKAGE_URL} ${LIB_DOWNLOADS}\\${PACKAGE_NAME}.zip SHOW_PROGRESS EXPECTED_MD5 "${PACKAGE_MD5}" )
791+ ENDIF (DOWNLOAD_PACKAGE)
792+
793+ MESSAGE(STATUS "Extracting ${PACKAGE_NAME}")
794+ EXECUTE_PROCESS(
795+ COMMAND ${CMAKE_COMMAND} -E tar xzf ${LIB_DOWNLOADS}\\${PACKAGE_NAME}.zip
796+ WORKING_DIRECTORY ${FINAL_DESTINATION}
797+ )
798+ENDFUNCTION (DOWNLOAD_EXTRACT)
799
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+CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
806+PROJECT(libiconv)
807+
808+ADD_DEFINITIONS(-DLIBICONV_PLUG -DBUILDING_LIBICONV -DBUILDING_LIBCHARSET)
809+SET(PATCH_COMMAND @PATCH_COMMAND@)
810+
811+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libcharset/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/libcharset/config.h COPYONLY)
812+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libcharset/include/localcharset.h.build.in ${CMAKE_CURRENT_SOURCE_DIR}/libcharset/include/localcharset.h COPYONLY)
813+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/include/iconv.h.build.in ${CMAKE_CURRENT_SOURCE_DIR}/include/iconv.h COPYONLY)
814+CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_SOURCE_DIR}/config.h COPYONLY)
815+
816+EXECUTE_PROCESS( COMMAND ${PATCH_COMMAND} config.h config.h.patch -R WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
817+EXECUTE_PROCESS( COMMAND ${PATCH_COMMAND} lib/iconv.c iconv.c.patch -R WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
818+EXECUTE_PROCESS( COMMAND ${PATCH_COMMAND} include/iconv.h iconv.h.patch -R WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
819+EXECUTE_PROCESS( COMMAND ${PATCH_COMMAND} windows/libiconv.rc libiconv.rc.patch -R WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
820+EXECUTE_PROCESS( COMMAND ${PATCH_COMMAND} libcharset/lib/localcharset.c localcharset.c.patch -R WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
821+EXECUTE_PROCESS( COMMAND ${PATCH_COMMAND} libcharset/include/localcharset.h localcharset.h.patch -R WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
822+
823+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libcharset)
824+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/libcharset/include)
825+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/include)
826+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}/lib)
827+
828+
829+ADD_LIBRARY(iconv SHARED lib/iconv.c lib/relocatable.c libcharset/lib/localcharset.c windows/libiconv.rc)
830+
831+INSTALL(TARGETS iconv DESTINATION bin )
832+INSTALL(TARGETS iconv DESTINATION lib )
833+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/libcharset/include/localcharset.h DESTINATION include)
834+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/include/iconv.h DESTINATION include)
835+
836
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+30c30
842+< //#undef EILSEQ
843+---
844+> #undef EILSEQ
845
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+247c247
851+< const char* * inbuf, size_t *inbytesleft,
852+---
853+> ICONV_CONST char* * inbuf, size_t *inbytesleft,
854
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+26,29c26,27
860+< #if BUILDING_LIBICONV
861+< #define LIBICONV_DLL_EXPORTED __declspec(dllexport)
862+< #elif USING_STATIC_LIBICONV
863+< #define LIBICONV_DLL_EXPORTED
864+---
865+> #if @HAVE_VISIBILITY@ && BUILDING_LIBICONV
866+> #define LIBICONV_DLL_EXPORTED __attribute__((__visibility__("default")))
867+31c29
868+< #define LIBICONV_DLL_EXPORTED __declspec(dllimport)
869+---
870+> #define LIBICONV_DLL_EXPORTED
871+33c31
872+< extern LIBICONV_DLL_EXPORTED int _libiconv_version; /* Likewise */
873+---
874+> extern LIBICONV_DLL_EXPORTED @DLL_VARIABLE@ int _libiconv_version; /* Likewise */
875+91c89
876+< extern LIBICONV_DLL_EXPORTED size_t iconv (iconv_t cd, const char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft);
877+---
878+> extern LIBICONV_DLL_EXPORTED size_t iconv (iconv_t cd, @ICONV_CONST@ char* * inbuf, size_t *inbytesleft, char* * outbuf, size_t *outbytesleft);
879+109,110c107,108
880+< #if USE_MBSTATE_T
881+< #if BROKEN_WCHAR_H
882+---
883+> #if @USE_MBSTATE_T@
884+> #if @BROKEN_WCHAR_H@
885+130c128
886+< #if USE_MBSTATE_T
887+---
888+> #if @USE_MBSTATE_T@
889+177c175
890+< #if HAVE_WCHAR_T
891+---
892+> #if @HAVE_WCHAR_T@
893
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+2,5d1
899+< #define PACKAGE_VERSION_MAJOR 1
900+< #define PACKAGE_VERSION_MINOR 14
901+< #define PACKAGE_VERSION_SUBMINOR 0
902+< #define PACKAGE_VERSION_STRING "1.14"
903
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+77,79c77,79
909+< //#ifndef LIBDIR
910+< //# include "configmake.h"
911+< //#endif
912+---
913+> #ifndef LIBDIR
914+> # include "configmake.h"
915+> #endif
916
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+23,26c23,24
922+< #ifdef BUILDING_LIBCHARSET
923+< #define LIBCHARSET_DLL_EXPORTED __declspec(dllexport)
924+< #elif USING_STATIC_LIBICONV
925+< #define LIBCHARSET_DLL_EXPORTED
926+---
927+> #if @HAVE_VISIBILITY@ && BUILDING_LIBCHARSET
928+> #define LIBCHARSET_DLL_EXPORTED __attribute__((__visibility__("default")))
929+28c26
930+< #define LIBCHARSET_DLL_EXPORTED __declspec(dllimport)
931+---
932+> #define LIBCHARSET_DLL_EXPORTED
933+30a29
934+>
935
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+CONFIGURE_FILE(${CMAKELISTS_DIR}/CMakeLists.txt ${CMAKE_CURRENT_SOURCE_DIR}/CMakeLists.txt)
941+CONFIGURE_FILE(${CMAKELISTS_DIR}/config.h.patch ${CMAKE_CURRENT_SOURCE_DIR}/config.h.patch COPYONLY)
942+CONFIGURE_FILE(${CMAKELISTS_DIR}/iconv.c.patch ${CMAKE_CURRENT_SOURCE_DIR}/iconv.c.patch COPYONLY)
943+CONFIGURE_FILE(${CMAKELISTS_DIR}/iconv.h.patch ${CMAKE_CURRENT_SOURCE_DIR}/iconv.h.patch COPYONLY)
944+CONFIGURE_FILE(${CMAKELISTS_DIR}/libiconv.rc.patch ${CMAKE_CURRENT_SOURCE_DIR}/libiconv.rc.patch COPYONLY)
945+CONFIGURE_FILE(${CMAKELISTS_DIR}/localcharset.c.patch ${CMAKE_CURRENT_SOURCE_DIR}/localcharset.c.patch COPYONLY)
946+CONFIGURE_FILE(${CMAKELISTS_DIR}/localcharset.h.patch ${CMAKE_CURRENT_SOURCE_DIR}/localcharset.h.patch COPYONLY)
947
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+CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
954+INCLUDE(ExternalProject)
955+
956+##############################################################################
957+##############################################################################
958+# PREPARE OPENSSL
959+##############################################################################
960+##############################################################################
961+
962+SET (GNU_BIN ${CMAKE_CURRENT_BINARY_DIR}/bin)
963+FILE(MAKE_DIRECTORY ${GNU_BIN})
964+
965+##############################################################################
966+##############################################################################
967+# GZIP
968+##############################################################################
969+#FILE(DOWNLOAD ${PACKAGE_URL} ${LIB_DOWNLOADS}\\${PACKAGE_NAME}.zip SHOW_PROGRESS EXPECTED_MD5 "${PACKAGE_MD5}" )
970+SET(GZIP_PAK gzip-1.3.12-1)
971+ EXTERNALPROJECT_ADD (
972+ ${GZIP_PAK}
973+ URL http://hivelocity.dl.sourceforge.net/project/gnuwin32/gzip/1.3.12-1/gzip-1.3.12-1-bin.zip
974+ URL_MD5 b24802293f74ab11aaa5786f36c59819
975+ PREFIX ${GZIP_PAK}
976+ CONFIGURE_COMMAND ""
977+ BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory
978+ ${CMAKE_CURRENT_BINARY_DIR}/${GZIP_PAK}/src/${GZIP_PAK}/bin
979+ ${GNU_BIN}
980+ INSTALL_COMMAND ""
981+)
982+
983+##############################################################################
984+##############################################################################
985+# ZIP
986+##############################################################################
987+SET(ZIP_PAK zip-3.0)
988+EXTERNALPROJECT_ADD (
989+ ${ZIP_PAK}
990+ URL http://superb-dca3.dl.sourceforge.net/project/gnuwin32/zip/3.0/zip-3.0-bin.zip
991+ URL_MD5 5b268fe06ce5f89bc5762805a7a9d7aa
992+ DEPENDS ${GZIP_PAK}
993+ PREFIX ${ZIP_PAK}
994+ CONFIGURE_COMMAND ""
995+ BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory
996+ ${CMAKE_CURRENT_BINARY_DIR}/${ZIP_PAK}/src/${ZIP_PAK}/bin
997+ ${GNU_BIN}
998+ INSTALL_COMMAND ""
999+)
1000+
1001+##############################################################################
1002+##############################################################################
1003+# BZIP2
1004+##############################################################################
1005+SET(BZIP2_PAK bzip2-1.0.5)
1006+EXTERNALPROJECT_ADD (
1007+ ${BZIP2_PAK}
1008+ URL http://hivelocity.dl.sourceforge.net/project/gnuwin32/bzip2/1.0.5/bzip2-1.0.5-bin.zip
1009+ URL_MD5 a1155c41b1954a2f6da1014c7c1a1263
1010+ DEPENDS ${ZIP_PAK}
1011+ PREFIX ${BZIP2_PAK}
1012+ CONFIGURE_COMMAND ""
1013+ BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory
1014+ ${CMAKE_CURRENT_BINARY_DIR}/${BZIP2_PAK}/src/${BZIP2_PAK}/bin
1015+ ${GNU_BIN}
1016+ INSTALL_COMMAND ""
1017+)
1018+
1019+##############################################################################
1020+##############################################################################
1021+# BSDTAR
1022+##############################################################################
1023+SET(BSDTAR_PAK libarchive-2.4.12-1)
1024+EXTERNALPROJECT_ADD (
1025+ ${BSDTAR_PAK}
1026+ URL http://iweb.dl.sourceforge.net/project/gnuwin32/libarchive/2.4.12-1/libarchive-2.4.12-1-bin.zip
1027+ URL_MD5 f2bd5a4ee39d9fc64b456d516f90afad
1028+ DEPENDS ${BZIP2_PAK}
1029+ PREFIX ${BSDTAR_PAK}
1030+ CONFIGURE_COMMAND ""
1031+ BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory
1032+ ${CMAKE_CURRENT_BINARY_DIR}/${BSDTAR_PAK}/src/${BSDTAR_PAK}/bin
1033+ ${GNU_BIN}
1034+ INSTALL_COMMAND ""
1035+)
1036+
1037+##############################################################################
1038+##############################################################################
1039+# TAR
1040+##############################################################################
1041+SET(TAR_PAK tar-1.13-1)
1042+EXTERNALPROJECT_ADD (
1043+ ${TAR_PAK}
1044+ URL http://iweb.dl.sourceforge.net/project/gnuwin32/tar/1.13-1/tar-1.13-1-bin.zip
1045+ URL_MD5 a92857ec82db569f0a8fa5370642dc69
1046+ DEPENDS ${BSDTAR_PAK}
1047+ PREFIX ${TAR_PAK}
1048+ CONFIGURE_COMMAND ""
1049+ BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory
1050+ ${CMAKE_CURRENT_BINARY_DIR}/${TAR_PAK}/src/${TAR_PAK}/bin
1051+ ${GNU_BIN}
1052+ INSTALL_COMMAND ""
1053+)
1054+
1055+##############################################################################
1056+##############################################################################
1057+# LIBINTL
1058+##############################################################################
1059+SET(LIBINTL_PAK libintl-0.11.5-2)
1060+EXTERNALPROJECT_ADD (
1061+ ${LIBINTL_PAK}
1062+ URL http://kent.dl.sourceforge.net/project/gnuwin32/libintl/0.11.5-2/libintl-0.11.5-2-bin.zip
1063+ URL_MD5 220c1168c34fe0f4f3ed50fa50b66942
1064+ DEPENDS ${TAR_PAK}
1065+ PREFIX ${LIBINTL_PAK}
1066+ CONFIGURE_COMMAND ""
1067+ BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory
1068+ ${CMAKE_CURRENT_BINARY_DIR}/${LIBINTL_PAK}/src/${LIBINTL_PAK}/bin
1069+ ${GNU_BIN}
1070+ INSTALL_COMMAND ""
1071+)
1072+##############################################################################
1073+##############################################################################
1074+# ZLIB
1075+##############################################################################
1076+SET(ZLIB_PAK zlib128-dll)
1077+EXTERNALPROJECT_ADD (
1078+ ${ZLIB_PAK}
1079+ URL http://softlayer-dal.dl.sourceforge.net/project/libpng/zlib/1.2.8/zlib128-dll.zip
1080+ URL_MD5 42eccc2af5bac6b7a1188d7817d03549
1081+ DEPENDS ${LIBINTL_PAK}
1082+ PREFIX ${ZLIB_PAK}
1083+ CONFIGURE_COMMAND ""
1084+ BUILD_COMMAND ${CMAKE_COMMAND} -E copy_directory
1085+ ${CMAKE_CURRENT_BINARY_DIR}/${ZLIB_PAK}/src/${ZLIB_PAK}
1086+ ${GNU_BIN}
1087+ INSTALL_COMMAND ""
1088+)
1089+
1090+
1091+##############################################################################
1092+##############################################################################
1093+# OPENSSL
1094+##############################################################################
1095+FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/libopenssl_tar.cmake "
1096+ SET(ENV{PATH} \"\$ENV{PATH};${GNU_BIN}\")
1097+ FILE(DOWNLOAD http://www.openssl.org/source/openssl-1.0.1e.tar.gz ${CMAKE_CURRENT_BINARY_DIR}/openssl.tar.gz SHOW_PROGRESS)
1098+ EXECUTE_PROCESS( COMMAND bsdtar -xf openssl.tar.gz WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
1099+ MESSAGE(STATUS \"Re-extracting to avoid previous path errors.\")
1100+ EXECUTE_PROCESS( COMMAND bsdtar -xf openssl.tar.gz WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
1101+ MESSAGE(STATUS \"Compresing in a Zip file.\")
1102+ EXECUTE_PROCESS( COMMAND zip -rq openssl-1.0.1e.zip openssl-1.0.1e WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
1103+
1104+")
1105+
1106+
1107+SET(LIBOPENSSL_ZIP_PAK opensslzip)
1108+EXTERNALPROJECT_ADD (
1109+ ${LIBOPENSSL_ZIP_PAK}
1110+ # dummy file
1111+ URL http://kent.dl.sourceforge.net/project/gnuwin32/patch/2.5.9-7/patch-2.5.9-7-bin.zip
1112+ URL_MD5 b9c8b31d62f4b2e4f1887bbb63e8a905
1113+ DEPENDS ${ZLIB_PAK}
1114+ PREFIX ${LIBOPENSSL_ZIP_PAK}
1115+ CONFIGURE_COMMAND ""
1116+ BUILD_COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/libopenssl_tar.cmake
1117+ INSTALL_COMMAND ${CMAKE_COMMAND} -E copy
1118+ ${CMAKE_CURRENT_BINARY_DIR}/openssl-1.0.1e.zip
1119+ ${CMAKE_CURRENT_BINARY_DIR}/../openssl-1.0.1e.zip
1120+)
1121+
1122+
1123
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
1129 This special exception was added by the Free Software Foundation in
1130 version 2.2 of Bison. */
1131-
1132+#include "stdafx.h"
1133 // Take the name prefix into account.
1134 #define yylex zorbalex
1135
1136
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+#include "stdafx.h"
1142 #line 2 "jsoniq_scanner.yy.cpp"
1143
1144 #line 4 "jsoniq_scanner.yy.cpp"
1145
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
1151 try
1152 {
1153- arity = to_xs_unsignedLong(arityItem->getIntegerValue());
1154+ arity = static_cast<csize>(to_xs_unsignedLong(arityItem->getIntegerValue()));
1155 }
1156 catch ( std::range_error const& )
1157 {
1158
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
1164 GENV_ITEMFACTORY->createJSONObject(result, lNames, lValues);
1165
1166- STACK_PUSH(result, state );
1167+ STACK_PUSH(!!result, state );
1168
1169 STACK_END (state);
1170 }
1171
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 // evaluate the function and check if it was really called
1177 std::cout << lQuery << std::endl;
1178 if (!lCalled) {
1179- return 2;
1180+ return true;
1181 }
1182 }
1183

Subscribers

People subscribed via source and target branches