Merge lp:~zorba-coders/zorba/doc-fixes-3.0 into lp:zorba

Proposed by Chris Hillery
Status: Merged
Merged at revision: 11673
Proposed branch: lp:~zorba-coders/zorba/doc-fixes-3.0
Merge into: lp:zorba
Diff against target: 57 lines (+4/-5)
4 files modified
doc/zorba/xqdoc/src/xqdoc-html.xq (+1/-2)
modules/functx/functx.xq (+1/-1)
modules/sctx/sctx.jq (+1/-1)
modules/store/documents.xq (+1/-1)
To merge this branch: bzr merge lp:~zorba-coders/zorba/doc-fixes-3.0
Reviewer Review Type Date Requested Status
Matthias Brantner Approve
Chris Hillery Approve
Review via email: mp+193314@code.launchpad.net

Commit message

More @project fixes; skip test schemas when generating doc.

To post a comment you must log in.
Revision history for this message
Chris Hillery (ceejatec) :
review: Approve
Revision history for this message
Matthias Brantner (matthias-brantner) :
review: Approve
Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/doc-fixes-3.0/+merge/193314

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue result for https://code.launchpad.net/~zorba-coders/zorba/doc-fixes-3.0/+merge/193314

Stage "TestZorbaUbuntu" failed.
1 tests failed (8576 total tests run).

Check test results at http://jenkins.lambda.nu/job/TestZorbaUbuntu/401/testReport/ to view the results.

lp:~zorba-coders/zorba/doc-fixes-3.0 updated
11671. By Chris Hillery

Don't output invalid .xsd files that will trip up later "make doc" runs.

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue starting for the following merge proposals:
https://code.launchpad.net/~zorba-coders/zorba/doc-fixes-3.0/+merge/193314

Progress dashboard at http://jenkins.lambda.nu/view/ValidationQueue

Revision history for this message
Zorba Build Bot (zorba-buildbot) wrote :

Validation queue succeeded - proposal merged!

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/zorba/xqdoc/src/xqdoc-html.xq'
2--- doc/zorba/xqdoc/src/xqdoc-html.xq 2013-10-16 21:47:22 +0000
3+++ doc/zorba/xqdoc/src/xqdoc-html.xq 2013-11-08 19:40:15 +0000
4@@ -59,14 +59,13 @@
5 where not(ends-with($schema, ".ent.xsd"))
6 and not(ends-with($schema, ".dtd.xsd"))
7 and not(contains($schema, "URI_PATH"))
8+ and not(contains($schema, "QueryResults"))
9 let $schema-doc := doc($base || $slash || trace($schema, "schema"))
10 let $target-uri := $schema-doc/xs:schema/@targetNamespace/string()
11 let $name := replace(replace($target-uri, "http://", ""), "/", "_")
12 return {
13- (file:write-text($xqdocBuildPath || $slash || "schemas" || $slash || $name || ".xsd", $schema-doc),
14 file:write-text($dest || $slash || replace(replace($target-uri, "http://", ""), "/", "_") || "-schema.xml",
15 local:write-Doxygen($schema-doc, $name, $target-uri, "schema"))
16- )
17 };
18
19 file:create-directory($xqdocBuildPath || $slash || "examples");
20
21=== modified file 'modules/functx/functx.xq'
22--- modules/functx/functx.xq 2013-08-09 07:33:21 +0000
23+++ modules/functx/functx.xq 2013-11-08 19:40:15 +0000
24@@ -25,7 +25,7 @@
25
26 : @version 1.0
27 : @see http://www.xqueryfunctions.com
28- : @project FunctX
29+ : @project FunctX/FunctX
30 :)
31 module namespace functx = "http://www.functx.com" ;
32
33
34=== modified file 'modules/sctx/sctx.jq'
35--- modules/sctx/sctx.jq 2013-10-30 15:22:48 +0000
36+++ modules/sctx/sctx.jq 2013-11-08 19:40:15 +0000
37@@ -23,7 +23,7 @@
38 :
39 : @see http://www.w3.org/TR/xquery/#id-xq-static-context-components
40 : @author Nicolae Brinza
41- : @project Zorba/Introspection/Static Context/Static Context
42+ : @project Zorba/Introspection/Static Context
43 :)
44 module namespace sctx = "http://zorba.io/modules/sctx";
45
46
47=== modified file 'modules/store/documents.xq'
48--- modules/store/documents.xq 2013-10-10 00:05:44 +0000
49+++ modules/store/documents.xq 2013-11-08 19:40:15 +0000
50@@ -28,7 +28,7 @@
51 : @see <a href="../zorba/data_lifecycle.html">Data Lifecycle</a>
52 : @see http://zorba.io/errors
53 : @author Matthias Brantner, David Graf, Till Westmann, Markos Zaharioudakis
54- : @project Zorba/Data Store/Documents
55+ : @project Zorba/Data Store/Documents/Documents
56 :)
57 module namespace doc = "http://zorba.io/modules/store/documents";
58

Subscribers

People subscribed via source and target branches