diff --git a/tools/ippfind.c b/tools/ippfind.c index 16a366559..c3fe435f0 100644 --- a/tools/ippfind.c +++ b/tools/ippfind.c @@ -223,13 +223,13 @@ main(int argc, // I - Number of command-line args if (logic == IPPFIND_OP_OR) { cupsLangPrintf(stderr, _("%s: Cannot use '--and' after '--or'."), "ippfind"); - return (usage(stderr)); + exit(usage(stderr)); } if (!current) { cupsLangPrintf(stderr, _("%s: Missing expression before '--and'."), "ippfind"); - return (usage(stderr)); + exit(usage(stderr)); } temp = NULL; @@ -240,7 +240,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing regular expression after '%s'."), "ippfind", "--domain"); - return (usage(stderr)); + exit(usage(stderr)); } temp = new_expr(IPPFIND_OP_DOMAIN_REGEX, invert, NULL, argv[i], NULL); @@ -251,7 +251,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing program after '%s'."), "ippfind", "--exec"); - return (usage(stderr)); + exit(usage(stderr)); } temp = new_expr(IPPFIND_OP_EXEC, invert, NULL, NULL, argv + i); @@ -267,7 +267,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing semi-colon after '%s'."), "ippfind", "--exec"); - return (usage(stderr)); + exit(usage(stderr)); } have_output = true; @@ -278,7 +278,7 @@ main(int argc, // I - Number of command-line args } else if (!strcmp(argv[i], "--help")) { - return (usage(stdout)); + exit(usage(stdout)); } else if (!strcmp(argv[i], "--host")) { @@ -286,7 +286,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing regular expression after '%s'."), "ippfind", "--host"); - return (usage(stderr)); + exit(usage(stderr)); } temp = new_expr(IPPFIND_OP_HOST_REGEX, invert, NULL, argv[i], NULL); @@ -306,7 +306,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing name after '%s'."), "ippfind", "--literal-name"); - return (usage(stderr)); + exit(usage(stderr)); } temp = new_expr(IPPFIND_OP_NAME_LITERAL, invert, argv[i], NULL, NULL); @@ -317,7 +317,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing regular expression after '%s'."), "ippfind", "--name"); - return (usage(stderr)); + exit(usage(stderr)); } temp = new_expr(IPPFIND_OP_NAME_REGEX, invert, NULL, argv[i], NULL); @@ -331,7 +331,7 @@ main(int argc, // I - Number of command-line args if (!current) { cupsLangPrintf(stderr, _("%s: Missing expression before '--or'."), "ippfind"); - return (usage(stderr)); + exit(usage(stderr)); } logic = IPPFIND_OP_OR; @@ -397,7 +397,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing regular expression after '%s'."), "ippfind", "--path"); - return (usage(stderr)); + exit(usage(stderr)); } temp = new_expr(IPPFIND_OP_PATH_REGEX, invert, NULL, argv[i], NULL); @@ -408,7 +408,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing port range after '%s'."), "ippfind", "--port"); - return (usage(stderr)); + exit(usage(stderr)); } temp = new_expr(IPPFIND_OP_PORT_RANGE, invert, argv[i], NULL, NULL); @@ -442,7 +442,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing key name after '%s'."), "ippfind", "--txt"); - return (usage(stderr)); + exit(usage(stderr)); } temp = new_expr(IPPFIND_OP_TXT_EXISTS, invert, argv[i], NULL, NULL); @@ -455,7 +455,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing regular expression after '%s'."), "ippfind", argv[i - 1]); - return (usage(stderr)); + exit(usage(stderr)); } temp = new_expr(IPPFIND_OP_TXT_REGEX, invert, key, argv[i], NULL); @@ -466,7 +466,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing regular expression after '%s'."), "ippfind", "--uri"); - return (usage(stderr)); + exit(usage(stderr)); } temp = new_expr(IPPFIND_OP_URI_REGEX, invert, NULL, argv[i], NULL); @@ -474,12 +474,12 @@ main(int argc, // I - Number of command-line args else if (!strcmp(argv[i], "--version")) { puts(LIBCUPS_VERSION); - return (0); + exit(0); } else { cupsLangPrintf(stderr, _("%s: Unknown option '%s'."), "ippfind", argv[i]); - return (usage(stderr)); + exit(usage(stderr)); } if (temp) @@ -541,7 +541,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing name after '%s'."), "ippfind", "-N"); - return (usage(stderr)); + exit(usage(stderr)); } temp = new_expr(IPPFIND_OP_NAME_LITERAL, invert, argv[i], NULL, NULL); @@ -552,7 +552,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing port range after '%s'."), "ippfind", "-P"); - return (usage(stderr)); + exit(usage(stderr)); } temp = new_expr(IPPFIND_OP_PORT_RANGE, invert, argv[i], NULL, NULL); @@ -563,7 +563,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing timeout after '-T'."), "ippfind"); - return (usage(stderr)); + exit(usage(stderr)); } bonjour_timeout = atof(argv[i]); @@ -574,7 +574,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing version after '-V'."), "ippfind"); - return (usage(stderr)); + exit(usage(stderr)); } if (!strcmp(argv[i], "1.1")) @@ -596,7 +596,7 @@ main(int argc, // I - Number of command-line args else { cupsLangPrintf(stderr, _("%s: Unsupported version \"%s\"."), "ippfind", argv[i]); - return (usage(stderr)); + exit(usage(stderr)); } break; @@ -605,7 +605,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing regular expression after '%s'."), "ippfind", "-d"); - return (usage(stderr)); + exit(usage(stderr)); } temp = new_expr(IPPFIND_OP_DOMAIN_REGEX, invert, NULL, argv[i], NULL); @@ -616,7 +616,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing regular expression after '%s'."), "ippfind", "-h"); - return (usage(stderr)); + exit(usage(stderr)); } temp = new_expr(IPPFIND_OP_HOST_REGEX, invert, NULL, argv[i], NULL); @@ -632,7 +632,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing regular expression after '%s'."), "ippfind", "-n"); - return (usage(stderr)); + exit(usage(stderr)); } temp = new_expr(IPPFIND_OP_NAME_REGEX, invert, NULL, argv[i], NULL); @@ -663,7 +663,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing key name after '%s'."), "ippfind", "-t"); - return (usage(stderr)); + exit(usage(stderr)); } temp = new_expr(IPPFIND_OP_TXT_EXISTS, invert, argv[i], NULL, NULL); @@ -674,7 +674,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing regular expression after '%s'."), "ippfind", "-u"); - return (usage(stderr)); + exit(usage(stderr)); } temp = new_expr(IPPFIND_OP_URI_REGEX, invert, NULL, argv[i], NULL); @@ -685,7 +685,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing program after '%s'."), "ippfind", "-x"); - return (usage(stderr)); + exit(usage(stderr)); } temp = new_expr(IPPFIND_OP_EXEC, invert, NULL, NULL, argv + i); @@ -701,7 +701,7 @@ main(int argc, // I - Number of command-line args if (i >= argc) { cupsLangPrintf(stderr, _("%s: Missing semi-colon after '%s'."), "ippfind", "-x"); - return (usage(stderr)); + exit(usage(stderr)); } have_output = true; @@ -709,7 +709,7 @@ main(int argc, // I - Number of command-line args default : cupsLangPrintf(stderr, _("%s: Unknown option '-%c'."), "ippfind", *opt); - return (usage(stderr)); + exit(usage(stderr)); } if (temp) @@ -758,7 +758,7 @@ main(int argc, // I - Number of command-line args if (num_parens >= 100) { cupsLangPrintf(stderr, _("%s: Too many parenthesis."), "ippfind"); - return (usage(stderr)); + exit(usage(stderr)); } temp = new_expr(IPPFIND_OP_AND, invert, NULL, NULL, NULL); @@ -786,7 +786,7 @@ main(int argc, // I - Number of command-line args if (num_parens <= 0) { cupsLangPrintf(stderr, _("%s: Missing open parenthesis."), "ippfind"); - return (usage(stderr)); + exit(usage(stderr)); } current = parens[--num_parens]; @@ -812,7 +812,7 @@ main(int argc, // I - Number of command-line args if (num_parens > 0) { cupsLangPrintf(stderr, _("%s: Missing close parenthesis."), "ippfind"); - return (usage(stderr)); + exit(usage(stderr)); } if (!have_output) diff --git a/xcode/libcups.xcodeproj/project.pbxproj b/xcode/libcups.xcodeproj/project.pbxproj index 406378e4a..aff55226c 100644 --- a/xcode/libcups.xcodeproj/project.pbxproj +++ b/xcode/libcups.xcodeproj/project.pbxproj @@ -331,6 +331,10 @@ 27A8096428A9B9D500B20BC8 /* dnssd.c in Sources */ = {isa = PBXBuildFile; fileRef = 27A8096028A9B9D500B20BC8 /* dnssd.c */; }; 27A8096528A9B9D500B20BC8 /* dnssd.c in Sources */ = {isa = PBXBuildFile; fileRef = 27A8096028A9B9D500B20BC8 /* dnssd.c */; }; 27A8096628A9B9D500B20BC8 /* dnssd.c in Sources */ = {isa = PBXBuildFile; fileRef = 27A8096028A9B9D500B20BC8 /* dnssd.c */; }; + 27BF22C82CBEC707003AAB6D /* libpdfio.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 27FBBD3A2C0E525E00CD5A5D /* libpdfio.a */; }; + 27BF22C92CBEC717003AAB6D /* libz.tbd in Frameworks */ = {isa = PBXBuildFile; fileRef = 27D3967A27BB389C003D3D8E /* libz.tbd */; }; + 27BF22CA2CBEC720003AAB6D /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2767FC591926750C000F61D3 /* CoreFoundation.framework */; }; + 27BF22CB2CBEC720003AAB6D /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 27312F302AC9C30A000F6392 /* CoreGraphics.framework */; }; 27C61E962C12780E00750E71 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2767FC5D1926750C000F61D3 /* Security.framework */; }; 27C61E972C12782B00750E71 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2767FC5D1926750C000F61D3 /* Security.framework */; }; 27C61E982C12785300750E71 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2767FC5D1926750C000F61D3 /* Security.framework */; }; @@ -1557,6 +1561,10 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 27BF22CA2CBEC720003AAB6D /* CoreFoundation.framework in Frameworks */, + 27BF22CB2CBEC720003AAB6D /* CoreGraphics.framework in Frameworks */, + 27BF22C92CBEC717003AAB6D /* libz.tbd in Frameworks */, + 27BF22C82CBEC707003AAB6D /* libpdfio.a in Frameworks */, 276683FD1337F7B8000D33D0 /* libcups3.dylib in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -2789,7 +2797,7 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = YES; - LastUpgradeCheck = 1540; + LastUpgradeCheck = 1600; ORGANIZATIONNAME = "Apple Inc."; TargetAttributes = { 270695FD1CADF3E200FFE5FB = { @@ -3516,7 +3524,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -3527,7 +3535,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -3541,7 +3549,7 @@ COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_EXTENSION = a; EXECUTABLE_PREFIX = ""; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/libcups3/cups; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -3562,7 +3570,7 @@ COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_EXTENSION = a; EXECUTABLE_PREFIX = ""; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/libcups3/cups; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE = ""; @@ -3580,7 +3588,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -3591,7 +3599,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -3602,7 +3610,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -3613,7 +3621,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -3624,7 +3632,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -3635,7 +3643,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -3647,7 +3655,7 @@ CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; INSTALL_PATH = /usr/bin; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -3659,7 +3667,7 @@ CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; INSTALL_PATH = /usr/bin; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -3670,7 +3678,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -3681,7 +3689,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -3691,7 +3699,7 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -3701,7 +3709,7 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -3712,7 +3720,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -3723,7 +3731,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -3734,7 +3742,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -3745,7 +3753,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -3755,7 +3763,7 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; }; @@ -3766,7 +3774,7 @@ buildSettings = { CLANG_ENABLE_OBJC_WEAK = YES; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = macosx; }; @@ -3782,7 +3790,7 @@ EXECUTABLE_PREFIX = ""; INSTALL_PATH = /usr/local/lib; MACH_O_TYPE = staticlib; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/libcups3/cups; PRODUCT_NAME = libcups_static; PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/libcups3/cups; @@ -3800,7 +3808,7 @@ EXECUTABLE_PREFIX = ""; INSTALL_PATH = /usr/local/lib; MACH_O_TYPE = staticlib; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/libcups3/cups; PRODUCT_NAME = libcups_static; PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/libcups3/cups; @@ -3815,7 +3823,7 @@ CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; INSTALL_PATH = /usr/bin; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -3827,7 +3835,7 @@ CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; INSTALL_PATH = /usr/bin; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -3838,7 +3846,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = testdest; }; name = Debug; @@ -3849,7 +3857,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = testdest; }; name = Release; @@ -3860,7 +3868,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -3871,7 +3879,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -3882,7 +3890,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -3893,7 +3901,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -3904,7 +3912,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -3915,7 +3923,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -3926,7 +3934,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -3937,7 +3945,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -3948,7 +3956,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -3959,7 +3967,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -3970,7 +3978,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -3981,7 +3989,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -3992,7 +4000,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -4003,7 +4011,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -4018,7 +4026,7 @@ DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)"; EXECUTABLE_PREFIX = ""; INSTALL_PATH = /usr/lib; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/libcups3/cups; PRODUCT_NAME = "$(TARGET_NAME)"; PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/libcups3/cups; @@ -4035,7 +4043,7 @@ DYLIB_CURRENT_VERSION = "$(CURRENT_PROJECT_VERSION)"; EXECUTABLE_PREFIX = ""; INSTALL_PATH = /usr/lib; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRIVATE_HEADERS_FOLDER_PATH = /usr/local/include/libcups3/cups; PRODUCT_NAME = "$(TARGET_NAME)"; PUBLIC_HEADERS_FOLDER_PATH = /usr/local/include/libcups3/cups; @@ -4048,7 +4056,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -4059,7 +4067,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -4070,7 +4078,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -4081,7 +4089,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -4092,7 +4100,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -4103,7 +4111,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -4114,7 +4122,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -4125,7 +4133,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -4136,7 +4144,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -4147,7 +4155,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -4158,7 +4166,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -4169,7 +4177,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -4180,7 +4188,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -4191,7 +4199,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -4202,7 +4210,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -4213,7 +4221,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -4225,7 +4233,7 @@ CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; INSTALL_PATH = /usr/bin; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -4237,7 +4245,7 @@ CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; INSTALL_PATH = /usr/bin; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -4248,7 +4256,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Debug; @@ -4259,7 +4267,7 @@ CLANG_ENABLE_OBJC_WEAK = YES; CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "$(TARGET_NAME)"; }; name = Release; @@ -4413,7 +4421,7 @@ CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; INSTALL_PATH = /usr/bin; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "ipptool copy"; }; name = Debug; @@ -4425,7 +4433,7 @@ CODE_SIGN_IDENTITY = "-"; DEAD_CODE_STRIPPING = YES; INSTALL_PATH = /usr/bin; - MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)"; + MACOSX_DEPLOYMENT_TARGET = 11.0; PRODUCT_NAME = "ipptool copy"; }; name = Release; diff --git a/xcode/libcups.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme b/xcode/libcups.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme index 3209997b2..d3aa0a2bb 100644 --- a/xcode/libcups.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme +++ b/xcode/libcups.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme @@ -1,6 +1,6 @@