Move example ipptool files to the examples directory.

Build tools directory for IPP tools.

diff --git a/config-scripts/cups-common.m4 b/config-scripts/cups-common.m4
index 59629fd4790db14a5706f7da2ce656df98c5442d..0d5a432e3213b6d8544021a9585b24c0f6dd3550 100644 (file)
--- 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)"

diff --git a/configure b/configure
index a1344af407d4e666ecefc81b7ded6263191d11bf..109ffb5f41d9fb90fc058e73b3bfc71423a4b995 100755 (executable)
--- a/configure
+++ b/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)"

diff --git a/examples/Makefile b/examples/Makefile
index 307252f12494355a8fb6f02ec443732eac34ebe6..8d086dc0bf0cfcafdca818bab26236dfb4745d57 100644 (file)
--- 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
similarity index 100%
rename from test/cancel-current-job.test
rename to examples/cancel-current-job.test

diff --git a/test/color.jpg b/examples/color.jpg
similarity index 100%
rename from test/color.jpg
rename to examples/color.jpg

diff --git a/test/create-job-format.test b/examples/create-job-format.test
similarity index 100%
rename from test/create-job-format.test
rename to examples/create-job-format.test

diff --git a/test/create-job-sheets.test b/examples/create-job-sheets.test
similarity index 100%
rename from test/create-job-sheets.test
rename to examples/create-job-sheets.test

diff --git a/test/create-job-timeout.test b/examples/create-job-timeout.test
similarity index 100%
rename from test/create-job-timeout.test
rename to examples/create-job-timeout.test

diff --git a/test/create-job.test b/examples/create-job.test
similarity index 100%
rename from test/create-job.test
rename to examples/create-job.test

diff --git a/test/create-printer-subscription.test b/examples/create-printer-subscription.test
similarity index 100%
rename from test/create-printer-subscription.test
rename to examples/create-printer-subscription.test

diff --git a/test/cups-create-local-printer.test b/examples/cups-create-local-printer.test
similarity index 100%
rename from test/cups-create-local-printer.test
rename to examples/cups-create-local-printer.test

diff --git a/test/document-a4.pdf b/examples/document-a4.pdf
similarity index 100%
rename from test/document-a4.pdf
rename to examples/document-a4.pdf

diff --git a/test/document-a4.ps b/examples/document-a4.ps
similarity index 100%
rename from test/document-a4.ps
rename to examples/document-a4.ps

diff --git a/test/document-a4.sla b/examples/document-a4.sla
similarity index 100%
rename from test/document-a4.sla
rename to examples/document-a4.sla

diff --git a/test/document-letter.pdf b/examples/document-letter.pdf
similarity index 100%
rename from test/document-letter.pdf
rename to examples/document-letter.pdf

diff --git a/test/document-letter.ps b/examples/document-letter.ps
similarity index 100%
rename from test/document-letter.ps
rename to examples/document-letter.ps

diff --git a/test/document-letter.sla b/examples/document-letter.sla
similarity index 100%
rename from test/document-letter.sla
rename to examples/document-letter.sla

diff --git a/test/fax-job.test b/examples/fax-job.test
similarity index 100%
rename from test/fax-job.test
rename to examples/fax-job.test

diff --git a/test/get-completed-jobs.test b/examples/get-completed-jobs.test
similarity index 100%
rename from test/get-completed-jobs.test
rename to examples/get-completed-jobs.test

diff --git a/test/get-devices.test b/examples/get-devices.test
similarity index 100%
rename from test/get-devices.test
rename to examples/get-devices.test

diff --git a/test/get-job-attributes.test b/examples/get-job-attributes.test
similarity index 100%
rename from test/get-job-attributes.test
rename to examples/get-job-attributes.test

diff --git a/test/get-job-attributes2.test b/examples/get-job-attributes2.test
similarity index 100%
rename from test/get-job-attributes2.test
rename to examples/get-job-attributes2.test

diff --git a/test/get-job-template-attributes.test b/examples/get-job-template-attributes.test
similarity index 100%
rename from test/get-job-template-attributes.test
rename to examples/get-job-template-attributes.test

diff --git a/test/get-jobs.test b/examples/get-jobs.test
similarity index 100%
rename from test/get-jobs.test
rename to examples/get-jobs.test

diff --git a/test/get-notifications.test b/examples/get-notifications.test
similarity index 100%
rename from test/get-notifications.test
rename to examples/get-notifications.test

diff --git a/test/get-ppd-printer.test b/examples/get-ppd-printer.test
similarity index 100%
rename from test/get-ppd-printer.test
rename to examples/get-ppd-printer.test

diff --git a/test/get-ppd.test b/examples/get-ppd.test
similarity index 100%
rename from test/get-ppd.test
rename to examples/get-ppd.test

diff --git a/test/get-ppds-drv-only.test b/examples/get-ppds-drv-only.test
similarity index 100%
rename from test/get-ppds-drv-only.test
rename to examples/get-ppds-drv-only.test

diff --git a/test/get-ppds-language.test b/examples/get-ppds-language.test
similarity index 100%
rename from test/get-ppds-language.test
rename to examples/get-ppds-language.test

diff --git a/test/get-ppds-make-and-model.test b/examples/get-ppds-make-and-model.test
similarity index 100%
rename from test/get-ppds-make-and-model.test
rename to examples/get-ppds-make-and-model.test

diff --git a/test/get-ppds-make.test b/examples/get-ppds-make.test
similarity index 100%
rename from test/get-ppds-make.test
rename to examples/get-ppds-make.test

diff --git a/test/get-ppds-product.test b/examples/get-ppds-product.test
similarity index 100%
rename from test/get-ppds-product.test
rename to examples/get-ppds-product.test

diff --git a/test/get-ppds-psversion.test b/examples/get-ppds-psversion.test
similarity index 100%
rename from test/get-ppds-psversion.test
rename to examples/get-ppds-psversion.test

diff --git a/test/get-ppds.test b/examples/get-ppds.test
similarity index 100%
rename from test/get-ppds.test
rename to examples/get-ppds.test

diff --git a/test/get-printer-attributes-suite.test b/examples/get-printer-attributes-suite.test
similarity index 100%
rename from test/get-printer-attributes-suite.test
rename to examples/get-printer-attributes-suite.test

diff --git a/test/get-printer-attributes.test b/examples/get-printer-attributes.test
similarity index 100%
rename from test/get-printer-attributes.test
rename to examples/get-printer-attributes.test

diff --git a/test/get-printer-description-attributes.test b/examples/get-printer-description-attributes.test
similarity index 100%
rename from test/get-printer-description-attributes.test
rename to examples/get-printer-description-attributes.test

diff --git a/test/get-printers-printer-id.test b/examples/get-printers-printer-id.test
similarity index 100%
rename from test/get-printers-printer-id.test
rename to examples/get-printers-printer-id.test

diff --git a/test/get-printers.test b/examples/get-printers.test
similarity index 100%
rename from test/get-printers.test
rename to examples/get-printers.test

diff --git a/test/get-subscriptions.test b/examples/get-subscriptions.test
similarity index 100%
rename from test/get-subscriptions.test
rename to examples/get-subscriptions.test

diff --git a/test/gray.jpg b/examples/gray.jpg
similarity index 100%
rename from test/gray.jpg
rename to examples/gray.jpg

diff --git a/test/identify-printer-display.test b/examples/identify-printer-display.test
similarity index 100%
rename from test/identify-printer-display.test
rename to examples/identify-printer-display.test

diff --git a/test/identify-printer-multiple.test b/examples/identify-printer-multiple.test
similarity index 100%
rename from test/identify-printer-multiple.test
rename to examples/identify-printer-multiple.test

diff --git a/test/identify-printer.test b/examples/identify-printer.test
similarity index 100%
rename from test/identify-printer.test
rename to examples/identify-printer.test

diff --git a/test/ipp-1.1.test b/examples/ipp-1.1.test
similarity index 100%
rename from test/ipp-1.1.test
rename to examples/ipp-1.1.test

diff --git a/test/ipp-2.0.test b/examples/ipp-2.0.test
similarity index 100%
rename from test/ipp-2.0.test
rename to examples/ipp-2.0.test

diff --git a/test/ipp-2.1.test b/examples/ipp-2.1.test
similarity index 100%
rename from test/ipp-2.1.test
rename to examples/ipp-2.1.test

diff --git a/test/ipp-2.2.test b/examples/ipp-2.2.test
similarity index 100%
rename from test/ipp-2.2.test
rename to examples/ipp-2.2.test

diff --git a/test/ipp-backend.test b/examples/ipp-backend.test
similarity index 100%
rename from test/ipp-backend.test
rename to examples/ipp-backend.test

diff --git a/test/ipp-everywhere.test b/examples/ipp-everywhere.test
similarity index 100%
rename from test/ipp-everywhere.test
rename to examples/ipp-everywhere.test

diff --git a/test/onepage-a4-300-black-1.pwg.gz b/examples/onepage-a4-300-black-1.pwg.gz
similarity index 100%
rename from test/onepage-a4-300-black-1.pwg.gz
rename to examples/onepage-a4-300-black-1.pwg.gz

diff --git a/test/onepage-a4.pdf b/examples/onepage-a4.pdf
similarity index 100%
rename from test/onepage-a4.pdf
rename to examples/onepage-a4.pdf

diff --git a/test/onepage-a4.ps b/examples/onepage-a4.ps
similarity index 100%
rename from test/onepage-a4.ps
rename to examples/onepage-a4.ps

diff --git a/test/onepage-a4.sla b/examples/onepage-a4.sla
similarity index 100%
rename from test/onepage-a4.sla
rename to examples/onepage-a4.sla

diff --git a/test/onepage-letter-300-black-1.pwg.gz b/examples/onepage-letter-300-black-1.pwg.gz
similarity index 100%
rename from test/onepage-letter-300-black-1.pwg.gz
rename to examples/onepage-letter-300-black-1.pwg.gz

diff --git a/test/onepage-letter.pdf b/examples/onepage-letter.pdf
similarity index 100%
rename from test/onepage-letter.pdf
rename to examples/onepage-letter.pdf

diff --git a/test/onepage-letter.ps b/examples/onepage-letter.ps
similarity index 100%
rename from test/onepage-letter.ps
rename to examples/onepage-letter.ps

diff --git a/test/onepage-letter.sla b/examples/onepage-letter.sla
similarity index 100%
rename from test/onepage-letter.sla
rename to examples/onepage-letter.sla

diff --git a/test/print-job-and-wait.test b/examples/print-job-and-wait.test
similarity index 100%
rename from test/print-job-and-wait.test
rename to examples/print-job-and-wait.test

diff --git a/test/print-job-deflate.test b/examples/print-job-deflate.test
similarity index 100%
rename from test/print-job-deflate.test
rename to examples/print-job-deflate.test

diff --git a/test/print-job-gzip.test b/examples/print-job-gzip.test
similarity index 100%
rename from test/print-job-gzip.test
rename to examples/print-job-gzip.test

diff --git a/test/print-job-hold.test b/examples/print-job-hold.test
similarity index 100%
rename from test/print-job-hold.test
rename to examples/print-job-hold.test

diff --git a/examples/print-job-letter.test b/examples/print-job-letter.test
new file mode 100644 (file)
index 0000000..45d9096
--- /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
similarity index 100%
rename from test/print-job-manual.test
rename to examples/print-job-manual.test

diff --git a/test/print-job-media-col.test b/examples/print-job-media-col.test
similarity index 100%
rename from test/print-job-media-col.test
rename to examples/print-job-media-col.test

diff --git a/test/print-job-password.test b/examples/print-job-password.test
similarity index 100%
rename from test/print-job-password.test
rename to examples/print-job-password.test

diff --git a/test/print-job.test b/examples/print-job.test
similarity index 100%
rename from test/print-job.test
rename to examples/print-job.test

diff --git a/test/print-uri.test b/examples/print-uri.test
similarity index 100%
rename from test/print-uri.test
rename to examples/print-uri.test

diff --git a/test/set-attrs-hold.test b/examples/set-attrs-hold.test
similarity index 100%
rename from test/set-attrs-hold.test
rename to examples/set-attrs-hold.test

diff --git a/test/testfile.jpg b/examples/testfile.jpg
similarity index 100%
rename from test/testfile.jpg
rename to examples/testfile.jpg

diff --git a/test/testfile.pcl b/examples/testfile.pcl
similarity index 100%
rename from test/testfile.pcl
rename to examples/testfile.pcl

diff --git a/test/testfile.pdf b/examples/testfile.pdf
similarity index 100%
rename from test/testfile.pdf
rename to examples/testfile.pdf

diff --git a/test/testfile.ps b/examples/testfile.ps
similarity index 100%
rename from test/testfile.ps
rename to examples/testfile.ps

diff --git a/test/testfile.txt b/examples/testfile.txt
similarity index 100%
rename from test/testfile.txt
rename to examples/testfile.txt

diff --git a/test/validate-job.test b/examples/validate-job.test
similarity index 100%
rename from test/validate-job.test
rename to examples/validate-job.test

diff --git a/packaging/cups.list.in b/packaging/cups.list.in
index 1d584e9ee0b9b32ee3c14ea65f3870371b3bcd4a..c442101bea529218f417578dda9ca6024b2331f4 100644 (file)
--- 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 aaeb3cdb5be3aa66cd06fe3c19dcd3499f4dd8dd..62c69e824cbaa92a0fc14833036894db2ae8d892 100644 (file)
--- 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
similarity index 85%
rename from test/Dependencies
rename to tools/Dependencies
index c7bb16175abd755526e8fdde0117ff19b496ba65..9a1043df8567d0cd3ce2219da978e3a8626c8de0 100644 (file)
--- 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
similarity index 63%
rename from test/Makefile
rename to tools/Makefile
index d2e047cb523ca431424df84d05203faa4936e3cc..33ae0dfc96e401a1d1d997ebdc0d9de657bef5e6 100644 (file)
--- 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
similarity index 100%
rename from test/dither.h
rename to tools/dither.h

diff --git a/test/ippevecommon.h b/tools/ippevecommon.h
similarity index 100%
rename from test/ippevecommon.h
rename to tools/ippevecommon.h

diff --git a/test/ippevepcl.c b/tools/ippevepcl.c
similarity index 100%
rename from test/ippevepcl.c
rename to tools/ippevepcl.c

diff --git a/test/ippeveprinter.c b/tools/ippeveprinter.c
similarity index 100%
rename from test/ippeveprinter.c
rename to tools/ippeveprinter.c

diff --git a/test/ippeveps.c b/tools/ippeveps.c
similarity index 100%
rename from test/ippeveps.c
rename to tools/ippeveps.c

diff --git a/test/ippfind.c b/tools/ippfind.c
similarity index 100%
rename from test/ippfind.c
rename to tools/ippfind.c

diff --git a/test/ipptool.c b/tools/ipptool.c
similarity index 100%
rename from test/ipptool.c
rename to tools/ipptool.c

diff --git a/test/printer-png.h b/tools/printer-png.h
similarity index 100%
rename from test/printer-png.h
rename to tools/printer-png.h

diff --git a/test/printer.opacity b/tools/printer.opacity
similarity index 100%
rename from test/printer.opacity
rename to tools/printer.opacity

diff --git a/test/printer.png b/tools/printer.png
similarity index 100%
rename from test/printer.png
rename to tools/printer.png