Added HTML5-nosemantics specification configs.

Author: msporny

Makefile.in

@@ -1,94 +1,49 @@
 # The top-level Makefile that is used to build the HTML5 specification
 #
 # Author: Manu Sporny
-.PHONY: help all spec-rdfa-module spec-rdfa-complete directories
+.PHONY: help
 
 BUILD_DIR := build
+CONFIG_DIR := configs
 DIST_DIR := dist
+SOURCE_FILES := $(wildcard build/*)
+CONFIGS := $(wildcard ${CONFIG_DIR}/*.conf)
+SPEC_SPLIT_STAMP := ${BUILD_DIR}/spec-split.stamp
+SPECS := $(patsubst ${CONFIG_DIR}/%.conf, ${DIST_DIR}/%.html, $(CONFIGS))
 
 help:
-	@echo "Commands that you can use to build the HTML5 specification."
+	@echo "Commands that you can use to build the various HTML5 specifications."
 	@echo ""
-	@echo " make whatwg-pull - Pull the latest updates from the WHAT WG repository"
-	@echo " make html5-hixie - Build the HTML5 specification"
-	@echo " make html5-rdfa - Build the RDFa specification module"
-	@echo " make rdfa-module - Build the HTML5+RDFa specification"
+	@$(foreach spec,$(SPECS), echo " make $(spec)" &&) true
 	@echo " make clean - Cleans all of the build files"
 
-whatwg-pull:
+html5-hixie/source:
 	@echo "Pulling latest changes from WHAT Working Group repository"
 	@@SVN@ co http://svn.whatwg.org/webapps html5-hixie
 
-directories:
-	@mkdir -p ${BUILD_DIR} ${DIST_DIR}
+${BUILD_DIR} ${DIST_DIR}:
+	@mkdir -p $@
 
-html5-hixie: directories ${DIST_DIR}/html5-hixie.html
+$(SPECS): ${SPEC_SPLIT_STAMP} ${BUILD_DIR} ${DIST_DIR}
+	@echo "Building $(@F) specification..."
+	@echo "Joining microsections into $(@F) specification..."
+	@./bin/microjoin.py -d ${BUILD_DIR} -o tempspec-$(@F) ${CONFIG_DIR}/$(subst .html,.conf,$(@F))
+	@echo "Generating final document via Anolis (this may take 2-3 minutes)..."
+	@@ANOLIS@ @ANOLIS_FLAGS@ ${BUILD_DIR}/tempspec-$(@F) $@
+	@sed -i "s/@SPEC_NAME@/$(@F)/g" $@
+	@echo "$(@F) spec written to: $@"
 
-${DIST_DIR}/html5-hixie.html: headers/header-w3c-html5 html5-hixie/source
-	@echo "Building HTML5-hixie specification..."
-	@echo "Removing non-HTML5 sections..."
+${SPEC_SPLIT_STAMP}: html5-hixie/source
+	@echo "Removing non-HTML5 sections before splitting spec..."
 	@perl -e '$$_ = join("", <>); s/<!--END html5-->.*?<!--START html5-->//gs; s/<!--(START|END).*?-->//g; print' html5-hixie/source > html5-hixie/source-html5
-	@echo "Splitting html5-hixie into microsections..."
+	@echo "Splitting source HTML5 document into microsections..."
 	@./bin/microsplit.py html5-hixie/source-html5
-	@echo "Joining microsections into HTML5-hixie specification..."
-	@echo "include headers/header-w3c-html5" > build/html5-hixie.conf
-	@cat build/source-html5.conf >> build/html5-hixie.conf
-	@./bin/microjoin.py build/html5-hixie.conf
-	@echo "Generating final document via Anolis (this may take 2-3 minutes)..."
-	@@ANOLIS@ @ANOLIS_FLAGS@ ${BUILD_DIR}/specification.html ${DIST_DIR}/html5-hixie.html
-	@echo "HTML5-hixie spec written to: ${DIST_DIR}/html5-hixie.html"
-
-rdfa-module: directories ${DIST_DIR}/rdfa-module.html
-
-${DIST_DIR}/rdfa-module.html: headers/header-w3c-rdfa $(wildcard microsections/rdfa/*)
-	@echo "Building modularized RDFa specification..."
-	@echo "Joining RDFa microsections into RDFa module specification..."
-	@./bin/microjoin.py configs/rdfa-module.conf
-	@echo "Generating final HTML via Anolis..."
-	@@ANOLIS@ @ANOLIS_FLAGS@ ${BUILD_DIR}/specification.html ${DIST_DIR}/rdfa-module.html
-	@echo "RDFa module spec written to: ${DIST_DIR}/rdfa-module.html"
-
-html5-rdfa: directories ${DIST_DIR}/html5-rdfa.html
-
-html5-hixie/source: whatwg-pull
-
-${DIST_DIR}/html5-rdfa.html: headers/header-w3c-html5 html5-hixie/source $(wildcard microsections/rdfa/*)
-	@echo "Building HTML5+RDFa specification..."
-	@mkdir -p ${BUILD_DIR} ${DIST_DIR}
-	@echo "Joining RDFa microsections into RDFa module specification..."
-	@./bin/microjoin.py configs/html5-rdfa.conf
-	@echo "Generating final HTML via Anolis (this may take 2-3 minutes)..."
-	@@ANOLIS@ @ANOLIS_FLAGS@ ${BUILD_DIR}/specification.html ${DIST_DIR}/html5-rdfa.html
-	@echo "HTM5-RDFa spec written to: ${DIST_DIR}/html5-rdfa.html"
-
-html5-warnings: directories ${DIST_DIR}/html5-warnings.html
-
-${DIST_DIR}/html5-warnings.html: headers/header-w3c-msporny html5-hixie/source $(wildcard microsections/warnings/*)
-	@echo "Building HTML5-warnings specification..."
-	@mkdir -p ${BUILD_DIR} ${DIST_DIR}
-	@echo "Joining HTML5-warnings microsections into HTML5 specification..."
-	@./bin/microjoin.py configs/html5-warnings.conf
-	@echo "Replacing specification name links"
-	@sed -i "s/@SPEC_NAME@/html5-warnings/g" ${BUILD_DIR}/specification.html
-	@echo "Generating final HTML via Anolis (this may take 2-3 minutes)..."
-	@@ANOLIS@ @ANOLIS_FLAGS@ ${BUILD_DIR}/specification.html ${DIST_DIR}/html5-warnings.html
-	@echo "HTM5-warnings spec written to: ${DIST_DIR}/html5-warnings.html"
-
-html5-warnings-module: directories ${DIST_DIR}/html5-warnings-module.html
-
-${DIST_DIR}/html5-warnings-module.html: headers/header-w3c-msporny $(wildcard microsections/warnings/*)
-	@echo "Building modularized HTML5-warnings specification..."
-	@echo "Joining HTML5-warnings microsections into HTML5-warnings module specification..."
-	@./bin/microjoin.py configs/html5-warnings-module.conf
-	@echo "Replacing specification name links"
-	@sed -i "s/@SPEC_NAME@/html5-warnings/g" ${BUILD_DIR}/specification.html 
-	@echo "Generating final HTML via Anolis..."
-	@@ANOLIS@ @ANOLIS_FLAGS@ ${BUILD_DIR}/specification.html ${DIST_DIR}/html5-warnings-module.html
-	@echo "HTML5-warnings module spec written to: ${DIST_DIR}/html5-warnings-module.html"
+	@echo "include headers/header-w3c-html5" > ${CONFIG_DIR}/html5-hixie.conf
+	@cat ${BUILD_DIR}/source-html5.conf >> ${CONFIG_DIR}/html5-hixie.conf
+	@touch ${SPEC_SPLIT_STAMP}
 
 clean:
 	@echo "Cleaning all build files and directories..."
 	@rm -rf html5-hixie
 	@rm -f *~
-	@rm -rf configure config.status config.log Makefile autom4te.cache
 	@rm -rf ${BUILD_DIR} ${DIST_DIR}

configure.ac

@@ -7,7 +7,7 @@ AC_INIT([html],[5.0],[msporny@digitalbazaar.com])
 AC_CONFIG_AUX_DIR(setup)
 
 # Check for the existence of Anolis and Subversion
-AC_CHECK_PROGS(ANOLIS, anolis /usr/bin/anolis /usr/local/bin/anolis, [not found], $PATH)
+ANOLIS=`pwd`/utils/anolis
 AC_CHECK_PROGS(SVN, svn /usr/bin/svn /usr/local/bin/svn, [not found], $PATH)
 
 # Setup the flags needed for Anolis
@@ -28,6 +28,7 @@ AC_SUBST(MONTH_NUMBER)
 AC_SUBST(YEAR)
 AC_SUBST(DATE_STRING)
 AC_SUBST(CONDENSED_DATE_STRING)
+AC_SUBST(ANOLIS)
 
 # Ensure that Anolis and Subversion were found
 if test "x$ANOLIS" == "xnot found"; then
@@ -52,6 +53,7 @@ fi
 AC_CONFIG_FILES([
 	Makefile
 	headers/header-w3c-msporny
+	headers/header-w3c-microdata
 ])
 
 AC_OUTPUT