lp:~ceejatec/zorba/feature-module-installation

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:zorba at revision 10536

Matthias Brantner: Approve on 2011-11-04

Chris Hillery: Approve on 2011-10-21

Diff: 1712 lines (+730/-284)

32 files modified

CMakeLists.txt (+28/-6)
ChangeLog (+2/-0)
NOTICE.txt (+1/-1)
bin/CMakeLists.txt (+32/-2)
bin/path_util.cpp (+60/-45)
bin/path_util.h (+9/-24)
bin/zorbacmd.cpp (+3/-5)
bin/zorbacmdproperties.cpp (+14/-5)
bin/zorbacmdproperties.h (+7/-1)
bin/zorbacmdproperties.txt (+3/-1)
bin/zorbacmdproperties_base.h (+19/-3)
cmake_modules/ZorbaModule.cmake (+15/-12)
config/CMakeLists.txt (+5/-5)
config/ZorbaConfig.cmake.in (+7/-4)
doc/zorba/commandline.dox (+7/-1)
doc/zorba/external_functions.dox (+2/-2)
doc/zorba/modules_authoring.dox (+2/-3)
doc/zorba/modules_authoring_2.dox (+4/-3)
doc/zorba/modules_building_in.dox (+1/-1)
doc/zorba/uriresolvers.dox (+120/-38)
include/zorba/config.h.cmake (+4/-1)
include/zorba/static_context.h (+81/-0)
src/api/staticcontextimpl.cpp (+140/-42)
src/api/staticcontextimpl.h (+18/-0)
src/context/default_uri_mappers.cpp (+1/-1)
src/context/dynamic_loader.cpp (+6/-7)
src/context/root_static_context.cpp (+36/-20)
src/context/root_static_context.h (+5/-3)
src/context/root_static_context_init.cpp.in (+9/-2)
src/context/static_context.cpp (+72/-38)
src/context/static_context.h (+14/-7)
test/rbkt/testdriver_common.cpp (+3/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #862089: Split binary/xq install directories for modules

High

Fix Released

Link a bug report

Related blueprints

10527. By Chris Hillery on 2011-11-04

Merge from trunk.

10526. By Chris Hillery on 2011-11-04

One last doc fix, plus specify --fixes.

10525. By Chris Hillery on 2011-11-04

1. Added documentation for URI and Library paths.
2. Changed core directories to share/zorba/uris/core/VERSION and
lib/zorba/core/VERSION, to avoid needing both share/zorba-VERSION and
share/zorba.
3. Moved ZorbaConfig/ZorbaVersion.cmake files to share/cmake/zorba-VERSION
for same reason.

10524. By Chris Hillery on 2011-10-21

Fixes for Windows.

10523. By Chris Hillery on 2011-10-21

Merge from trunk.

10522. By Chris Hillery on 2011-10-21

Added support to zorbacmd for --uri-path and --lib-path.

10521. By Chris Hillery on 2011-10-19

Replace ZORBA_MODULES_INSTALL_DIR with four different paths: core and
non-core versions of URI and Library paths. URI path is used for
resolving URIs; Library path is used for loading platform-dependent
code such as shared libraries. Internal static_context maintains URI
and Library paths instead of "module path". Public StaticContext
supports ModulePath for backwards-compatibility by setting both URI
and Library paths simultaneously.

10520. By Matthias Brantner on 2011-10-18

Optimization. Lazily create the external function parameter hashmap. This saves a lot of time every time the dynamic context is copied, i.e. on every function invocation. Approved: Markos Zaharioudakis, Matthias Brantner

10519. By Matthias Brantner on 2011-10-18

Caching the default collator in the static context. This gives approx. 40% performance improvements when called from TypedValueCompareIterator::openImpl because resolving the URI every time is very expensive. Approved: Matthias Brantner, Markos Zaharioudakis

10518. By Gabriel Petrovay on 2011-10-18

Corrected incorrect regular expressions in the file module. Approved: Gabriel Petrovay, Paul J. Lucas