lp://staging/~zorba-coders/zorba/bug1001474

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp://staging/zorba at revision 11100

Chris Hillery: Approve on 2012-10-17

Rodolfo Ochoa: Approve on 2012-10-17

Diff: 150 lines (+56/-14)

4 files modified

cmake_modules/FindPHP5.cmake (+11/-0)
modules/DownloadModules.cmake (+39/-14)
src/compiler/expression/pragma.cpp (+1/-0)
swig/python/CMakeLists.txt (+5/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1029783: Improve finding PHP

Low

Fix Released

Link a bug report

Related blueprints

10874. By Rodolfo Ochoa on 2012-09-24

Fix for python_d.lib error on windows

10873. By Rodolfo Ochoa on 2012-09-24

Merge from trunk

10872. By Rodolfo Ochoa on 2012-06-19

Added update functionality to DownloadModules.cmake script

10871. By Rodolfo Ochoa on 2012-06-18

Fix for PHP library search

10870. By Rodolfo Ochoa on 2012-06-12

- Install added for XQJ bindings and documentation
- more documentation for all SWIG generated language bindings
- other installer related cleanups Approved: Matthias Brantner, Chris Hillery, Juan Zacarias

10869. By Paul J. Lucas on 2012-06-09

1. Fixed return type of ft:thesaurus-lookup().
2. Added a test to ensure that a look-up of a non-existant word works. Approved: Matthias Brantner, Paul J. Lucas

10868. By Paul J. Lucas on 2012-06-08

s/ZORBA_ASSERT/if/ Approved: Matthias Brantner, Paul J. Lucas

10867. By Matthias Brantner on 2012-05-30

added a cmake variable that allows to configure whether external jars are packaged or not (ZORBA_PACKAGE_EXTERNAL_JARS)
 Approved: Matthias Brantner, Chris Hillery

10866. By Matthias Brantner on 2012-05-23

updated change log to reflect bug #1002867 Approved: Paul J. Lucas, Matthias Brantner

10865. By Paul J. Lucas on 2012-05-23

No longer setting the charset of an overridden media type to a default value. Approved: David Graf, Matthias Brantner