From: msweet Date: Fri, 21 Mar 2014 13:52:34 +0000 (+0000) Subject: Rename configure.in to configure.ac. X-Git-Tag: v2.2b1~708 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ca6ba8fcbf752dc4048bc687380744673da916b;p=thirdparty%2Fcups.git Rename configure.in to configure.ac. Rename cups-launchd.m4 to cups-ondemand.m4 in preparation for systemd support. Add more files to the Xcode project. git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@11715 a1ca3aef-8c08-0410-bb20-df032aa958be --- diff --git a/config-scripts/cups-launchd.m4 b/config-scripts/cups-ondemand.m4 similarity index 100% rename from config-scripts/cups-launchd.m4 rename to config-scripts/cups-ondemand.m4 diff --git a/configure.in b/configure.ac similarity index 78% rename from configure.in rename to configure.ac index c9bde67004..66badb52f2 100644 --- a/configure.in +++ b/configure.ac @@ -1,16 +1,16 @@ dnl dnl "$Id$" dnl -dnl Configuration script for CUPS. +dnl Configuration script for CUPS. dnl -dnl Copyright 2007-2012 by Apple Inc. -dnl Copyright 1997-2007 by Easy Software Products, all rights reserved. +dnl Copyright 2007-2014 by Apple Inc. +dnl Copyright 1997-2007 by Easy Software Products, all rights reserved. dnl -dnl These coded instructions, statements, and computer programs are the -dnl property of Apple Inc. and are protected by Federal copyright -dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" -dnl which should have been included with this file. If this file is -dnl file is missing or damaged, see the license at "http://www.cups.org/". +dnl These coded instructions, statements, and computer programs are the +dnl property of Apple Inc. and are protected by Federal copyright +dnl law. Distribution and use rights are outlined in the file "LICENSE.txt" +dnl which should have been included with this file. If this file is +dnl file is missing or damaged, see the license at "http://www.cups.org/". dnl AC_INIT(cups/cups.h) @@ -32,7 +32,7 @@ sinclude(config-scripts/cups-ssl.m4) sinclude(config-scripts/cups-pam.m4) sinclude(config-scripts/cups-largefile.m4) sinclude(config-scripts/cups-dnssd.m4) -sinclude(config-scripts/cups-launchd.m4) +sinclude(config-scripts/cups-ondemand.m4) sinclude(config-scripts/cups-defaults.m4) sinclude(config-scripts/cups-scripting.m4) diff --git a/test/get-job-template-attributes.test b/test/get-job-template-attributes.test new file mode 100644 index 0000000000..033016095a --- /dev/null +++ b/test/get-job-template-attributes.test @@ -0,0 +1,24 @@ +# Get printer Job Template attributes using get-printer-attributes +{ + # The name of the test... + NAME "Get printer Job Template attributes using Get-Printer-Attributes" + + # The operation to use + OPERATION Get-Printer-Attributes + + # 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 keyword requested-attributes job-template,media-col-database + + # What statuses are OK? + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes + + # What attributes do we expect? + EXPECT copies-default + EXPECT copies-supported + EXPECT media-col-database +} diff --git a/test/get-printer-description-attributes.test b/test/get-printer-description-attributes.test new file mode 100644 index 0000000000..b1d813858b --- /dev/null +++ b/test/get-printer-description-attributes.test @@ -0,0 +1,43 @@ +# Get Printer Description attributes using get-printer-attributes +{ + # The name of the test... + NAME "Get Printer Description attributes using Get-Printer-Attributes" + + # The operation to use + OPERATION Get-Printer-Attributes + + # 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 keyword requested-attributes printer-description + + # What statuses are OK? + STATUS successful-ok + STATUS successful-ok-ignored-or-substituted-attributes + + # What attributes do we expect? + EXPECT printer-name + EXPECT printer-uri-supported + EXPECT uri-security-supported + EXPECT uri-authentication-supported + EXPECT printer-state + EXPECT printer-state-reasons + EXPECT ipp-versions-supported + EXPECT operations-supported + EXPECT charset-configured + EXPECT charset-supported + EXPECT natural-language-configured + EXPECT generated-natural-language-supported + EXPECT document-format-default + EXPECT document-format-supported + EXPECT printer-is-accepting-jobs + EXPECT queued-job-count + EXPECT pdl-override-supported + EXPECT printer-up-time + EXPECT compression-supported + EXPECT !copies-default + EXPECT !copies-supported + EXPECT !media-col-database +} diff --git a/xcode/CUPS.xcodeproj/project.pbxproj b/xcode/CUPS.xcodeproj/project.pbxproj index c2ee2fec93..640eb913bf 100644 --- a/xcode/CUPS.xcodeproj/project.pbxproj +++ b/xcode/CUPS.xcodeproj/project.pbxproj @@ -1351,6 +1351,55 @@ 72D53A3615B4929D003F877F /* colorman.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = colorman.c; path = ../scheduler/colorman.c; sourceTree = ""; }; 72D53A3715B4929D003F877F /* colorman.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = colorman.h; path = ../scheduler/colorman.h; sourceTree = ""; }; 72D53A3915B492FA003F877F /* libpam.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libpam.dylib; path = /usr/lib/libpam.dylib; sourceTree = ""; }; + 72E65BA318DC797E00097E89 /* configure.ac */ = {isa = PBXFileReference; lastKnownFileType = text; name = configure.ac; path = ../configure.ac; sourceTree = ""; }; + 72E65BA418DC799B00097E89 /* cups-common.m4 */ = {isa = PBXFileReference; lastKnownFileType = text; name = "cups-common.m4"; path = "../config-scripts/cups-common.m4"; sourceTree = ""; }; + 72E65BA518DC799B00097E89 /* cups-compiler.m4 */ = {isa = PBXFileReference; lastKnownFileType = text; name = "cups-compiler.m4"; path = "../config-scripts/cups-compiler.m4"; sourceTree = ""; }; + 72E65BA618DC799B00097E89 /* cups-defaults.m4 */ = {isa = PBXFileReference; lastKnownFileType = text; name = "cups-defaults.m4"; path = "../config-scripts/cups-defaults.m4"; sourceTree = ""; }; + 72E65BA718DC799B00097E89 /* cups-directories.m4 */ = {isa = PBXFileReference; lastKnownFileType = text; name = "cups-directories.m4"; path = "../config-scripts/cups-directories.m4"; sourceTree = ""; }; + 72E65BA818DC799B00097E89 /* cups-dnssd.m4 */ = {isa = PBXFileReference; lastKnownFileType = text; name = "cups-dnssd.m4"; path = "../config-scripts/cups-dnssd.m4"; sourceTree = ""; }; + 72E65BA918DC799B00097E89 /* cups-gssapi.m4 */ = {isa = PBXFileReference; lastKnownFileType = text; name = "cups-gssapi.m4"; path = "../config-scripts/cups-gssapi.m4"; sourceTree = ""; }; + 72E65BAA18DC799B00097E89 /* cups-largefile.m4 */ = {isa = PBXFileReference; lastKnownFileType = text; name = "cups-largefile.m4"; path = "../config-scripts/cups-largefile.m4"; sourceTree = ""; }; + 72E65BAB18DC799B00097E89 /* cups-ondemand.m4 */ = {isa = PBXFileReference; lastKnownFileType = text; name = "cups-ondemand.m4"; path = "../config-scripts/cups-ondemand.m4"; sourceTree = ""; }; + 72E65BAC18DC799B00097E89 /* cups-libtool.m4 */ = {isa = PBXFileReference; lastKnownFileType = text; name = "cups-libtool.m4"; path = "../config-scripts/cups-libtool.m4"; sourceTree = ""; }; + 72E65BAD18DC799B00097E89 /* cups-manpages.m4 */ = {isa = PBXFileReference; lastKnownFileType = text; name = "cups-manpages.m4"; path = "../config-scripts/cups-manpages.m4"; sourceTree = ""; }; + 72E65BAE18DC799B00097E89 /* cups-network.m4 */ = {isa = PBXFileReference; lastKnownFileType = text; name = "cups-network.m4"; path = "../config-scripts/cups-network.m4"; sourceTree = ""; }; + 72E65BAF18DC799B00097E89 /* cups-opsys.m4 */ = {isa = PBXFileReference; lastKnownFileType = text; name = "cups-opsys.m4"; path = "../config-scripts/cups-opsys.m4"; sourceTree = ""; }; + 72E65BB018DC799B00097E89 /* cups-pam.m4 */ = {isa = PBXFileReference; lastKnownFileType = text; name = "cups-pam.m4"; path = "../config-scripts/cups-pam.m4"; sourceTree = ""; }; + 72E65BB118DC799B00097E89 /* cups-poll.m4 */ = {isa = PBXFileReference; lastKnownFileType = text; name = "cups-poll.m4"; path = "../config-scripts/cups-poll.m4"; sourceTree = ""; }; + 72E65BB218DC799B00097E89 /* cups-scripting.m4 */ = {isa = PBXFileReference; lastKnownFileType = text; name = "cups-scripting.m4"; path = "../config-scripts/cups-scripting.m4"; sourceTree = ""; }; + 72E65BB318DC799B00097E89 /* cups-sharedlibs.m4 */ = {isa = PBXFileReference; lastKnownFileType = text; name = "cups-sharedlibs.m4"; path = "../config-scripts/cups-sharedlibs.m4"; sourceTree = ""; }; + 72E65BB418DC799B00097E89 /* cups-ssl.m4 */ = {isa = PBXFileReference; lastKnownFileType = text; name = "cups-ssl.m4"; path = "../config-scripts/cups-ssl.m4"; sourceTree = ""; }; + 72E65BB518DC799B00097E89 /* cups-threads.m4 */ = {isa = PBXFileReference; lastKnownFileType = text; name = "cups-threads.m4"; path = "../config-scripts/cups-threads.m4"; sourceTree = ""; }; + 72E65BB618DC79CC00097E89 /* cups-config.in */ = {isa = PBXFileReference; lastKnownFileType = text.script.sh; name = "cups-config.in"; path = "../cups-config.in"; sourceTree = ""; }; + 72E65BB718DC79CC00097E89 /* Makedefs.in */ = {isa = PBXFileReference; lastKnownFileType = text; name = Makedefs.in; path = ../Makedefs.in; sourceTree = ""; }; + 72E65BB918DC7A3600097E89 /* doc */ = {isa = PBXFileReference; lastKnownFileType = folder; name = doc; path = ../doc; sourceTree = ""; }; + 72E65BBA18DC7A3600097E89 /* man */ = {isa = PBXFileReference; lastKnownFileType = folder; name = man; path = ../man; sourceTree = ""; }; + 72E65BBB18DC7A6B00097E89 /* api-array.header */ = {isa = PBXFileReference; lastKnownFileType = text; name = "api-array.header"; path = "../cups/api-array.header"; sourceTree = ""; }; + 72E65BBC18DC7A6B00097E89 /* api-array.shtml */ = {isa = PBXFileReference; lastKnownFileType = text.html.other; name = "api-array.shtml"; path = "../cups/api-array.shtml"; sourceTree = ""; }; + 72E65BBD18DC7A6B00097E89 /* api-cups.header */ = {isa = PBXFileReference; lastKnownFileType = text; name = "api-cups.header"; path = "../cups/api-cups.header"; sourceTree = ""; }; + 72E65BBE18DC7A6B00097E89 /* api-cups.shtml */ = {isa = PBXFileReference; lastKnownFileType = text.html.other; name = "api-cups.shtml"; path = "../cups/api-cups.shtml"; sourceTree = ""; }; + 72E65BBF18DC7A6B00097E89 /* api-filedir.header */ = {isa = PBXFileReference; lastKnownFileType = text; name = "api-filedir.header"; path = "../cups/api-filedir.header"; sourceTree = ""; }; + 72E65BC018DC7A6B00097E89 /* api-filedir.shtml */ = {isa = PBXFileReference; lastKnownFileType = text.html.other; name = "api-filedir.shtml"; path = "../cups/api-filedir.shtml"; sourceTree = ""; }; + 72E65BC118DC7A6B00097E89 /* api-filter.header */ = {isa = PBXFileReference; lastKnownFileType = text; name = "api-filter.header"; path = "../cups/api-filter.header"; sourceTree = ""; }; + 72E65BC218DC7A6B00097E89 /* api-filter.shtml */ = {isa = PBXFileReference; lastKnownFileType = text.html.other; name = "api-filter.shtml"; path = "../cups/api-filter.shtml"; sourceTree = ""; }; + 72E65BC318DC7A6B00097E89 /* api-httpipp.header */ = {isa = PBXFileReference; lastKnownFileType = text; name = "api-httpipp.header"; path = "../cups/api-httpipp.header"; sourceTree = ""; }; + 72E65BC418DC7A6B00097E89 /* api-httpipp.shtml */ = {isa = PBXFileReference; lastKnownFileType = text.html.other; name = "api-httpipp.shtml"; path = "../cups/api-httpipp.shtml"; sourceTree = ""; }; + 72E65BC518DC7A6B00097E89 /* api-overview.header */ = {isa = PBXFileReference; lastKnownFileType = text; name = "api-overview.header"; path = "../cups/api-overview.header"; sourceTree = ""; }; + 72E65BC618DC7A6B00097E89 /* api-overview.shtml */ = {isa = PBXFileReference; lastKnownFileType = text.html.other; name = "api-overview.shtml"; path = "../cups/api-overview.shtml"; sourceTree = ""; }; + 72E65BC718DC7A6B00097E89 /* api-ppd.header */ = {isa = PBXFileReference; lastKnownFileType = text; name = "api-ppd.header"; path = "../cups/api-ppd.header"; sourceTree = ""; }; + 72E65BC818DC7A6B00097E89 /* api-ppd.shtml */ = {isa = PBXFileReference; lastKnownFileType = text.html.other; name = "api-ppd.shtml"; path = "../cups/api-ppd.shtml"; sourceTree = ""; }; + 72E65BC918DC7A7E00097E89 /* api-ppdc.header */ = {isa = PBXFileReference; lastKnownFileType = text; name = "api-ppdc.header"; path = "../ppdc/api-ppdc.header"; sourceTree = ""; }; + 72E65BCA18DC7A7E00097E89 /* api-ppdc.shtml */ = {isa = PBXFileReference; lastKnownFileType = text.html.other; name = "api-ppdc.shtml"; path = "../ppdc/api-ppdc.shtml"; sourceTree = ""; }; + 72E65BCB18DC7A9800097E89 /* api-raster.header */ = {isa = PBXFileReference; lastKnownFileType = text; name = "api-raster.header"; path = "../filter/api-raster.header"; sourceTree = ""; }; + 72E65BCC18DC7A9800097E89 /* api-raster.shtml */ = {isa = PBXFileReference; lastKnownFileType = text.html.other; name = "api-raster.shtml"; path = "../filter/api-raster.shtml"; sourceTree = ""; }; + 72E65BCD18DC7A9800097E89 /* postscript-driver.header */ = {isa = PBXFileReference; lastKnownFileType = text; name = "postscript-driver.header"; path = "../filter/postscript-driver.header"; sourceTree = ""; }; + 72E65BCE18DC7A9800097E89 /* postscript-driver.shtml */ = {isa = PBXFileReference; lastKnownFileType = text.html.other; name = "postscript-driver.shtml"; path = "../filter/postscript-driver.shtml"; sourceTree = ""; }; + 72E65BCF18DC7A9800097E89 /* ppd-compiler.header */ = {isa = PBXFileReference; lastKnownFileType = text; name = "ppd-compiler.header"; path = "../filter/ppd-compiler.header"; sourceTree = ""; }; + 72E65BD018DC7A9800097E89 /* ppd-compiler.shtml */ = {isa = PBXFileReference; lastKnownFileType = text.html.other; name = "ppd-compiler.shtml"; path = "../filter/ppd-compiler.shtml"; sourceTree = ""; }; + 72E65BD118DC7A9800097E89 /* raster-driver.header */ = {isa = PBXFileReference; lastKnownFileType = text; name = "raster-driver.header"; path = "../filter/raster-driver.header"; sourceTree = ""; }; + 72E65BD218DC7A9800097E89 /* raster-driver.shtml */ = {isa = PBXFileReference; lastKnownFileType = text.html.other; name = "raster-driver.shtml"; path = "../filter/raster-driver.shtml"; sourceTree = ""; }; + 72E65BD318DC7A9800097E89 /* spec-ppd.header */ = {isa = PBXFileReference; lastKnownFileType = text; name = "spec-ppd.header"; path = "../filter/spec-ppd.header"; sourceTree = ""; }; + 72E65BD418DC7A9800097E89 /* spec-ppd.shtml */ = {isa = PBXFileReference; lastKnownFileType = text.html.other; name = "spec-ppd.shtml"; path = "../filter/spec-ppd.shtml"; sourceTree = ""; }; 72F75A521336F950004BB496 /* cupstestppd */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = cupstestppd; sourceTree = BUILT_PRODUCTS_DIR; }; 72F75A5B1336F988004BB496 /* cupstestppd.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = cupstestppd.c; path = ../systemv/cupstestppd.c; sourceTree = ""; }; 72F75A611336F9A3004BB496 /* libcupsimage.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = libcupsimage.dylib; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -1863,7 +1912,6 @@ 72220F461333060C00FCA411 /* Private Headers */ = { isa = PBXGroup; children = ( - 7226369D18AE73BB004ED309 /* config.h.in */, 72220F471333063D00FCA411 /* config.h */, 7234F41F1378A16F00D3E9C9 /* array-private.h */, 72220EC01333056300FCA411 /* cups-private.h */, @@ -2011,7 +2059,8 @@ 72BF96351333042100B1EAD7 = { isa = PBXGroup; children = ( - 72220FB113330B4A00FCA411 /* Frameworks */, + 72E65BA218DC796500097E89 /* Autoconf Files */, + 72E65BB818DC79F800097E89 /* Documentation */, 72220F45133305D000FCA411 /* Public Headers */, 72220F461333060C00FCA411 /* Private Headers */, 72220EB41333050100FCA411 /* libcups */, @@ -2025,6 +2074,7 @@ 7258EADC134594A8009286F1 /* filters */, 276683CB1337B1CC000D33D0 /* ppdc tools */, 273BF6B81333B4A90022CAAB /* tests */, + 72220FB113330B4A00FCA411 /* Frameworks */, 72220EAF1333047D00FCA411 /* Products */, ); indentWidth = 2; @@ -2032,6 +2082,70 @@ tabWidth = 8; wrapsLines = 0; }; + 72E65BA218DC796500097E89 /* Autoconf Files */ = { + isa = PBXGroup; + children = ( + 72E65BB718DC79CC00097E89 /* Makedefs.in */, + 72E65BA318DC797E00097E89 /* configure.ac */, + 7226369D18AE73BB004ED309 /* config.h.in */, + 72E65BB618DC79CC00097E89 /* cups-config.in */, + 72E65BA418DC799B00097E89 /* cups-common.m4 */, + 72E65BA518DC799B00097E89 /* cups-compiler.m4 */, + 72E65BA618DC799B00097E89 /* cups-defaults.m4 */, + 72E65BA718DC799B00097E89 /* cups-directories.m4 */, + 72E65BA818DC799B00097E89 /* cups-dnssd.m4 */, + 72E65BA918DC799B00097E89 /* cups-gssapi.m4 */, + 72E65BAA18DC799B00097E89 /* cups-largefile.m4 */, + 72E65BAB18DC799B00097E89 /* cups-ondemand.m4 */, + 72E65BAC18DC799B00097E89 /* cups-libtool.m4 */, + 72E65BAD18DC799B00097E89 /* cups-manpages.m4 */, + 72E65BAE18DC799B00097E89 /* cups-network.m4 */, + 72E65BAF18DC799B00097E89 /* cups-opsys.m4 */, + 72E65BB018DC799B00097E89 /* cups-pam.m4 */, + 72E65BB118DC799B00097E89 /* cups-poll.m4 */, + 72E65BB218DC799B00097E89 /* cups-scripting.m4 */, + 72E65BB318DC799B00097E89 /* cups-sharedlibs.m4 */, + 72E65BB418DC799B00097E89 /* cups-ssl.m4 */, + 72E65BB518DC799B00097E89 /* cups-threads.m4 */, + ); + name = "Autoconf Files"; + sourceTree = ""; + }; + 72E65BB818DC79F800097E89 /* Documentation */ = { + isa = PBXGroup; + children = ( + 72E65BB918DC7A3600097E89 /* doc */, + 72E65BBA18DC7A3600097E89 /* man */, + 72E65BBB18DC7A6B00097E89 /* api-array.header */, + 72E65BBC18DC7A6B00097E89 /* api-array.shtml */, + 72E65BBD18DC7A6B00097E89 /* api-cups.header */, + 72E65BBE18DC7A6B00097E89 /* api-cups.shtml */, + 72E65BBF18DC7A6B00097E89 /* api-filedir.header */, + 72E65BC018DC7A6B00097E89 /* api-filedir.shtml */, + 72E65BC118DC7A6B00097E89 /* api-filter.header */, + 72E65BC218DC7A6B00097E89 /* api-filter.shtml */, + 72E65BC318DC7A6B00097E89 /* api-httpipp.header */, + 72E65BC418DC7A6B00097E89 /* api-httpipp.shtml */, + 72E65BC518DC7A6B00097E89 /* api-overview.header */, + 72E65BC618DC7A6B00097E89 /* api-overview.shtml */, + 72E65BC718DC7A6B00097E89 /* api-ppd.header */, + 72E65BC818DC7A6B00097E89 /* api-ppd.shtml */, + 72E65BC918DC7A7E00097E89 /* api-ppdc.header */, + 72E65BCA18DC7A7E00097E89 /* api-ppdc.shtml */, + 72E65BCB18DC7A9800097E89 /* api-raster.header */, + 72E65BCC18DC7A9800097E89 /* api-raster.shtml */, + 72E65BCD18DC7A9800097E89 /* postscript-driver.header */, + 72E65BCE18DC7A9800097E89 /* postscript-driver.shtml */, + 72E65BCF18DC7A9800097E89 /* ppd-compiler.header */, + 72E65BD018DC7A9800097E89 /* ppd-compiler.shtml */, + 72E65BD118DC7A9800097E89 /* raster-driver.header */, + 72E65BD218DC7A9800097E89 /* raster-driver.shtml */, + 72E65BD318DC7A9800097E89 /* spec-ppd.header */, + 72E65BD418DC7A9800097E89 /* spec-ppd.shtml */, + ); + name = Documentation; + sourceTree = ""; + }; 72F75A681336FA42004BB496 /* libcupsimage */ = { isa = PBXGroup; children = (