Re-enable diffs now that we have the two-spec version as the status quo

xml-project · Nov 13, 2014 · 530a43c · 530a43c
1 parent 02a2411
commit 530a43c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/langspec/xproc20-steps/Makefile b/langspec/xproc20-steps/Makefile
@@ -5,7 +5,7 @@ CLASSPATH=$(subst  $(space),:,$(wildcard ../../lib/*.jar)):../../lib
 SAXON=java -cp $(CLASSPATH) -jar ../../lib/saxon9he.jar
 CALABASH=java -cp $(CLASSPATH) com.xmlcalabash.drivers.Main -c ../../.calabash
 
-TARGETS=changelog.html Overview.html
+TARGETS=changelog.html Overview.html diff.html
 
 all: $(TARGETS)
 
@@ -31,8 +31,8 @@ Overview.html: ,steps.xml typed-pipeline-library.xml error-list.xml \
 
 # ============================================================
 
-diff.html: langspec.html
-	../lib/make-diff.sh
+diff.html: Overview.html
+	../../lib/make-diff.sh xproc20-steps
 
 changelog.html: changelog.xml
 	@echo Format changelog

diff --git a/langspec/xproc20/Makefile b/langspec/xproc20/Makefile
@@ -5,15 +5,10 @@ CLASSPATH=$(subst  $(space),:,$(wildcard ../../lib/*.jar)):../../lib
 SAXON=java -cp $(CLASSPATH) -jar ../../lib/saxon9he.jar
 CALABASH=java -cp $(CLASSPATH) com.xmlcalabash.drivers.Main -c ../../.calabash
 
-TARGETS=changelog.html Overview.html
+TARGETS=changelog.html Overview.html diff.html
 
 all: $(TARGETS)
 
-namespace-documents:
-	$(MAKE) -C ns-p
-	$(MAKE) -C ns-c
-	$(MAKE) -C ns-err
-
 # ============================================================
 
 Overview.html: ,xproc20.xml error-list.xml \
@@ -51,7 +46,7 @@ Overview.html: ,xproc20.xml error-list.xml \
 # ============================================================
 
 diff.html: Overview.html
-	../lib/make-diff.sh
+	../../lib/make-diff.sh xproc20
 
 changelog.html: changelog.xml
 	@echo Format changelog

diff --git a/lib/make-diff.sh b/lib/make-diff.sh
@@ -1,4 +1,5 @@
 #!/bin/bash
+SPEC=$1
 
 if [ "$DELTA_BASE" != "" ] && [ "$DELTA_NAME" != "" ] && [ "DELTA_PASS" != "" ]
 then
@@ -9,7 +10,7 @@ then
     for f in `cat filelist`; do
         curl -s -o $f -u "$DELTA_NAME:$DELTA_PASS" -s "$DELTA_BASE/$f"
     done
-    make
+    make SPEC="$SPEC"
     cd ..
     mv delta/diff.html .
     rm -rf delta
@@ -21,7 +22,7 @@ then
     for f in `cat $DELTA_LOCAL/filelist`; do
         cp "$DELTA_LOCAL/$f" .
     done
-    make
+    make SPEC="$SPEC"
     cd ..
     mv delta/diff.html .
     rm -rf delta

diff --git a/style/formatspec.xpl b/style/formatspec.xpl
@@ -41,11 +41,8 @@
                 select="substring-after(
                           /c:result/c:env[@name='TRAVIS_REPO_SLUG']/@value,
                           '/')"/>
-<!--
   <p:with-param name="auto-diff"
                 select="string((/c:result/c:env[@name='DELTA_BASE' or @name='DELTA_LOCAL'])[1]/@value)"/>
--->
-  <p:with-param name="auto-diff" select="''"/>
 </dbp:docbook>
 
 </p:declare-step>