[sword-svn] r3436 - in trunk/bindings/objc: ObjCSword.xcodeproj src test
mdbergmann at crosswire.org
mdbergmann at crosswire.org
Sun Oct 2 05:27:02 MST 2016
Author: mdbergmann
Date: 2016-10-02 05:27:01 -0700 (Sun, 02 Oct 2016)
New Revision: 3436
Added:
trunk/bindings/objc/test/SwordLocaleManagerTest.swift
Modified:
trunk/bindings/objc/ObjCSword.xcodeproj/project.pbxproj
trunk/bindings/objc/src/SwordLocaleManager.h
trunk/bindings/objc/src/SwordLocaleManager.mm
trunk/bindings/objc/src/SwordModule+Index.mm
trunk/bindings/objc/src/SwordModule.mm
Log:
Project updates to Xcode 8. Fixed locale setup on macOS Sierra.
Modified: trunk/bindings/objc/ObjCSword.xcodeproj/project.pbxproj
===================================================================
--- trunk/bindings/objc/ObjCSword.xcodeproj/project.pbxproj 2016-09-16 15:40:50 UTC (rev 3435)
+++ trunk/bindings/objc/ObjCSword.xcodeproj/project.pbxproj 2016-10-02 12:27:01 UTC (rev 3436)
@@ -1105,6 +1105,7 @@
A954ACDD13EEA6780094E3FE /* libsword.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = A954ABC313EE9AB00094E3FE /* libsword.dylib */; };
A967FB5616806B16004ED73C /* teixhtml.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A9E9C5ED16806A2B00ECEB39 /* teixhtml.cpp */; };
A968BE4D19DFF832002C9B78 /* SwordBibleTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = A968BE4C19DFF832002C9B78 /* SwordBibleTest.swift */; };
+ A969DC7B1DA1289100C8E976 /* SwordLocaleManagerTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = A969DC7A1DA1289100C8E976 /* SwordLocaleManagerTest.swift */; };
A96C2359176AFA3C008D714B /* remotetrans.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2351176AF188008D714B /* remotetrans.cpp */; };
A96C235A176AFA3C008D714B /* osisenum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2353176AF19C008D714B /* osisenum.cpp */; };
A96C235B176AFA3C008D714B /* osisglosses.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A96C2354176AF19C008D714B /* osisglosses.cpp */; };
@@ -2874,6 +2875,7 @@
A954AC3613EE9FA10094E3FE /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = SDKs/MacOSX10.7.sdk/usr/lib/libz.dylib; sourceTree = DEVELOPER_DIR; };
A968BE4B19DFF831002C9B78 /* Tests-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Tests-Bridging-Header.h"; sourceTree = "<group>"; };
A968BE4C19DFF832002C9B78 /* SwordBibleTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwordBibleTest.swift; sourceTree = "<group>"; };
+ A969DC7A1DA1289100C8E976 /* SwordLocaleManagerTest.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwordLocaleManagerTest.swift; sourceTree = "<group>"; };
A96C2351176AF188008D714B /* remotetrans.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = remotetrans.cpp; sourceTree = "<group>"; };
A96C2353176AF19C008D714B /* osisenum.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisenum.cpp; sourceTree = "<group>"; };
A96C2354176AF19C008D714B /* osisglosses.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = osisglosses.cpp; sourceTree = "<group>"; };
@@ -5363,6 +5365,7 @@
A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */,
A968BE4C19DFF832002C9B78 /* SwordBibleTest.swift */,
8C92C0CA467F3114A1DC89DD /* SwordInstallSourceManagerTest.m */,
+ A969DC7A1DA1289100C8E976 /* SwordLocaleManagerTest.swift */,
);
name = Tests;
path = test;
@@ -6029,7 +6032,6 @@
A9BFB09D13EDF51000032679 /* Sources */,
A9BFB09E13EDF51000032679 /* Frameworks */,
A9BFB09F13EDF51000032679 /* Resources */,
- A9BFB0A013EDF51000032679 /* ShellScript */,
);
buildRules = (
);
@@ -6322,11 +6324,83 @@
attributes = {
LastSwiftUpdateCheck = 0720;
LastTestingUpgradeCheck = 0610;
- LastUpgradeCheck = 0720;
+ LastUpgradeCheck = 0800;
TargetAttributes = {
8DC2EF4F0486A6940098B216 = {
DevelopmentTeam = 27XS5W9C3J;
+ ProvisioningStyle = Automatic;
};
+ A954ABC213EE9AB00094E3FE = {
+ DevelopmentTeam = 27XS5W9C3J;
+ ProvisioningStyle = Automatic;
+ };
+ A975EED811C792B9007C1532 = {
+ DevelopmentTeam = 27XS5W9C3J;
+ ProvisioningStyle = Automatic;
+ };
+ A9A7EEB314D5D61700B76B6A = {
+ DevelopmentTeam = 27XS5W9C3J;
+ ProvisioningStyle = Automatic;
+ };
+ A9BFB0A113EDF51000032679 = {
+ LastSwiftMigration = 0800;
+ };
+ A9D2714414D717D800DA8926 = {
+ DevelopmentTeam = 27XS5W9C3J;
+ ProvisioningStyle = Automatic;
+ };
+ A9D2715114D717FD00DA8926 = {
+ DevelopmentTeam = 27XS5W9C3J;
+ ProvisioningStyle = Automatic;
+ };
+ A9D2715E14D7181200DA8926 = {
+ DevelopmentTeam = 27XS5W9C3J;
+ ProvisioningStyle = Automatic;
+ };
+ A9D2716B14D7182300DA8926 = {
+ DevelopmentTeam = 27XS5W9C3J;
+ ProvisioningStyle = Automatic;
+ };
+ A9D2717814D7183B00DA8926 = {
+ DevelopmentTeam = 27XS5W9C3J;
+ ProvisioningStyle = Automatic;
+ };
+ A9D2718514D7185800DA8926 = {
+ DevelopmentTeam = 27XS5W9C3J;
+ ProvisioningStyle = Automatic;
+ };
+ A9D2719214D7186A00DA8926 = {
+ DevelopmentTeam = 27XS5W9C3J;
+ ProvisioningStyle = Automatic;
+ };
+ A9D2719F14D7187E00DA8926 = {
+ DevelopmentTeam = 27XS5W9C3J;
+ ProvisioningStyle = Automatic;
+ };
+ A9D271AC14D7189300DA8926 = {
+ DevelopmentTeam = 27XS5W9C3J;
+ ProvisioningStyle = Automatic;
+ };
+ A9D271B914D718A400DA8926 = {
+ DevelopmentTeam = 27XS5W9C3J;
+ ProvisioningStyle = Automatic;
+ };
+ A9D271C614D718B800DA8926 = {
+ DevelopmentTeam = 27XS5W9C3J;
+ ProvisioningStyle = Automatic;
+ };
+ A9D271D314D718C800DA8926 = {
+ DevelopmentTeam = 27XS5W9C3J;
+ ProvisioningStyle = Automatic;
+ };
+ A9D271E014D718DF00DA8926 = {
+ DevelopmentTeam = 27XS5W9C3J;
+ ProvisioningStyle = Automatic;
+ };
+ A9D271ED14D718F500DA8926 = {
+ DevelopmentTeam = 27XS5W9C3J;
+ ProvisioningStyle = Automatic;
+ };
A9EE8A8A19E286E500CFFE6A = {
CreatedOnToolsVersion = 6.1;
};
@@ -6403,22 +6477,6 @@
};
/* End PBXResourcesBuildPhase section */
-/* Begin PBXShellScriptBuildPhase section */
- A9BFB0A013EDF51000032679 /* ShellScript */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n";
- };
-/* End PBXShellScriptBuildPhase section */
-
/* Begin PBXSourcesBuildPhase section */
8DC2EF540486A6940098B216 /* Sources */ = {
isa = PBXSourcesBuildPhase;
@@ -7211,6 +7269,7 @@
A995E6271C877DD000843E13 /* SwordManagerTest.m in Sources */,
A968BE4D19DFF832002C9B78 /* SwordBibleTest.swift in Sources */,
A9BFB0BD13EDF5C900032679 /* SwordModuleTest.m in Sources */,
+ A969DC7B1DA1289100C8E976 /* SwordLocaleManagerTest.swift in Sources */,
A9BFB0BE13EDF5C900032679 /* SwordListKeyTest.m in Sources */,
8C92CC9CEC8A341B902C53E2 /* SwordInstallSourceManagerTest.m in Sources */,
);
@@ -7552,9 +7611,10 @@
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_ENABLE_OBJC_ARC = YES;
- CODE_SIGN_IDENTITY = "Developer ID Application";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_SEARCH_PATHS = (
@@ -7575,7 +7635,7 @@
INSTALL_PATH = "@rpath";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OBJROOT = "$(PROJECT_DIR)/Build/Intermediates";
ONLY_ACTIVE_ARCH = YES;
OTHER_CFLAGS = "-DDEBUG";
@@ -7600,9 +7660,10 @@
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "c++0x";
CLANG_ENABLE_OBJC_ARC = YES;
- CODE_SIGN_IDENTITY = "Developer ID Application";
+ CODE_SIGN_IDENTITY = "";
COMBINE_HIDPI_IMAGES = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
DYLIB_COMPATIBILITY_VERSION = 1;
DYLIB_CURRENT_VERSION = 1;
FRAMEWORK_SEARCH_PATHS = (
@@ -7623,7 +7684,7 @@
INSTALL_PATH = "@rpath";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
LIBRARY_SEARCH_PATHS = "$(inherited)";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OBJROOT = "$(PROJECT_DIR)/Build/Intermediates";
OTHER_CFLAGS = "-DRELEASE";
OTHER_LDFLAGS = (
@@ -7644,12 +7705,28 @@
1DEB91B208733DA50010E9CD /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ CODE_SIGN_IDENTITY = "";
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_VERSION = "";
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
OBJROOT = Build/Intermediates;
ONLY_ACTIVE_ARCH = YES;
@@ -7661,13 +7738,30 @@
1DEB91B308733DA50010E9CD /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
+ CLANG_WARN_BOOL_CONVERSION = YES;
+ CLANG_WARN_CONSTANT_CONVERSION = YES;
+ CLANG_WARN_EMPTY_BODY = YES;
+ CLANG_WARN_ENUM_CONVERSION = YES;
+ CLANG_WARN_INFINITE_RECURSION = YES;
+ CLANG_WARN_INT_CONVERSION = YES;
+ CLANG_WARN_SUSPICIOUS_MOVE = YES;
+ CLANG_WARN_UNREACHABLE_CODE = YES;
+ CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
+ CODE_SIGN_IDENTITY = "";
+ ENABLE_STRICT_OBJC_MSGSEND = YES;
GCC_C_LANGUAGE_STANDARD = c99;
+ GCC_NO_COMMON_BLOCKS = YES;
GCC_VERSION = "";
+ GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
+ GCC_WARN_UNDECLARED_SELECTOR = YES;
+ GCC_WARN_UNINITIALIZED_AUTOS = YES;
+ GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
OBJROOT = Build/Intermediates;
SDKROOT = macosx;
+ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
VALID_ARCHS = x86_64;
};
name = Release;
@@ -7678,9 +7772,10 @@
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
CLANG_ENABLE_OBJC_ARC = YES;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
EXECUTABLE_PREFIX = lib;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_DYNAMIC_NO_PIC = NO;
@@ -7702,7 +7797,7 @@
);
INSTALL_PATH = "@rpath";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -7728,10 +7823,11 @@
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_CXX_LANGUAGE_STANDARD = "compiler-default";
CLANG_ENABLE_OBJC_ARC = YES;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
EXECUTABLE_PREFIX = lib;
GCC_C_LANGUAGE_STANDARD = c99;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
@@ -7748,7 +7844,7 @@
);
INSTALL_PATH = "@rpath";
LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DNS_BLOCK_ASSERTIONS=1",
"-DCURLAVAILABLE",
@@ -7773,8 +7869,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = NO;
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -7787,6 +7884,7 @@
);
INSTALL_PATH = /usr/local/bin;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -7810,9 +7908,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_MODEL_TUNING = G5;
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../include",
@@ -7823,6 +7922,7 @@
);
INSTALL_PATH = /usr/local/bin;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -7847,8 +7947,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = NO;
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -7867,7 +7968,7 @@
"$(SRCROOT)/dependencies/clucene",
);
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -7889,9 +7990,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_VERSION = "";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -7904,7 +8006,7 @@
"$(SRCROOT)/dependencies/clucene",
);
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -7958,6 +8060,7 @@
SDKROOT = macosx;
SWIFT_OBJC_BRIDGING_HEADER = "test/Tests-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+ SWIFT_VERSION = 2.3;
SYMROOT = "$(PROJECT_DIR)/Build/Products";
VALID_ARCHS = x86_64;
};
@@ -7992,6 +8095,7 @@
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = macosx;
SWIFT_OBJC_BRIDGING_HEADER = "test/Tests-Bridging-Header.h";
+ SWIFT_VERSION = 2.3;
SYMROOT = "$(PROJECT_DIR)/Build/Products";
VALID_ARCHS = x86_64;
};
@@ -8001,8 +8105,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = NO;
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -8015,6 +8120,7 @@
);
INSTALL_PATH = /usr/local/bin;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8038,9 +8144,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_MODEL_TUNING = G5;
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../include",
@@ -8051,6 +8158,7 @@
);
INSTALL_PATH = /usr/local/bin;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8075,8 +8183,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = NO;
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -8089,6 +8198,7 @@
);
INSTALL_PATH = /usr/local/bin;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8112,9 +8222,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_MODEL_TUNING = G5;
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../include",
@@ -8125,6 +8236,7 @@
);
INSTALL_PATH = /usr/local/bin;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8149,8 +8261,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = NO;
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -8163,6 +8276,7 @@
);
INSTALL_PATH = /usr/local/bin;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8186,9 +8300,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_MODEL_TUNING = G5;
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../include",
@@ -8199,6 +8314,7 @@
);
INSTALL_PATH = /usr/local/bin;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8223,8 +8339,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = NO;
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -8237,6 +8354,7 @@
);
INSTALL_PATH = /usr/local/bin;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8260,9 +8378,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_MODEL_TUNING = G5;
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../include",
@@ -8273,6 +8392,7 @@
);
INSTALL_PATH = /usr/local/bin;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8297,8 +8417,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = NO;
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -8311,6 +8432,7 @@
);
INSTALL_PATH = /usr/local/bin;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8334,9 +8456,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_MODEL_TUNING = G5;
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../include",
@@ -8347,6 +8470,7 @@
);
INSTALL_PATH = /usr/local/bin;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8371,8 +8495,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = NO;
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -8385,6 +8510,7 @@
);
INSTALL_PATH = /usr/local/bin;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8408,9 +8534,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_MODEL_TUNING = G5;
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../include",
@@ -8421,6 +8548,7 @@
);
INSTALL_PATH = /usr/local/bin;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8445,8 +8573,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = NO;
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_DYNAMIC_NO_PIC = NO;
GCC_MODEL_TUNING = G5;
GCC_OPTIMIZATION_LEVEL = 0;
@@ -8459,6 +8588,7 @@
);
INSTALL_PATH = /usr/local/bin;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8481,9 +8611,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_MODEL_TUNING = G5;
HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../include",
@@ -8494,6 +8625,7 @@
);
INSTALL_PATH = /usr/local/bin;
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8517,8 +8649,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = NO;
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -8537,7 +8670,7 @@
"$(SRCROOT)/dependencies/clucene",
);
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8559,9 +8692,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_VERSION = "";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -8574,7 +8708,7 @@
"$(SRCROOT)/dependencies/clucene",
);
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8596,8 +8730,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = NO;
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -8616,7 +8751,7 @@
"$(SRCROOT)/dependencies/clucene",
);
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8638,9 +8773,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_VERSION = "";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -8653,7 +8789,7 @@
"$(SRCROOT)/dependencies/clucene",
);
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8675,8 +8811,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = NO;
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -8695,7 +8832,7 @@
"$(SRCROOT)/dependencies/clucene",
);
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8717,9 +8854,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_VERSION = "";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -8732,7 +8870,7 @@
"$(SRCROOT)/dependencies/clucene",
);
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8754,8 +8892,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = NO;
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -8774,7 +8913,7 @@
"$(SRCROOT)/dependencies/clucene",
);
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8796,9 +8935,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_VERSION = "";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -8811,7 +8951,7 @@
"$(SRCROOT)/dependencies/clucene",
);
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8833,8 +8973,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = NO;
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -8853,7 +8994,7 @@
"$(SRCROOT)/dependencies/clucene",
);
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8875,9 +9016,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_VERSION = "";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -8890,7 +9032,7 @@
"$(SRCROOT)/dependencies/clucene",
);
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8912,8 +9054,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = NO;
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -8932,7 +9075,7 @@
"$(SRCROOT)/dependencies/clucene",
);
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8954,9 +9097,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_VERSION = "";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -8969,7 +9113,7 @@
"$(SRCROOT)/dependencies/clucene",
);
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -8991,8 +9135,9 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = NO;
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_PREPROCESSOR_DEFINITIONS = (
@@ -9011,7 +9156,7 @@
"$(SRCROOT)/dependencies/clucene",
);
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
@@ -9033,9 +9178,10 @@
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
- CODE_SIGN_IDENTITY = "Developer ID Application: Manfred Bergmann";
+ CODE_SIGN_IDENTITY = "Mac Developer";
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+ DEVELOPMENT_TEAM = 27XS5W9C3J;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_VERSION = "";
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
@@ -9048,7 +9194,7 @@
"$(SRCROOT)/dependencies/clucene",
);
LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
- MACOSX_DEPLOYMENT_TARGET = 10.7;
+ MACOSX_DEPLOYMENT_TARGET = 10.9;
OTHER_CFLAGS = (
"-DCURLAVAILABLE",
"-Dunix",
Modified: trunk/bindings/objc/src/SwordLocaleManager.h
===================================================================
--- trunk/bindings/objc/src/SwordLocaleManager.h 2016-09-16 15:40:50 UTC (rev 3435)
+++ trunk/bindings/objc/src/SwordLocaleManager.h 2016-10-02 12:27:01 UTC (rev 3436)
@@ -25,4 +25,9 @@
*/
- (void)initLocaleWithLocaledPath:(NSString *)aPath;
+/**
+ Retrieves the configured default locale name
+ */
+- (NSString *)getDefaultLocaleName;
+
@end
Modified: trunk/bindings/objc/src/SwordLocaleManager.mm
===================================================================
--- trunk/bindings/objc/src/SwordLocaleManager.mm 2016-09-16 15:40:50 UTC (rev 3435)
+++ trunk/bindings/objc/src/SwordLocaleManager.mm 2016-10-02 12:27:01 UTC (rev 3436)
@@ -49,10 +49,10 @@
sword::SWBuf locale;
for(it = localeList.begin(); it != localeList.end(); ++it) {
locale = *it;
- NSString *swLoc = [NSString stringWithCString:locale.c_str() encoding:NSUTF8StringEncoding];
- if([swLoc hasPrefix:loc]) {
+ NSString *swLoc = [NSString stringWithUTF8String:locale.c_str()];
+ if([loc hasPrefix:swLoc]) {
haveLocale = YES;
- lang = loc;
+ lang = swLoc;
break;
}
}
@@ -63,4 +63,12 @@
}
}
+- (NSString *)getDefaultLocaleName {
+ sword::LocaleMgr *lManager = sword::LocaleMgr::getSystemLocaleMgr();
+
+ const char *localeName = lManager->getDefaultLocaleName();
+ if(localeName == NULL) return nil;
+ else return [NSString stringWithUTF8String:localeName];
+}
+
@end
Modified: trunk/bindings/objc/src/SwordModule+Index.mm
===================================================================
--- trunk/bindings/objc/src/SwordModule+Index.mm 2016-09-16 15:40:50 UTC (rev 3435)
+++ trunk/bindings/objc/src/SwordModule+Index.mm 2016-10-02 12:27:01 UTC (rev 3436)
@@ -36,7 +36,7 @@
results.sort();
NSMutableArray *retArray = [NSMutableArray array];
- if(results.Count() > 0) {
+ if(results.getCount() > 0) {
while(!results.popError()) {
NSString *keyString = [NSString stringWithUTF8String:results.getText()];
SwordModuleTextEntry *entry = [SwordModuleTextEntry textEntryForKey:keyString andText:nil];
Modified: trunk/bindings/objc/src/SwordModule.mm
===================================================================
--- trunk/bindings/objc/src/SwordModule.mm 2016-09-16 15:40:50 UTC (rev 3435)
+++ trunk/bindings/objc/src/SwordModule.mm 2016-10-02 12:27:01 UTC (rev 3436)
@@ -273,7 +273,7 @@
unicodeChar = [unicodeCharString integerValue];
if (negative) unicodeChar = 65536 - unicodeChar;
i += j+2;
- [retStr appendFormat:@"%C", unicodeChar];
+ [retStr appendFormat:@"%C", (unichar)unicodeChar];
}
@catch (NSException * e) {
[retStr appendFormat:@"%C", c];
Added: trunk/bindings/objc/test/SwordLocaleManagerTest.swift
===================================================================
--- trunk/bindings/objc/test/SwordLocaleManagerTest.swift (rev 0)
+++ trunk/bindings/objc/test/SwordLocaleManagerTest.swift 2016-10-02 12:27:01 UTC (rev 3436)
@@ -0,0 +1,30 @@
+//
+// SwordLocaleManagerTest.swift
+// ObjCSword
+//
+// Created by Manfred Bergmann on 02.10.16.
+//
+//
+
+import XCTest
+
+class SwordLocaleManagerTest: XCTestCase {
+
+ override func setUp() {
+ super.setUp()
+ }
+
+ override func tearDown() {
+ super.tearDown()
+ }
+
+ func testDefaultLocalSetup() {
+ let locMgr = SwordLocaleManager.defaultManager()
+ locMgr.initLocale()
+
+ let defaultLocName = locMgr.getDefaultLocaleName()
+ print(defaultLocName)
+ XCTAssert(defaultLocName != nil)
+ XCTAssert(defaultLocName == "de")
+ }
+}
More information about the sword-cvs
mailing list