Move example ipptool files to the examples directory.

Build tools directory for IPP tools.

config-scripts/cups-common.m4

@@ -434,18 +434,17 @@ LIBHEADERSPRIV="\$(COREHEADERSPRIV) \$(DRIVERHEADERSPRIV)"
 
 case "$COMPONENTS" in
 	all)
-		BUILDDIRS="test filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
+		BUILDDIRS="tools filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
 		;;
 
 	core)
-		BUILDDIRS="test locale"
+		BUILDDIRS="tools examples locale"
 		;;
 
 	corelite)
 		AC_DEFINE(CUPS_LITE)
-		BUILDDIRS="test locale"
+		BUILDDIRS="tools examples locale"
 		cupsimagebase=""
-		IPPEVECOMMANDS="ippevepcl"
 		LIBCUPSOBJS="\$(COREOBJS)"
 		LIBHEADERS="\$(COREHEADERS)"
 		LIBHEADERSPRIV="\$(COREHEADERSPRIV)"
@@ -460,7 +459,6 @@ case "$COMPONENTS" in
 		AC_DEFINE(CUPS_LITE)
 		BUILDDIRS="locale"
 		cupsimagebase=""
-		IPPEVECOMMANDS="ippevepcl"
 		LIBCUPSOBJS="\$(COREOBJS)"
 		LIBHEADERS="\$(COREHEADERS)"
 		LIBHEADERSPRIV="\$(COREHEADERSPRIV)"

configure

@@ -6018,19 +6018,18 @@ LIBHEADERSPRIV="\$(COREHEADERSPRIV) \$(DRIVERHEADERSPRIV)"
 
 case "$COMPONENTS" in
 	all)
-		BUILDDIRS="test filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
+		BUILDDIRS="tools filter backend berkeley cgi-bin monitor notifier ppdc scheduler systemv conf data desktop locale man doc examples templates"
 		;;
 
 	core)
-		BUILDDIRS="test locale"
+		BUILDDIRS="tools examples locale"
 		;;
 
 	corelite)
 		$as_echo "#define CUPS_LITE 1" >>confdefs.h
 
-		BUILDDIRS="test locale"
+		BUILDDIRS="tools examples locale"
 		cupsimagebase=""
-		IPPEVECOMMANDS="ippevepcl"
 		LIBCUPSOBJS="\$(COREOBJS)"
 		LIBHEADERS="\$(COREHEADERS)"
 		LIBHEADERSPRIV="\$(COREHEADERSPRIV)"
@@ -6046,7 +6045,6 @@ case "$COMPONENTS" in
 
 		BUILDDIRS="locale"
 		cupsimagebase=""
-		IPPEVECOMMANDS="ippevepcl"
 		LIBCUPSOBJS="\$(COREOBJS)"
 		LIBHEADERS="\$(COREHEADERS)"
 		LIBHEADERSPRIV="\$(COREHEADERSPRIV)"

examples/Makefile

@@ -1,10 +1,11 @@
 #
-# PPD compiler example makefile for CUPS.
+# Example files makefile for CUPS.
 #
-# Copyright 2007-2011 by Apple Inc.
-# Copyright 2002-2005 by Easy Software Products.
+# Copyright © 2007-2019 by Apple Inc.
+# Copyright © 2002-2005 by Easy Software Products.
 #
-# Licensed under Apache License v2.0.  See the file "LICENSE" for more information.
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
 #
 
 #
@@ -18,18 +19,86 @@ include ../Makedefs
 # Examples...
 #
 
-EXAMPLES =	\
-		color.drv \
-		constraint.drv \
-		custom.drv \
-		grouping.drv \
-		laserjet-basic.drv \
-		laserjet-pjl.drv \
-		minimum.drv \
-		postscript.drv \
-		r300-basic.drv \
-		r300-colorman.drv \
-		r300-remote.drv
+DRVFILES 	=	\
+			color.drv \
+			constraint.drv \
+			custom.drv \
+			grouping.drv \
+			laserjet-basic.drv \
+			laserjet-pjl.drv \
+			minimum.drv \
+			postscript.drv \
+			r300-basic.drv \
+			r300-colorman.drv \
+			r300-remote.drv
+DATAFILES	=	\
+			color.jpg \
+			document-a4.pdf \
+			document-a4.ps \
+			document-letter.pdf \
+			document-letter.ps \
+			gray.jpg \
+			onepage-a4.pdf \
+			onepage-a4.ps \
+			onepage-letter.pdf \
+			onepage-letter.ps \
+			testfile.jpg \
+			testfile.pcl \
+			testfile.pdf \
+			testfile.ps \
+			testfile.txt
+TESTFILES	=	\
+			cancel-current-job.test \
+			create-job-format.test \
+			create-job-sheets.test \
+			create-job-timeout.test \
+			create-job.test \
+			create-printer-subscription.test \
+			cups-create-local-printer.test \
+			fax-job.test \
+			get-completed-jobs.test \
+			get-devices.test \
+			get-job-attributes.test \
+			get-job-attributes2.test \
+			get-job-template-attributes.test \
+			get-jobs.test \
+			get-notifications.test \
+			get-ppd-printer.test \
+			get-ppd.test \
+			get-ppds-drv-only.test \
+			get-ppds-language.test \
+			get-ppds-make-and-model.test \
+			get-ppds-make.test \
+			get-ppds-product.test \
+			get-ppds-psversion.test \
+			get-ppds.test \
+			get-printer-attributes-suite.test \
+			get-printer-attributes.test \
+			get-printer-description-attributes.test \
+			get-printers-printer-id.test \
+			get-printers.test \
+			get-subscriptions.test \
+			identify-printer-display.test \
+			identify-printer-multiple.test \
+			identify-printer.test \
+			ipp-1.1.test \
+			ipp-2.0.test \
+			ipp-2.1.test \
+			ipp-2.2.test \
+			ipp-backend.test \
+			ipp-everywhere.test \
+			print-job-and-wait.test \
+			print-job-deflate.test \
+			print-job-gzip.test \
+			print-job-hold.test \
+			print-job-letter.test \
+			print-job-manual.test \
+			print-job-media-col.test \
+			print-job-password.test \
+			print-job.test \
+			print-uri.test \
+			set-attrs-hold.test \
+			validate-job.test
 
 
 #
@@ -79,10 +148,19 @@ install:	all install-data install-headers install-libs install-exec
 #
 
 install-data:
+	echo Installing sample PPD compiler files in $(DATADIR)/examples...
 	$(INSTALL_DIR) $(DATADIR)/examples
 	for file in $(EXAMPLES); do \
 		$(INSTALL_DATA) $$file $(DATADIR)/examples; \
 	done
+	echo Installing sample ipptool files in $(DATADIR)/ipptool...
+	$(INSTALL_DIR) -m 755 $(DATADIR)/ipptool
+	for file in $(DATAFILES); do \
+		$(INSTALL_COMPDATA) $$file $(DATADIR)/ipptool; \
+	done
+	for file in $(TESTFILES); do \
+		$(INSTALL_DATA) $$file $(DATADIR)/ipptool; \
+	done
 
 
 #
@@ -111,7 +189,16 @@ install-libs:
 #
 
 uninstall:
+	echo Uninstalling sample PPD compiler files from $(DATADIR)/examples...
 	for file in $(EXAMPLES); do \
 		$(RM) $(DATADIR)/examples/$$file; \
 	done
 	-$(RMDIR) $(DATADIR)/examples
+	echo Uninstalling sample ipptool files from $(DATADIR)/ipptool...
+	for file in $(DATAFILES); do \
+		$(RM) $(DATADIR)/ipptool/$$file; \
+	done
+	for file in $(TESTFILES); do \
+		$(RM) $(DATADIR)/ipptool/$$file; \
+	done
+	-$(RMDIR) $(DATADIR)/ipptool

examples/print-job-letter.test

@@ -0,0 +1,30 @@
+# Print a test page using print-job
+{
+	# The name of the test...
+	NAME "Print file using Print-Job"
+
+	# The operation to use
+	OPERATION Print-Job
+
+	# Attributes, starting in the operation group...
+	GROUP operation-attributes-tag
+	ATTR charset attributes-charset utf-8
+	ATTR language attributes-natural-language en
+	ATTR uri printer-uri $uri
+	ATTR name requesting-user-name $user
+	ATTR mimeMediaType document-format $filetype
+
+	GROUP job-attributes-tag
+	ATTR integer copies 1
+	ATTR keyword media na_letter_8.5x11in
+
+	FILE $filename
+
+	# What statuses are OK?
+	STATUS successful-ok
+	STATUS successful-ok-ignored-or-substituted-attributes
+
+	# What attributes do we expect?
+	EXPECT job-id
+	EXPECT job-uri
+}

packaging/cups.list.in

@@ -299,8 +299,8 @@ f 0555 root sys $SERVERBIN/filter/rastertoepson filter/rastertoepson
 f 0555 root sys $SERVERBIN/filter/rastertohp filter/rastertohp
 f 0555 root sys $SERVERBIN/filter/rastertopwg filter/rastertopwg
 d 0755 root sys $SERVERBIN/ippeveprinter -
-f 0555 root sys $SERVERBIN/ippeveprinter/ippevepcl test/ippevepcl
-f 0555 root sys $SERVERBIN/ippeveprinter/ippeveps test/ippeveps
+f 0555 root sys $SERVERBIN/ippeveprinter/ippevepcl tools/ippevepcl
+f 0555 root sys $SERVERBIN/ippeveprinter/ippeveps tools/ippeveps
 d 0755 root sys $SERVERBIN/notifier -
 f 0555 root sys $SERVERBIN/notifier/mailto notifier/mailto
 
@@ -338,11 +338,11 @@ l 0755 root sys /usr/etc/lpc $SBINDIR/lpc
 d 0755 root sys $BINDIR -
 f 0555 root sys $BINDIR/cancel systemv/cancel
 f 0555 root sys $BINDIR/cupstestppd systemv/cupstestppd
-f 0555 root sys $BINDIR/ippeveprinter test/ippeveprinter
+f 0555 root sys $BINDIR/ippeveprinter tools/ippeveprinter
 %if DNSSD_BACKEND
-f 0555 root sys $BINDIR/ippfind test/ippfind
+f 0555 root sys $BINDIR/ippfind tools/ippfind
 %endif
-f 0555 root sys $BINDIR/ipptool test/ipptool
+f 0555 root sys $BINDIR/ipptool tools/ipptool
 f 0555 root sys $BINDIR/lp systemv/lp
 f 0555 root sys $BINDIR/lpoptions systemv/lpoptions
 f 0555 root sys $BINDIR/lpq berkeley/lpq
@@ -359,20 +359,12 @@ l 0755 root sys /usr/bsd/lprm $BINDIR/lprm
 # DSOs
 %if DSOLIBS
 %subpackage libs
-%system hpux
-f 0555 root sys $LIBDIR/libcups.sl.2 cups/libcups.sl.2 nostrip()
-l 0755 root sys $LIBDIR/libcups.sl libcups.sl.2
-f 0555 root sys $LIBDIR/libcupsimage.sl.2 filter/libcupsimage.sl.2 nostrip()
-l 0755 root sys $LIBDIR/libcupsimage.sl libcupsimage.sl.2
-%system aix
-f 0555 root sys $LIBDIR/libcups_s.a cups/libcups_s.a nostrip()
-f 0555 root sys $LIBDIR/libcupsimage_s.a filter/libcupsimage_s.a nostrip()
 %system darwin
 f 0555 root sys $LIBDIR/libcups.2.dylib cups/libcups.2.dylib nostrip()
 l 0755 root sys $LIBDIR/libcups.dylib libcups.2.dylib
 f 0555 root sys $LIBDIR/libcupsimage.2.dylib filter/libcupsimage.2.dylib nostrip()
 l 0755 root sys $LIBDIR/libcupsimage.dylib libcupsimage.2.dylib
-%system !hpux !aix !darwin
+%system !darwin
 f 0555 root sys $LIBDIR/libcups.so.2 cups/libcups.so.2 nostrip()
 l 0755 root sys $LIBDIR/libcups.so libcups.so.2
 f 0555 root sys $LIBDIR/libcupsimage.so.2 filter/libcupsimage.so.2 nostrip()
@@ -431,17 +423,11 @@ d 0755 root sys $DATADIR/examples -
 f 0444 root sys $DATADIR/examples examples/*.drv
 
 d 0755 root sys $DATADIR/ipptool -
-f 0444 root sys $DATADIR/ipptool/create-printer-subscription.test test/create-printer-subscription.test
-f 0444 root sys $DATADIR/ipptool/get-completed-jobs.test test/get-completed-jobs.test
-f 0444 root sys $DATADIR/ipptool/get-jobs.test test/get-jobs.test
-f 0444 root sys $DATADIR/ipptool/get-printer-attributes.test test/get-printer-attributes.test
-f 0444 root sys $DATADIR/ipptool/print-job.test test/print-job.test
-f 0444 root sys $DATADIR/ipptool test/document-*.p*
-f 0444 root sys $DATADIR/ipptool test/ipp-*.test
-f 0444 root sys $DATADIR/ipptool test/onepage-*.p*
-f 0444 root sys $DATADIR/ipptool test/testfile.*
-f 0444 root sys $DATADIR/ipptool/color.jpg test/color.jpg
-f 0444 root sys $DATADIR/ipptool/gray.jpg test/gray.jpg
+f 0444 root sys $DATADIR/ipptool examples/*.jpg
+f 0444 root sys $DATADIR/ipptool examples/*.test
+f 0444 root sys $DATADIR/ipptool examples/document-*.p*
+f 0444 root sys $DATADIR/ipptool examples/onepage-*.p*
+f 0444 root sys $DATADIR/ipptool examples/testfile.*
 
 d 0755 root sys $DATADIR/mime -
 f 0444 root sys $DATADIR/mime/mime.convs conf/mime.convs
@@ -541,7 +527,7 @@ f 0444 root sys $LIBDIR/libcupsimage.a filter/libcupsimage.a
 
 d 0755 root sys $DOCDIR/help -
 f 0444 root sys $DOCDIR/help doc/help/api*.html
-f 0444 root sys $DOCDIR/help/cupspm.html doc/help/cupspm.html
+f 0444 root sys $DOCDIR/help doc/help/cupspm.*
 f 0444 root sys $DOCDIR/help/postscript-driver.html doc/help/postscript-driver.html
 f 0444 root sys $DOCDIR/help/ppd-compiler.html doc/help/ppd-compiler.html
 f 0444 root sys $DOCDIR/help/raster-driver.html doc/help/raster-driver.html
@@ -555,8 +541,10 @@ f 0444 root sys $DOCDIR doc/*.html
 f 0444 root sys $DOCDIR/apple-touch-icon.png doc/apple-touch-icon.png
 d 0755 root sys $DOCDIR/help -
 f 0444 root sys $DOCDIR/help/accounting.html doc/help/accounting.html
+f 0444 root sys $DOCDIR/help/admin.html doc/help/admin.html
 f 0444 root sys $DOCDIR/help/cgi.html doc/help/cgi.html
 f 0444 root sys $DOCDIR/help/encryption.html doc/help/encryption.html
+f 0444 root sys $DOCDIR/help/firewalls.html doc/help/firewalls.html
 f 0444 root sys $DOCDIR/help/glossary.html doc/help/glossary.html
 f 0444 root sys $DOCDIR/help/kerberos.html doc/help/kerberos.html
 f 0444 root sys $DOCDIR/help/license.html doc/help/license.html

packaging/cups.spec.in

@@ -413,7 +413,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %dir /usr/share/doc/cups/help
 /usr/share/doc/cups/help/api*.html
-/usr/share/doc/cups/help/cupspm.html
+/usr/share/doc/cups/help/cupspm.*
 /usr/share/doc/cups/help/postscript-driver.html
 /usr/share/doc/cups/help/ppd-compiler.html
 /usr/share/doc/cups/help/raster-driver.html

tools/Dependencies

@@ -1,6 +1,7 @@
 ippevepcl.o: ippevepcl.c ippevecommon.h ../cups/cups.h ../cups/file.h \
   ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h ../cups/raster.h
+  ../cups/language.h ../cups/pwg.h ../cups/raster.h \
+  ../cups/string-private.h ../config.h dither.h
 ippeveprinter.o: ippeveprinter.c ../cups/cups-private.h \
   ../cups/string-private.h ../config.h ../cups/versioning.h \
   ../cups/array-private.h ../cups/array.h ../cups/ipp-private.h \
@@ -11,7 +12,9 @@ ippeveprinter.o: ippeveprinter.c ../cups/cups-private.h \
   ../cups/raster.h printer-png.h
 ippeveps.o: ippeveps.c ippevecommon.h ../cups/cups.h ../cups/file.h \
   ../cups/versioning.h ../cups/ipp.h ../cups/http.h ../cups/array.h \
-  ../cups/language.h ../cups/pwg.h ../cups/raster.h ../cups/ppd.h
+  ../cups/language.h ../cups/pwg.h ../cups/raster.h \
+  ../cups/string-private.h ../config.h ../cups/ppd-private.h \
+  ../cups/ppd.h ../cups/pwg-private.h
 ippfind.o: ippfind.c ../cups/cups-private.h ../cups/string-private.h \
   ../config.h ../cups/versioning.h ../cups/array-private.h \
   ../cups/array.h ../cups/ipp-private.h ../cups/cups.h ../cups/file.h \

tools/Makefile

@@ -1,63 +1,29 @@
 #
-# IPP test makefile for CUPS.
+# IPP tools makefile for CUPS.
 #
-# Copyright 2007-2019 by Apple Inc.
-# Copyright 1997-2006 by Easy Software Products, all rights reserved.
+# 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 information.
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
 #
 
 include ../Makedefs
 
 
-#
-# Sample test files.
-#
-
-DATAFILES	=	\
-			color.jpg \
-			document-a4.pdf \
-			document-a4.ps \
-			document-letter.pdf \
-			document-letter.ps \
-			gray.jpg \
-			onepage-a4.pdf \
-			onepage-a4.ps \
-			onepage-letter.pdf \
-			onepage-letter.ps \
-			testfile.jpg \
-			testfile.pcl \
-			testfile.pdf \
-			testfile.ps \
-			testfile.txt
-TESTFILES	=	\
-			create-printer-subscription.test \
-			get-completed-jobs.test \
-			get-jobs.test \
-			get-notifications.test \
-			get-printer-attributes.test \
-			get-printer-attributes-suite.test \
-			get-subscriptions.test \
-			ipp-1.1.test \
-			ipp-2.0.test \
-			ipp-2.1.test \
-			ipp-2.2.test \
-			ipp-everywhere.test \
-			print-job.test \
-			print-job-deflate.test \
-			print-job-gzip.test \
-			validate-job.test
 OBJS		=	\
 			ippevepcl.o \
 			ippeveprinter.o \
 			ippeveps.o \
 			ippfind.o \
 			ipptool.o
-TARGETS		=	\
-			$(IPPEVECOMMANDS) \
+IPPTOOLS	=	\
 			ippeveprinter \
 			$(IPPFIND_BIN) \
-			ipptool \
+			ipptool
+TARGETS		=	\
+			$(IPPEVECOMMANDS) \
+			$(IPPTOOLS) \
 			$(LOCALTARGET)
 
 
@@ -87,7 +53,7 @@ unittests:
 #
 
 clean:
-	$(RM) $(TARGETS) $(OBJS)
+	$(RM) $(IPPTOOLS) $(IPPEVECOMMANDS) $(OBJS)
 	$(RM) ippeveprinter-static ippfind-static ipptool-static
 
 
@@ -111,14 +77,6 @@ install:	all install-data install-headers install-libs install-exec
 #
 
 install-data:
-	echo Installing sample ipptool files in $(DATADIR)/ipptool...
-	$(INSTALL_DIR) -m 755 $(DATADIR)/ipptool
-	for file in $(DATAFILES); do \
-		$(INSTALL_COMPDATA) $$file $(DATADIR)/ipptool; \
-	done
-	for file in $(TESTFILES); do \
-		$(INSTALL_DATA) $$file $(DATADIR)/ipptool; \
-	done
 
 
 #
@@ -126,27 +84,22 @@ install-data:
 #
 
 install-exec:
-	echo Installing ipptool in $(BINDIR)...
+	echo Installing IPP tools in $(BINDIR)...
 	$(INSTALL_DIR) -m 755 $(BINDIR)
-	$(INSTALL_BIN) ippeveprinter $(BINDIR)
-	if test -x ippfind; then \
-		$(INSTALL_BIN) ippfind $(BINDIR); \
-	fi
-	$(INSTALL_BIN) ipptool $(BINDIR)
+	for file in $(IPPTOOLS); do \
+		$(INSTALL_BIN) $$file $(BINDIR); \
+	done
+	echo Installing printer commands in $(SERVERBIN)/ippeveprinter...
 	$(INSTALL_DIR) -m 755 $(SERVERBIN)/ippeveprinter
 	for file in $(IPPEVECOMMANDS); do \
 		$(INSTALL_BIN) $$file $(SERVERBIN)/ippeveprinter; \
 	done
 	if test "x$(SYMROOT)" != "x"; then \
 		$(INSTALL_DIR) $(SYMROOT); \
-		cp ippeveprinter $(SYMROOT); \
-		dsymutil $(SYMROOT)/ippeveprinter; \
-		if test -x ippfind; then \
-			cp ippfind $(SYMROOT); \
-			dsymutil $(SYMROOT)/ippfind; \
-		fi; \
-		cp ipptool $(SYMROOT); \
-		dsymutil $(SYMROOT)/ipptool; \
+		for file in $(IPPTOOLS) $(IPPEVECOMMANDS); do
+			cp $$file $(SYMROOT); \
+			dsymutil $(SYMROOT)/$$file; \
+		done; \
 	fi
 
 
@@ -169,22 +122,16 @@ install-libs:
 #
 
 uninstall:
-	echo Uninstalling sample ipptool files from $(DATADIR)/ipptool...
-	for file in ippeveprinter ippfind ipptool; do \
+	echo Uninstalling IPP tools from $(BINDIR)...
+	for file in $(IPPTOOLS); do \
 		$(RM) $(BINDIR)/$$file; \
 	done
 	-$(RMDIR) $(BINDIR)
+	echo Uninstalling print commands from $(SERVERBIN)/ippeveprinter...
 	for file in $(IPPEVECOMMANDS); do \
 		$(RM) $(SERVERBIN)/ippeveprinter/$$file; \
 	done
 	-$(RMDIR) $(SERVERBIN)/ippeveprinter
-	for file in $(DATAFILES); do \
-		$(RM) $(DATADIR)/ipptool/$$file; \
-	done
-	for file in $(TESTFILES); do \
-		$(RM) $(DATADIR)/ipptool/$$file; \
-	done
-	-$(RMDIR) $(DATADIR)/ipptool
 
 
 #
@@ -210,7 +157,7 @@ ippeveprinter:	ippeveprinter.o ../cups/$(LIBCUPSSTATIC)
 
 ippeveprinter-static:	ippeveprinter.o ../cups/$(LIBCUPS)
 	echo Linking $@...
-	$(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o  ../cups/$(LIBCUPSSTATIC) \
+	$(LD_CC) $(ALL_LDFLAGS) -o $@ ippeveprinter.o ../cups/$(LIBCUPSSTATIC) \
 		$(LIBGSSAPI) $(SSLLIBS) $(DNSSDLIBS) $(COMMONLIBS) $(LIBZ)
 	$(CODE_SIGN) -s "$(CODE_SIGN_IDENTITY)" $@
 
@@ -278,10 +225,10 @@ ipptool-static:	ipptool.o ../cups/$(LIBCUPSSTATIC)
 
 
 #
-# printer-png.h
+# Generate the header containing the data for printer.png...
 #
 
-printer-png.h:	printer.png
+pngheader:
 	echo "Generating printer-png.h from printer.png..."
 	echo "static const unsigned char printer_png[] =" >printer-png.h
 	echo "{" >>printer-png.h