Repaired broken path logic in docs generation (#4)

david-waltermire · Jun 4, 2019 · 6816cda · 6816cda
1 parent 39f9168
commit 6816cda
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/build/ci-cd/generate-model-documentation.sh b/build/ci-cd/generate-model-documentation.sh
@@ -41,7 +41,8 @@ while IFS="|" read path gen_schema gen_converter gen_docs || [[ -n "$path" ]]; d
     base="${filename/_metaschema/}"
     converter="$working_dir/json/convert/${base}_xml-to-json-converter.xsl"
     metaschema_path=$(realpath --relative-to="$working_dir" "$metaschema")
-    converter_path=$(realpath --relative-to="$working_dir" "$converter")
+    stylesheet_dir=$(dirname "$stylesheet")
+    converter_path=$(realpath --relative-to="$stylesheet_dir" "$converter")
 
     #split on commas
     IFS=, read -a formats <<< "$gen_docs"

diff --git a/build/metaschema/xml/produce-and-run-either-documentor.xsl b/build/metaschema/xml/produce-and-run-either-documentor.xsl
@@ -55,7 +55,6 @@
     </xsl:variable>
 
     <xsl:template match="/">
-        <!--<xsl:message expand-text="true"> { resolve-uri($result-path, document-uri(/)) }</xsl:message>-->
         <xsl:result-document href="{$result-path}/{ $metaschema-code }.html" method="xhtml">
 
             <xsl:call-template name="yaml-header">