Merge pull request #179 from ndw/move-json

Move join-json into the step library

build.gradle

@@ -99,7 +99,7 @@ task make_etc() {
 }
 
 [ "steps", "step-file", "step-os", "step-paged-media",
-  "step-run", "step-text", "step-validation", "step-json" ].each { spec ->
+  "step-run", "step-text", "step-validation" ].each { spec ->
     Task t = task "copy_${spec}_build"(dependsOn: [ "buildspecs" ], type: Copy) {
         from "$spec/build/"
         exclude "xinclude.xml", "examples/**", "graphics/**", "glossary.xml"
@@ -325,58 +325,6 @@ task step_os_xpl(dependsOn: ["step-os:library"], type: Copy) {
   rename ("library.xml", "steps.xpl")
 }
 
-// ======================================================================
-// step-json
-
-task step_json(type: DocBookTask,
-               dependsOn: [ "download_xproc_toc",
-                            "steps", "xproc_schemas", "spec_schemas",
-                            "step-json:specification",
-                            "step_json_assets",
-                            "step_json_src", "step_json_xpl" ]) {
-  inputs.files fileTree(dir: "tools/xsl/")
-  inputs.files fileTree(dir: "tools/xpl/")
-  inputs.file "build/xproc_toc.xml"
-  input("source", "step-json/build/source.xml")
-  output("result", "build/dist/json/index.html")
-
-  param("schemaext.schema", file("build/schema/dbspec.rng"))
-  param("travis", getenv("TRAVIS"))
-  param("travis-commit", getenv("TRAVIS_COMMIT"))
-  param("travis-build-number", getenv("TRAVIS_BUILD_NUMBER"))
-  param("travis-user", getenv("TRAVIS_USER"))
-  param("travis-repo", getenv("TRAVIS_REPO"))
-  param("travis-branch", getenv("TRAVIS_BRANCH"))
-  param("travis-tag", getenv("TRAVIS_TAG"))
-
-  option("style", file("tools/xsl/xproc-specs.xsl"))
-  option("diff", deltaxml())
-  option("specid", "json")
-  //option("diffloc", file("build/dist/json/diff.html"))
-
-  pipeline "tools/xpl/formatspec.xpl"
-}
-buildspecs.dependsOn "step_json"
-
-task step_json_assets(type: Copy) {
-  from "src/main/resources"
-  into "build/dist/json/"
-}
-
-task step_json_src(dependsOn: ["step-json:source"], type: Copy) {
-  from "step-json/build/"
-  into "build/dist/json/"
-  include "source.xml"
-  rename ("source.xml", "specification.xml")
-}
-
-task step_json_xpl(dependsOn: ["step-json:library"], type: Copy) {
-  from "step-json/build/"
-  into "build/dist/json/"
-  include "library.xml"
-  rename ("library.xml", "steps.xpl")
-}
-
 // ======================================================================
 // step-run
 

steps/src/main/xml/specification.xml

@@ -185,6 +185,7 @@ linkend="rfc2119"/>.</para>
 <xi:include href="steps/insert.xml"/>
 <xi:include href="steps/label-elements.xml"/>
 <xi:include href="steps/load.xml"/>
+<xi:include href="steps/json-join.xml"/>
 <xi:include href="steps/make-absolute-uris.xml"/>
 <xi:include href="steps/namespace-rename.xml"/>
 <xi:include href="steps/pack.xml"/>