Use codedoc now instead of mxmldoc.

Dump all of the docset stuff - Xcode no longer supports it... :(

3 files changed, 14 insertions, 41 deletions

diff --git a/Makefile b/Makefile
index df8d6c394..ae6cf3774 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 #
 # Top-level Makefile for CUPS.
 #
-# Copyright © 2007-2018 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2007 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -259,7 +259,7 @@ debugcheck:	all unittests
 
 
 #
-# Create HTML documentation using Mini-XML's mxmldoc (http://www.msweet.org/)...
+# Create HTML documentation using codedoc (http://www.msweet.org/codedoc)...
 #
 
 apihelp:
@@ -270,32 +270,6 @@ apihelp:
 
 
 #
-# Create an Xcode docset using Mini-XML's mxmldoc (http://www.msweet.org/)...
-#
-
-docset:	apihelp
-	echo Generating docset directory tree...
-	$(RM) -r org.cups.docset
-	mkdir -p org.cups.docset/Contents/Resources/Documentation/help
-	mkdir -p org.cups.docset/Contents/Resources/Documentation/images
-	cd man; $(MAKE) $(MFLAGS) html
-	cd doc; $(MAKE) $(MFLAGS) docset
-	cd cgi-bin; $(MAKE) $(MFLAGS) makedocset
-	cgi-bin/makedocset org.cups.docset \
-		`svnversion . | sed -e '1,$$s/[a-zA-Z]//g'` \
-		doc/help/api-*.tokens
-	$(RM) doc/help/api-*.tokens
-	echo Indexing docset...
-	/Applications/Xcode.app/Contents/Developer/usr/bin/docsetutil index org.cups.docset
-	echo Generating docset archive and feed...
-	$(RM) org.cups.docset.atom
-	/Applications/Xcode.app/Contents/Developer/usr/bin/docsetutil package --output org.cups.docset.xar \
-		--atom org.cups.docset.atom \
-		--download-url http://www.cups.org/org.cups.docset.xar \
-		org.cups.docset
-
-
-#
 # Lines of code computation...
 #
 
diff --git a/cups/Makefile b/cups/Makefile
index b56e5f34a..84c4e3cb4 100644
--- a/cups/Makefile
+++ b/cups/Makefile
@@ -1,7 +1,7 @@
 #
 # Library Makefile for CUPS.
 #
-# Copyright 2007-2018 by Apple Inc.
+# Copyright 2007-2019 by Apple Inc.
 # Copyright 1997-2006 by Easy Software Products, all rights reserved.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -736,35 +736,34 @@ tlscheck:	tlscheck.o $(LIBCUPSSTATIC)
 apihelp:
 	echo Generating CUPS API help files...
 	$(RM) cupspm.xml
-	mxmldoc --section "Programming" --body cupspm.md \
+	codedoc --section "Programming" --body cupspm.md \
 		cupspm.xml \
 		auth.c cups.h dest*.c encode.c http.h http*.c ipp.h ipp*.c \
 		options.c tls-darwin.c usersys.c util.c \
 		--coverimage cupspm.png \
 		--epub ../doc/help/cupspm.epub
-	mxmldoc --section "Programming" --body cupspm.md \
+	codedoc --section "Programming" --body cupspm.md \
 		cupspm.xml > ../doc/help/cupspm.html
 	$(RM) cupspm.xml
-	mxmldoc --section "Programming" --title "Administration APIs" \
+	codedoc --section "Programming" --title "Administration APIs" \
 		--css ../doc/cups-printable.css \
 		--header api-admin.header --intro api-admin.shtml \
 		api-admin.xml \
 		adminutil.c adminutil.h getdevices.c >../doc/help/api-admin.html
 	$(RM) api-admin.xml
-	mxmldoc --section "Programming" --title "PPD API (DEPRECATED)" \
+	codedoc --section "Programming" --title "PPD API (DEPRECATED)" \
 		--css ../doc/cups-printable.css \
 		--header api-ppd.header --intro api-ppd.shtml \
 		api-ppd.xml ppd.h ppd-*.c >../doc/help/api-ppd.html
 	$(RM) api-ppd.xml
-	mxmldoc --section "Programming" --title "Raster API" \
+	codedoc --section "Programming" --title "Raster API" \
 		--css ../doc/cups-printable.css \
 		--header api-raster.header --intro api-raster.shtml \
 		api-raster.xml \
 		../cups/raster.h interpret.c raster.c \
 		>../doc/help/api-raster.html
-	mxmldoc --tokens help/api-raster.html api-raster.xml >../doc/help/api-raster.tokens
 	$(RM) api-raster.xml
-	mxmldoc --section "Programming" \
+	codedoc --section "Programming" \
 		--title "Filter and Backend Programming" \
 		--css ../doc/cups-printable.css \
 		--header api-filter.header --intro api-filter.shtml \
diff --git a/filter/Makefile b/filter/Makefile
index 696206aa7..84dd68f1b 100644
--- a/filter/Makefile
+++ b/filter/Makefile
@@ -1,7 +1,7 @@
 #
 # Filter makefile for CUPS.
 #
-# Copyright © 2007-2018 by Apple Inc.
+# Copyright © 2007-2019 by Apple Inc.
 # Copyright © 1997-2006 by Easy Software Products.
 #
 # Licensed under Apache License v2.0.  See the file "LICENSE" for more
@@ -126,25 +126,25 @@ uninstall:
 
 apihelp:
 	echo Generating CUPS API help files...
-	mxmldoc --section "Programming" \
+	codedoc --section "Programming" \
 		--title "Developing PostScript Printer Drivers" \
 		--css ../doc/cups-printable.css \
 		--header postscript-driver.header \
 		--intro postscript-driver.shtml \
 		>../doc/help/postscript-driver.html
-	mxmldoc --section "Programming" \
+	codedoc --section "Programming" \
 		--title "Introduction to the PPD Compiler" \
 		--css ../doc/cups-printable.css \
 		--header ppd-compiler.header \
 		--intro ppd-compiler.shtml \
 		>../doc/help/ppd-compiler.html
-	mxmldoc --section "Programming" \
+	codedoc --section "Programming" \
 		--title "Developing Raster Printer Drivers" \
 		--css ../doc/cups-printable.css \
 		--header raster-driver.header \
 		--intro raster-driver.shtml \
 		>../doc/help/raster-driver.html
-	mxmldoc --section "Specifications" \
+	codedoc --section "Specifications" \
 		--title "CUPS PPD Extensions" \
 		--css ../doc/cups-printable.css \
 		--header spec-ppd.header \