diff options
| -rw-r--r-- | config-scripts/cups-common.m4 | 8 | ||||
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | examples/Makefile | 119 | ||||
| -rw-r--r-- | examples/cancel-current-job.test (renamed from test/cancel-current-job.test) | 0 | ||||
| -rw-r--r-- | examples/color.jpg (renamed from test/color.jpg) | bin | 118528 -> 118528 bytes | |||
| -rw-r--r-- | examples/create-job-format.test (renamed from test/create-job-format.test) | 0 | ||||
| -rw-r--r-- | examples/create-job-sheets.test (renamed from test/create-job-sheets.test) | 0 | ||||
| -rw-r--r-- | examples/create-job-timeout.test (renamed from test/create-job-timeout.test) | 0 | ||||
| -rw-r--r-- | examples/create-job.test (renamed from test/create-job.test) | 0 | ||||
| -rw-r--r-- | examples/create-printer-subscription.test (renamed from test/create-printer-subscription.test) | 0 | ||||
| -rw-r--r-- | examples/cups-create-local-printer.test (renamed from test/cups-create-local-printer.test) | 0 | ||||
| -rw-r--r-- | examples/document-a4.pdf (renamed from test/document-a4.pdf) | bin | 1062429 -> 1062429 bytes | |||
| -rw-r--r-- | examples/document-a4.ps (renamed from test/document-a4.ps) | 0 | ||||
| -rw-r--r-- | examples/document-a4.sla (renamed from test/document-a4.sla) | 0 | ||||
| -rw-r--r-- | examples/document-letter.pdf (renamed from test/document-letter.pdf) | bin | 1430525 -> 1430525 bytes | |||
| -rw-r--r-- | examples/document-letter.ps (renamed from test/document-letter.ps) | 0 | ||||
| -rw-r--r-- | examples/document-letter.sla (renamed from test/document-letter.sla) | 0 | ||||
| -rw-r--r-- | examples/fax-job.test (renamed from test/fax-job.test) | 0 | ||||
| -rw-r--r-- | examples/get-completed-jobs.test (renamed from test/get-completed-jobs.test) | 0 | ||||
| -rw-r--r-- | examples/get-devices.test (renamed from test/get-devices.test) | 0 | ||||
| -rw-r--r-- | examples/get-job-attributes.test (renamed from test/get-job-attributes.test) | 0 | ||||
| -rw-r--r-- | examples/get-job-attributes2.test (renamed from test/get-job-attributes2.test) | 0 | ||||
| -rw-r--r-- | examples/get-job-template-attributes.test (renamed from test/get-job-template-attributes.test) | 0 | ||||
| -rw-r--r-- | examples/get-jobs.test (renamed from test/get-jobs.test) | 0 | ||||
| -rw-r--r-- | examples/get-notifications.test (renamed from test/get-notifications.test) | 0 | ||||
| -rw-r--r-- | examples/get-ppd-printer.test (renamed from test/get-ppd-printer.test) | 0 | ||||
| -rw-r--r-- | examples/get-ppd.test (renamed from test/get-ppd.test) | 0 | ||||
| -rw-r--r-- | examples/get-ppds-drv-only.test (renamed from test/get-ppds-drv-only.test) | 0 | ||||
| -rw-r--r-- | examples/get-ppds-language.test (renamed from test/get-ppds-language.test) | 0 | ||||
| -rw-r--r-- | examples/get-ppds-make-and-model.test (renamed from test/get-ppds-make-and-model.test) | 0 | ||||
| -rw-r--r-- | examples/get-ppds-make.test (renamed from test/get-ppds-make.test) | 0 | ||||
| -rw-r--r-- | examples/get-ppds-product.test (renamed from test/get-ppds-product.test) | 0 | ||||
| -rw-r--r-- | examples/get-ppds-psversion.test (renamed from test/get-ppds-psversion.test) | 0 | ||||
| -rw-r--r-- | examples/get-ppds.test (renamed from test/get-ppds.test) | 0 | ||||
| -rw-r--r-- | examples/get-printer-attributes-suite.test (renamed from test/get-printer-attributes-suite.test) | 0 | ||||
| -rw-r--r-- | examples/get-printer-attributes.test (renamed from test/get-printer-attributes.test) | 0 | ||||
| -rw-r--r-- | examples/get-printer-description-attributes.test (renamed from test/get-printer-description-attributes.test) | 0 | ||||
| -rw-r--r-- | examples/get-printers-printer-id.test (renamed from test/get-printers-printer-id.test) | 0 | ||||
| -rw-r--r-- | examples/get-printers.test (renamed from test/get-printers.test) | 0 | ||||
| -rw-r--r-- | examples/get-subscriptions.test (renamed from test/get-subscriptions.test) | 0 | ||||
| -rw-r--r-- | examples/gray.jpg (renamed from test/gray.jpg) | bin | 134055 -> 134055 bytes | |||
| -rw-r--r-- | examples/identify-printer-display.test (renamed from test/identify-printer-display.test) | 0 | ||||
| -rw-r--r-- | examples/identify-printer-multiple.test (renamed from test/identify-printer-multiple.test) | 0 | ||||
| -rw-r--r-- | examples/identify-printer.test (renamed from test/identify-printer.test) | 0 | ||||
| -rw-r--r-- | examples/ipp-1.1.test (renamed from test/ipp-1.1.test) | 0 | ||||
| -rw-r--r-- | examples/ipp-2.0.test (renamed from test/ipp-2.0.test) | 0 | ||||
| -rw-r--r-- | examples/ipp-2.1.test (renamed from test/ipp-2.1.test) | 0 | ||||
| -rw-r--r-- | examples/ipp-2.2.test (renamed from test/ipp-2.2.test) | 0 | ||||
| -rw-r--r-- | examples/ipp-backend.test (renamed from test/ipp-backend.test) | 0 | ||||
| -rw-r--r-- | examples/ipp-everywhere.test (renamed from test/ipp-everywhere.test) | 0 | ||||
| -rw-r--r-- | examples/onepage-a4-300-black-1.pwg.gz (renamed from test/onepage-a4-300-black-1.pwg.gz) | bin | 152826 -> 152826 bytes | |||
| -rw-r--r-- | examples/onepage-a4.pdf (renamed from test/onepage-a4.pdf) | bin | 50961 -> 50961 bytes | |||
| -rw-r--r-- | examples/onepage-a4.ps (renamed from test/onepage-a4.ps) | 0 | ||||
| -rw-r--r-- | examples/onepage-a4.sla (renamed from test/onepage-a4.sla) | 0 | ||||
| -rw-r--r-- | examples/onepage-letter-300-black-1.pwg.gz (renamed from test/onepage-letter-300-black-1.pwg.gz) | bin | 137724 -> 137724 bytes | |||
| -rw-r--r-- | examples/onepage-letter.pdf (renamed from test/onepage-letter.pdf) | bin | 49476 -> 49476 bytes | |||
| -rw-r--r-- | examples/onepage-letter.ps (renamed from test/onepage-letter.ps) | 0 | ||||
| -rw-r--r-- | examples/onepage-letter.sla (renamed from test/onepage-letter.sla) | 0 | ||||
| -rw-r--r-- | examples/print-job-and-wait.test (renamed from test/print-job-and-wait.test) | 0 | ||||
| -rw-r--r-- | examples/print-job-deflate.test (renamed from test/print-job-deflate.test) | 0 | ||||
| -rw-r--r-- | examples/print-job-gzip.test (renamed from test/print-job-gzip.test) | 0 | ||||
| -rw-r--r-- | examples/print-job-hold.test (renamed from test/print-job-hold.test) | 0 | ||||
| -rw-r--r-- | examples/print-job-letter.test | 30 | ||||
| -rw-r--r-- | examples/print-job-manual.test (renamed from test/print-job-manual.test) | 0 | ||||
| -rw-r--r-- | examples/print-job-media-col.test (renamed from test/print-job-media-col.test) | 0 | ||||
| -rw-r--r-- | examples/print-job-password.test (renamed from test/print-job-password.test) | 0 | ||||
| -rw-r--r-- | examples/print-job.test (renamed from test/print-job.test) | 0 | ||||
| -rw-r--r-- | examples/print-uri.test (renamed from test/print-uri.test) | 0 | ||||
| -rw-r--r-- | examples/set-attrs-hold.test (renamed from test/set-attrs-hold.test) | 0 | ||||
| -rw-r--r-- | examples/testfile.jpg (renamed from test/testfile.jpg) | bin | 204156 -> 204156 bytes | |||
| -rw-r--r-- | examples/testfile.pcl (renamed from test/testfile.pcl) | 0 | ||||
| -rw-r--r-- | examples/testfile.pdf (renamed from test/testfile.pdf) | bin | 279746 -> 279746 bytes | |||
| -rw-r--r-- | examples/testfile.ps (renamed from test/testfile.ps) | 0 | ||||
| -rw-r--r-- | examples/testfile.txt (renamed from test/testfile.txt) | 0 | ||||
| -rw-r--r-- | examples/validate-job.test (renamed from test/validate-job.test) | 0 | ||||
| -rw-r--r-- | packaging/cups.list.in | 40 | ||||
| -rw-r--r-- | packaging/cups.spec.in | 2 | ||||
| -rw-r--r-- | tools/Dependencies (renamed from test/Dependencies) | 7 | ||||
| -rw-r--r-- | tools/Makefile (renamed from test/Makefile) | 105 | ||||
| -rw-r--r-- | tools/dither.h (renamed from test/dither.h) | 0 | ||||
| -rw-r--r-- | tools/ippevecommon.h (renamed from test/ippevecommon.h) | 0 | ||||
| -rw-r--r-- | tools/ippevepcl.c (renamed from test/ippevepcl.c) | 0 | ||||
| -rw-r--r-- | tools/ippeveprinter.c (renamed from test/ippeveprinter.c) | 0 | ||||
| -rw-r--r-- | tools/ippeveps.c (renamed from test/ippeveps.c) | 0 | ||||
| -rw-r--r-- | tools/ippfind.c (renamed from test/ippfind.c) | 0 | ||||
| -rw-r--r-- | tools/ipptool.c (renamed from test/ipptool.c) | 0 | ||||
| -rw-r--r-- | tools/printer-png.h (renamed from test/printer-png.h) | 0 | ||||
| -rw-r--r-- | tools/printer.opacity (renamed from test/printer.opacity) | bin | 42248 -> 42248 bytes | |||
| -rw-r--r-- | tools/printer.png (renamed from test/printer.png) | bin | 7079 -> 7079 bytes |
89 files changed, 185 insertions, 134 deletions
diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4 index 59629fd47..0d5a432e3 100644 --- a/config-scripts/cups-common.m4 +++ b/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)" @@ -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)" diff --git a/examples/Makefile b/examples/Makefile index 307252f12..8d086dc0b 100644 --- a/examples/Makefile +++ b/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 diff --git a/test/cancel-current-job.test b/examples/cancel-current-job.test index 630023174..630023174 100644 --- a/test/cancel-current-job.test +++ b/examples/cancel-current-job.test diff --git a/test/color.jpg b/examples/color.jpg Binary files differindex 5dd98ce24..5dd98ce24 100644 --- a/test/color.jpg +++ b/examples/color.jpg diff --git a/test/create-job-format.test b/examples/create-job-format.test index 60769a037..60769a037 100644 --- a/test/create-job-format.test +++ b/examples/create-job-format.test diff --git a/test/create-job-sheets.test b/examples/create-job-sheets.test index 08861863b..08861863b 100644 --- a/test/create-job-sheets.test +++ b/examples/create-job-sheets.test diff --git a/test/create-job-timeout.test b/examples/create-job-timeout.test index 514924d42..514924d42 100644 --- a/test/create-job-timeout.test +++ b/examples/create-job-timeout.test diff --git a/test/create-job.test b/examples/create-job.test index 7d1eb74ef..7d1eb74ef 100644 --- a/test/create-job.test +++ b/examples/create-job.test diff --git a/test/create-printer-subscription.test b/examples/create-printer-subscription.test index 8f8d3e9ae..8f8d3e9ae 100644 --- a/test/create-printer-subscription.test +++ b/examples/create-printer-subscription.test diff --git a/test/cups-create-local-printer.test b/examples/cups-create-local-printer.test index bdf4fc54d..bdf4fc54d 100644 --- a/test/cups-create-local-printer.test +++ b/examples/cups-create-local-printer.test diff --git a/test/document-a4.pdf b/examples/document-a4.pdf Binary files differindex bd91ca91e..bd91ca91e 100644 --- a/test/document-a4.pdf +++ b/examples/document-a4.pdf diff --git a/test/document-a4.ps b/examples/document-a4.ps index a97945916..a97945916 100644 --- a/test/document-a4.ps +++ b/examples/document-a4.ps diff --git a/test/document-a4.sla b/examples/document-a4.sla index 95d518f40..95d518f40 100644 --- a/test/document-a4.sla +++ b/examples/document-a4.sla diff --git a/test/document-letter.pdf b/examples/document-letter.pdf Binary files differindex 84a66aba4..84a66aba4 100644 --- a/test/document-letter.pdf +++ b/examples/document-letter.pdf diff --git a/test/document-letter.ps b/examples/document-letter.ps index 7f627f430..7f627f430 100644 --- a/test/document-letter.ps +++ b/examples/document-letter.ps diff --git a/test/document-letter.sla b/examples/document-letter.sla index 7d9e9a913..7d9e9a913 100644 --- a/test/document-letter.sla +++ b/examples/document-letter.sla diff --git a/test/fax-job.test b/examples/fax-job.test index dd35532d0..dd35532d0 100644 --- a/test/fax-job.test +++ b/examples/fax-job.test diff --git a/test/get-completed-jobs.test b/examples/get-completed-jobs.test index 22079ed47..22079ed47 100644 --- a/test/get-completed-jobs.test +++ b/examples/get-completed-jobs.test diff --git a/test/get-devices.test b/examples/get-devices.test index c31a1b129..c31a1b129 100644 --- a/test/get-devices.test +++ b/examples/get-devices.test diff --git a/test/get-job-attributes.test b/examples/get-job-attributes.test index c40e242ce..c40e242ce 100644 --- a/test/get-job-attributes.test +++ b/examples/get-job-attributes.test diff --git a/test/get-job-attributes2.test b/examples/get-job-attributes2.test index d0891b56b..d0891b56b 100644 --- a/test/get-job-attributes2.test +++ b/examples/get-job-attributes2.test diff --git a/test/get-job-template-attributes.test b/examples/get-job-template-attributes.test index 033016095..033016095 100644 --- a/test/get-job-template-attributes.test +++ b/examples/get-job-template-attributes.test diff --git a/test/get-jobs.test b/examples/get-jobs.test index 6dbfc74ea..6dbfc74ea 100644 --- a/test/get-jobs.test +++ b/examples/get-jobs.test diff --git a/test/get-notifications.test b/examples/get-notifications.test index fa8d00bd2..fa8d00bd2 100644 --- a/test/get-notifications.test +++ b/examples/get-notifications.test diff --git a/test/get-ppd-printer.test b/examples/get-ppd-printer.test index 4f723f88b..4f723f88b 100644 --- a/test/get-ppd-printer.test +++ b/examples/get-ppd-printer.test diff --git a/test/get-ppd.test b/examples/get-ppd.test index 24a935e4d..24a935e4d 100644 --- a/test/get-ppd.test +++ b/examples/get-ppd.test diff --git a/test/get-ppds-drv-only.test b/examples/get-ppds-drv-only.test index e5c6de78f..e5c6de78f 100644 --- a/test/get-ppds-drv-only.test +++ b/examples/get-ppds-drv-only.test diff --git a/test/get-ppds-language.test b/examples/get-ppds-language.test index 2ed011866..2ed011866 100644 --- a/test/get-ppds-language.test +++ b/examples/get-ppds-language.test diff --git a/test/get-ppds-make-and-model.test b/examples/get-ppds-make-and-model.test index c57b14736..c57b14736 100644 --- a/test/get-ppds-make-and-model.test +++ b/examples/get-ppds-make-and-model.test diff --git a/test/get-ppds-make.test b/examples/get-ppds-make.test index ac3f736e4..ac3f736e4 100644 --- a/test/get-ppds-make.test +++ b/examples/get-ppds-make.test diff --git a/test/get-ppds-product.test b/examples/get-ppds-product.test index b0535f7e1..b0535f7e1 100644 --- a/test/get-ppds-product.test +++ b/examples/get-ppds-product.test diff --git a/test/get-ppds-psversion.test b/examples/get-ppds-psversion.test index b7f93b670..b7f93b670 100644 --- a/test/get-ppds-psversion.test +++ b/examples/get-ppds-psversion.test diff --git a/test/get-ppds.test b/examples/get-ppds.test index a82daf89e..a82daf89e 100644 --- a/test/get-ppds.test +++ b/examples/get-ppds.test diff --git a/test/get-printer-attributes-suite.test b/examples/get-printer-attributes-suite.test index ce5de18b6..ce5de18b6 100644 --- a/test/get-printer-attributes-suite.test +++ b/examples/get-printer-attributes-suite.test diff --git a/test/get-printer-attributes.test b/examples/get-printer-attributes.test index adfb45758..adfb45758 100644 --- a/test/get-printer-attributes.test +++ b/examples/get-printer-attributes.test diff --git a/test/get-printer-description-attributes.test b/examples/get-printer-description-attributes.test index b1d813858..b1d813858 100644 --- a/test/get-printer-description-attributes.test +++ b/examples/get-printer-description-attributes.test diff --git a/test/get-printers-printer-id.test b/examples/get-printers-printer-id.test index 52e0b132f..52e0b132f 100644 --- a/test/get-printers-printer-id.test +++ b/examples/get-printers-printer-id.test diff --git a/test/get-printers.test b/examples/get-printers.test index 54f8df4c8..54f8df4c8 100644 --- a/test/get-printers.test +++ b/examples/get-printers.test diff --git a/test/get-subscriptions.test b/examples/get-subscriptions.test index 09766ffda..09766ffda 100644 --- a/test/get-subscriptions.test +++ b/examples/get-subscriptions.test diff --git a/test/gray.jpg b/examples/gray.jpg Binary files differindex 9f5459a3e..9f5459a3e 100644 --- a/test/gray.jpg +++ b/examples/gray.jpg diff --git a/test/identify-printer-display.test b/examples/identify-printer-display.test index 4957a2637..4957a2637 100644 --- a/test/identify-printer-display.test +++ b/examples/identify-printer-display.test diff --git a/test/identify-printer-multiple.test b/examples/identify-printer-multiple.test index 79b2580ce..79b2580ce 100644 --- a/test/identify-printer-multiple.test +++ b/examples/identify-printer-multiple.test diff --git a/test/identify-printer.test b/examples/identify-printer.test index b97bb71dc..b97bb71dc 100644 --- a/test/identify-printer.test +++ b/examples/identify-printer.test diff --git a/test/ipp-1.1.test b/examples/ipp-1.1.test index e406d0ecc..e406d0ecc 100644 --- a/test/ipp-1.1.test +++ b/examples/ipp-1.1.test diff --git a/test/ipp-2.0.test b/examples/ipp-2.0.test index 3746663eb..3746663eb 100644 --- a/test/ipp-2.0.test +++ b/examples/ipp-2.0.test diff --git a/test/ipp-2.1.test b/examples/ipp-2.1.test index ca66e057a..ca66e057a 100644 --- a/test/ipp-2.1.test +++ b/examples/ipp-2.1.test diff --git a/test/ipp-2.2.test b/examples/ipp-2.2.test index bd4fecda2..bd4fecda2 100644 --- a/test/ipp-2.2.test +++ b/examples/ipp-2.2.test diff --git a/test/ipp-backend.test b/examples/ipp-backend.test index c2642d375..c2642d375 100644 --- a/test/ipp-backend.test +++ b/examples/ipp-backend.test diff --git a/test/ipp-everywhere.test b/examples/ipp-everywhere.test index d7b0c445c..d7b0c445c 100644 --- a/test/ipp-everywhere.test +++ b/examples/ipp-everywhere.test diff --git a/test/onepage-a4-300-black-1.pwg.gz b/examples/onepage-a4-300-black-1.pwg.gz Binary files differindex 0a559fc16..0a559fc16 100644 --- a/test/onepage-a4-300-black-1.pwg.gz +++ b/examples/onepage-a4-300-black-1.pwg.gz diff --git a/test/onepage-a4.pdf b/examples/onepage-a4.pdf Binary files differindex 1043d8a24..1043d8a24 100644 --- a/test/onepage-a4.pdf +++ b/examples/onepage-a4.pdf diff --git a/test/onepage-a4.ps b/examples/onepage-a4.ps index 9397b89a6..9397b89a6 100644 --- a/test/onepage-a4.ps +++ b/examples/onepage-a4.ps diff --git a/test/onepage-a4.sla b/examples/onepage-a4.sla index bcc7933d1..bcc7933d1 100644 --- a/test/onepage-a4.sla +++ b/examples/onepage-a4.sla diff --git a/test/onepage-letter-300-black-1.pwg.gz b/examples/onepage-letter-300-black-1.pwg.gz Binary files differindex 8fd7386e3..8fd7386e3 100644 --- a/test/onepage-letter-300-black-1.pwg.gz +++ b/examples/onepage-letter-300-black-1.pwg.gz diff --git a/test/onepage-letter.pdf b/examples/onepage-letter.pdf Binary files differindex ead3d84c6..ead3d84c6 100644 --- a/test/onepage-letter.pdf +++ b/examples/onepage-letter.pdf diff --git a/test/onepage-letter.ps b/examples/onepage-letter.ps index dfedeb47b..dfedeb47b 100644 --- a/test/onepage-letter.ps +++ b/examples/onepage-letter.ps diff --git a/test/onepage-letter.sla b/examples/onepage-letter.sla index 078cfd76c..078cfd76c 100644 --- a/test/onepage-letter.sla +++ b/examples/onepage-letter.sla diff --git a/test/print-job-and-wait.test b/examples/print-job-and-wait.test index f6acccaef..f6acccaef 100644 --- a/test/print-job-and-wait.test +++ b/examples/print-job-and-wait.test diff --git a/test/print-job-deflate.test b/examples/print-job-deflate.test index e54028d6d..e54028d6d 100644 --- a/test/print-job-deflate.test +++ b/examples/print-job-deflate.test diff --git a/test/print-job-gzip.test b/examples/print-job-gzip.test index 2b8209c45..2b8209c45 100644 --- a/test/print-job-gzip.test +++ b/examples/print-job-gzip.test diff --git a/test/print-job-hold.test b/examples/print-job-hold.test index d70e523e7..d70e523e7 100644 --- a/test/print-job-hold.test +++ b/examples/print-job-hold.test diff --git a/examples/print-job-letter.test b/examples/print-job-letter.test new file mode 100644 index 000000000..45d909685 --- /dev/null +++ b/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 +} diff --git a/test/print-job-manual.test b/examples/print-job-manual.test index 157822833..157822833 100644 --- a/test/print-job-manual.test +++ b/examples/print-job-manual.test diff --git a/test/print-job-media-col.test b/examples/print-job-media-col.test index cafd291fb..cafd291fb 100644 --- a/test/print-job-media-col.test +++ b/examples/print-job-media-col.test diff --git a/test/print-job-password.test b/examples/print-job-password.test index 36e6a0a3a..36e6a0a3a 100644 --- a/test/print-job-password.test +++ b/examples/print-job-password.test diff --git a/test/print-job.test b/examples/print-job.test index 079dfa5e6..079dfa5e6 100644 --- a/test/print-job.test +++ b/examples/print-job.test diff --git a/test/print-uri.test b/examples/print-uri.test index aaa7d392e..aaa7d392e 100644 --- a/test/print-uri.test +++ b/examples/print-uri.test diff --git a/test/set-attrs-hold.test b/examples/set-attrs-hold.test index 213bdd2e2..213bdd2e2 100644 --- a/test/set-attrs-hold.test +++ b/examples/set-attrs-hold.test diff --git a/test/testfile.jpg b/examples/testfile.jpg Binary files differindex 418cb9359..418cb9359 100644 --- a/test/testfile.jpg +++ b/examples/testfile.jpg diff --git a/test/testfile.pcl b/examples/testfile.pcl index 4b8659767..4b8659767 100644 --- a/test/testfile.pcl +++ b/examples/testfile.pcl diff --git a/test/testfile.pdf b/examples/testfile.pdf Binary files differindex 433577179..433577179 100644 --- a/test/testfile.pdf +++ b/examples/testfile.pdf diff --git a/test/testfile.ps b/examples/testfile.ps index 54f09f664..54f09f664 100644 --- a/test/testfile.ps +++ b/examples/testfile.ps diff --git a/test/testfile.txt b/examples/testfile.txt index bad0a31e3..bad0a31e3 100644 --- a/test/testfile.txt +++ b/examples/testfile.txt diff --git a/test/validate-job.test b/examples/validate-job.test index c4140ea03..c4140ea03 100644 --- a/test/validate-job.test +++ b/examples/validate-job.test diff --git a/packaging/cups.list.in b/packaging/cups.list.in index 1d584e9ee..c442101be 100644 --- a/packaging/cups.list.in +++ b/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 diff --git a/packaging/cups.spec.in b/packaging/cups.spec.in index aaeb3cdb5..62c69e824 100644 --- a/packaging/cups.spec.in +++ b/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 diff --git a/test/Dependencies b/tools/Dependencies index c7bb16175..9a1043df8 100644 --- a/test/Dependencies +++ b/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 \ diff --git a/test/Makefile b/tools/Makefile index d2e047cb5..33ae0dfc9 100644 --- a/test/Makefile +++ b/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 diff --git a/test/dither.h b/tools/dither.h index e723d4e60..e723d4e60 100644 --- a/test/dither.h +++ b/tools/dither.h diff --git a/test/ippevecommon.h b/tools/ippevecommon.h index 627cc74e0..627cc74e0 100644 --- a/test/ippevecommon.h +++ b/tools/ippevecommon.h diff --git a/test/ippevepcl.c b/tools/ippevepcl.c index f15ea51d7..f15ea51d7 100644 --- a/test/ippevepcl.c +++ b/tools/ippevepcl.c diff --git a/test/ippeveprinter.c b/tools/ippeveprinter.c index 177e9a61a..177e9a61a 100644 --- a/test/ippeveprinter.c +++ b/tools/ippeveprinter.c diff --git a/test/ippeveps.c b/tools/ippeveps.c index 2bfc14eb4..2bfc14eb4 100644 --- a/test/ippeveps.c +++ b/tools/ippeveps.c diff --git a/test/ippfind.c b/tools/ippfind.c index 246ab4dba..246ab4dba 100644 --- a/test/ippfind.c +++ b/tools/ippfind.c diff --git a/test/ipptool.c b/tools/ipptool.c index 847dfb586..847dfb586 100644 --- a/test/ipptool.c +++ b/tools/ipptool.c diff --git a/test/printer-png.h b/tools/printer-png.h index 9a3bfef0b..9a3bfef0b 100644 --- a/test/printer-png.h +++ b/tools/printer-png.h diff --git a/test/printer.opacity b/tools/printer.opacity Binary files differindex 6551295e7..6551295e7 100644 --- a/test/printer.opacity +++ b/tools/printer.opacity diff --git a/test/printer.png b/tools/printer.png Binary files differindex bb269318d..bb269318d 100644 --- a/test/printer.png +++ b/tools/printer.png |
