[sword-svn] r2775 - in trunk/bindings/objc: ObjCSword.xcodeproj cs.lproj test

mdbergmann at crosswire.org mdbergmann at crosswire.org
Thu Jan 24 12:29:55 MST 2013


Author: mdbergmann
Date: 2013-01-24 12:29:54 -0700 (Thu, 24 Jan 2013)
New Revision: 2775

Added:
   trunk/bindings/objc/test/Tests-Info.plist
Removed:
   trunk/bindings/objc/cs.lproj/InfoPlist.strings
Modified:
   trunk/bindings/objc/ObjCSword.xcodeproj/project.pbxproj
   trunk/bindings/objc/test/SwordListKeyTest.m
   trunk/bindings/objc/test/SwordManagerTest.m
   trunk/bindings/objc/test/SwordModuleTest.m
Log:
test fixes. project cleanups and updates.

Modified: trunk/bindings/objc/ObjCSword.xcodeproj/project.pbxproj
===================================================================
--- trunk/bindings/objc/ObjCSword.xcodeproj/project.pbxproj	2013-01-24 18:56:49 UTC (rev 2774)
+++ trunk/bindings/objc/ObjCSword.xcodeproj/project.pbxproj	2013-01-24 19:29:54 UTC (rev 2775)
@@ -38,21 +38,18 @@
 
 /* Begin PBXBuildFile section */
 		8C92C31DC92DF0671FCEB5B3 /* SwordFilter.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8C92CC111DC521DE0C054C60 /* SwordFilter.mm */; };
-		8C92C5E680D42D8CA7372C1F /* FilterProviderFactory.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8C92C72ADACB017A434CD268 /* FilterProviderFactory.h */; };
-		8C92C5F8212FBE600D41B567 /* SwordUtil.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8C92C7B2EB245D47FEB5E3B0 /* SwordUtil.h */; };
-		8C92CA44C1F2D85EE4A21B63 /* SwordFilter.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8C92C02A5C86E1C75ED1CEF4 /* SwordFilter.h */; };
-		8C92CC5DBC97CC4797507817 /* DefaultFilterProvider.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8C92C980D4DE32C7AB93159D /* DefaultFilterProvider.h */; };
 		8C92CC7B68FDCDFFFB8B4A31 /* DefaultFilterProvider.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8C92C0124F354F4CB4F294F9 /* DefaultFilterProvider.mm */; };
 		8C92CE0B19FBB659FB8F8B71 /* FilterProviderFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8C92C25F57CB01957B086256 /* FilterProviderFactory.mm */; };
 		8C92CE39E231FF9CAAB5308B /* SwordUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 8C92C291C40A77060C12A21B /* SwordUtil.m */; };
 		8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C1666FE841158C02AAC07 /* InfoPlist.strings */; };
 		8DC2EF570486A6940098B216 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7B1FEA5585E11CA2CBB /* Cocoa.framework */; };
+		A917AF2616B1BE38006367FC /* Tests-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = A917AF2516B1BE38006367FC /* Tests-Info.plist */; };
 		A929619C16B1BA240094E5BE /* SwordBibleTextEntry.m in Sources */ = {isa = PBXBuildFile; fileRef = A929619616B1BA240094E5BE /* SwordBibleTextEntry.m */; };
-		A929619D16B1BA240094E5BE /* SwordKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A929619716B1BA240094E5BE /* SwordKey.h */; };
+		A929619D16B1BA240094E5BE /* SwordKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A929619716B1BA240094E5BE /* SwordKey.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A929619E16B1BA240094E5BE /* SwordKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A929619816B1BA240094E5BE /* SwordKey.mm */; };
-		A929619F16B1BA240094E5BE /* SwordListKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A929619916B1BA240094E5BE /* SwordListKey.h */; };
+		A929619F16B1BA240094E5BE /* SwordListKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A929619916B1BA240094E5BE /* SwordListKey.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A92961A016B1BA240094E5BE /* SwordListKey.mm in Sources */ = {isa = PBXBuildFile; fileRef = A929619A16B1BA240094E5BE /* SwordListKey.mm */; };
-		A92961A116B1BA240094E5BE /* SwordVerseKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A929619B16B1BA240094E5BE /* SwordVerseKey.h */; };
+		A92961A116B1BA240094E5BE /* SwordVerseKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A929619B16B1BA240094E5BE /* SwordVerseKey.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A94EAC0B117B28920018B06F /* SwordBible.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE3117B28910018B06F /* SwordBible.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		A94EAC0C117B28920018B06F /* SwordBible.mm in Sources */ = {isa = PBXBuildFile; fileRef = A94EABE4117B28910018B06F /* SwordBible.mm */; };
 		A94EAC0D117B28920018B06F /* SwordBibleBook.h in Headers */ = {isa = PBXBuildFile; fileRef = A94EABE5117B28920018B06F /* SwordBibleBook.h */; settings = {ATTRIBUTES = (Public, ); }; };
@@ -360,7 +357,6 @@
 		A9BDFA7D1207FA2F0067ED5B /* SwordModuleLongRunTest.mm in Sources */ = {isa = PBXBuildFile; fileRef = A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */; };
 		A9BFB0A513EDF51100032679 /* SenTestingKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9BFB0A413EDF51000032679 /* SenTestingKit.framework */; };
 		A9BFB0A713EDF51100032679 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A9BFB0A613EDF51100032679 /* Cocoa.framework */; };
-		A9BFB0B113EDF51100032679 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = A9BFB0AF13EDF51100032679 /* InfoPlist.strings */; };
 		A9BFB0BC13EDF5C900032679 /* SwordManagerTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A964658111C663E200640FAC /* SwordManagerTest.m */; };
 		A9BFB0BD13EDF5C900032679 /* SwordModuleTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A918B8E311C6697400024D84 /* SwordModuleTest.m */; };
 		A9BFB0BE13EDF5C900032679 /* SwordListKeyTest.m in Sources */ = {isa = PBXBuildFile; fileRef = A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */; };
@@ -669,10 +665,6 @@
 			dstSubfolderSpec = 10;
 			files = (
 				A9D9FA0B13EEE5CF00EA9DEB /* libsword.dylib in CopyFiles */,
-				8C92C5F8212FBE600D41B567 /* SwordUtil.h in CopyFiles */,
-				8C92C5E680D42D8CA7372C1F /* FilterProviderFactory.h in CopyFiles */,
-				8C92CC5DBC97CC4797507817 /* DefaultFilterProvider.h in CopyFiles */,
-				8C92CA44C1F2D85EE4A21B63 /* SwordFilter.h in CopyFiles */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -694,7 +686,7 @@
 		8C92CC111DC521DE0C054C60 /* SwordFilter.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordFilter.mm; path = src/SwordFilter.mm; sourceTree = "<group>"; };
 		8DC2EF5A0486A6940098B216 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		8DC2EF5B0486A6940098B216 /* ObjCSword.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = ObjCSword.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		A9013D3F11E316C700E1CCCA /* Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Info copy.plist"; sourceTree = "<group>"; };
+		A917AF2516B1BE38006367FC /* Tests-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = "<group>"; };
 		A918B8E211C6697400024D84 /* SwordModuleTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleTest.h; path = ../test/SwordModuleTest.h; sourceTree = "<group>"; };
 		A918B8E311C6697400024D84 /* SwordModuleTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordModuleTest.m; path = ../test/SwordModuleTest.m; sourceTree = "<group>"; };
 		A929619616B1BA240094E5BE /* SwordBibleTextEntry.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordBibleTextEntry.m; path = src/SwordBibleTextEntry.m; sourceTree = "<group>"; };
@@ -733,8 +725,6 @@
 		A94EAC08117B28920018B06F /* SwordVerseManager.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = SwordVerseManager.mm; path = src/SwordVerseManager.mm; sourceTree = "<group>"; };
 		A94EAC09117B28920018B06F /* VerseEnumerator.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VerseEnumerator.h; path = src/VerseEnumerator.h; sourceTree = "<group>"; };
 		A94EAC0A117B28920018B06F /* VerseEnumerator.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = VerseEnumerator.mm; path = src/VerseEnumerator.mm; sourceTree = "<group>"; };
-		A95043E315BC87F600D89B38 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		A950440315BC87F600D89B38 /* cs */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = cs; path = cs.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		A954A80113EE98B30094E3FE /* swdisp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swdisp.cpp; sourceTree = "<group>"; };
 		A954A80213EE98B30094E3FE /* swlog.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = swlog.cpp; sourceTree = "<group>"; };
 		A954A80913EE98B30094E3FE /* listkey.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = listkey.cpp; sourceTree = "<group>"; };
@@ -1165,7 +1155,6 @@
 		A9A2C17C118D9D3D0002873D /* Notifications.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Notifications.h; path = src/Notifications.h; sourceTree = "<group>"; };
 		A9A7EEB414D5D61700B76B6A /* osis2mod */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = osis2mod; sourceTree = BUILT_PRODUCTS_DIR; };
 		A9BDFA6B1207F9870067ED5B /* Tests.octest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Tests.octest; sourceTree = BUILT_PRODUCTS_DIR; };
-		A9BDFA6E1207F9870067ED5B /* Tests-Info copy.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info copy.plist"; sourceTree = "<group>"; };
 		A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordListKeyTest.h; path = ../test/SwordListKeyTest.h; sourceTree = "<group>"; };
 		A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SwordListKeyTest.m; path = ../test/SwordListKeyTest.m; sourceTree = "<group>"; };
 		A9BDFA7A1207FA2F0067ED5B /* SwordModuleLongRunTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SwordModuleLongRunTest.h; path = ../test/SwordModuleLongRunTest.h; sourceTree = "<group>"; };
@@ -1176,11 +1165,7 @@
 		A9BFB0A913EDF51100032679 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
 		A9BFB0AA13EDF51100032679 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; };
 		A9BFB0AB13EDF51100032679 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		A9BFB0AE13EDF51100032679 /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = "Tests-Info.plist"; path = "../Tests/Tests-Info.plist"; sourceTree = "<group>"; };
-		A9BFB0B013EDF51100032679 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		A9BFB0B613EDF51100032679 /* Tests-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = "Tests-Prefix.pch"; path = "../Tests/Tests-Prefix.pch"; sourceTree = "<group>"; };
 		A9C2818D11C43BD400803CB5 /* SenTestingKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SenTestingKit.framework; path = Library/Frameworks/SenTestingKit.framework; sourceTree = DEVELOPER_DIR; };
-		A9C2819711C43C4900803CB5 /* Tests-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "Tests-Info.plist"; sourceTree = "<group>"; };
 		A9C2856D11C446B700803CB5 /* Configuration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Configuration.h; path = src/services/Configuration.h; sourceTree = "<group>"; };
 		A9C2857111C4471400803CB5 /* OSXConfiguration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = OSXConfiguration.h; path = src/services/OSXConfiguration.h; sourceTree = "<group>"; };
 		A9C2857211C4471400803CB5 /* OSXConfiguration.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = OSXConfiguration.m; path = src/services/OSXConfiguration.m; sourceTree = "<group>"; };
@@ -1420,8 +1405,6 @@
 				A9BFB0AC13EDF51100032679 /* Tests */,
 				A9BFB0A313EDF51000032679 /* Frameworks */,
 				034768DFFF38A50411DB9C8B /* Products */,
-				A9C2819711C43C4900803CB5 /* Tests-Info.plist */,
-				A9BDFA6E1207F9870067ED5B /* Tests-Info copy.plist */,
 			);
 			name = ObjCSword;
 			sourceTree = "<group>";
@@ -1441,7 +1424,6 @@
 				A9D437CE11C52947007AFE83 /* locales.d */,
 				8DC2EF5A0486A6940098B216 /* Info.plist */,
 				089C1666FE841158C02AAC07 /* InfoPlist.strings */,
-				A9013D3F11E316C700E1CCCA /* Info copy.plist */,
 			);
 			name = Resources;
 			sourceTree = "<group>";
@@ -2318,6 +2300,7 @@
 		A9BFB0AC13EDF51100032679 /* Tests */ = {
 			isa = PBXGroup;
 			children = (
+				A917AF2516B1BE38006367FC /* Tests-Info.plist */,
 				A964658011C663E200640FAC /* SwordManagerTest.h */,
 				A964658111C663E200640FAC /* SwordManagerTest.m */,
 				A918B8E211C6697400024D84 /* SwordModuleTest.h */,
@@ -2326,21 +2309,11 @@
 				A9BDFA7B1207FA2F0067ED5B /* SwordModuleLongRunTest.mm */,
 				A9BDFA761207F9F00067ED5B /* SwordListKeyTest.h */,
 				A9BDFA771207F9F00067ED5B /* SwordListKeyTest.m */,
-				A9BFB0AD13EDF51100032679 /* Supporting Files */,
 			);
-			path = Tests;
+			name = Tests;
+			path = test;
 			sourceTree = "<group>";
 		};
-		A9BFB0AD13EDF51100032679 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				A9BFB0AE13EDF51100032679 /* Tests-Info.plist */,
-				A9BFB0AF13EDF51100032679 /* InfoPlist.strings */,
-				A9BFB0B613EDF51100032679 /* Tests-Prefix.pch */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */
@@ -2800,6 +2773,7 @@
 			files = (
 				8DC2EF530486A6940098B216 /* InfoPlist.strings in Resources */,
 				A9D4382311C52947007AFE83 /* locales.d in Resources */,
+				A917AF2616B1BE38006367FC /* Tests-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2814,7 +2788,6 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A9BFB0B113EDF51100032679 /* InfoPlist.strings in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -3485,20 +3458,10 @@
 			isa = PBXVariantGroup;
 			children = (
 				089C1667FE841158C02AAC07 /* English */,
-				A95043E315BC87F600D89B38 /* cs */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
 		};
-		A9BFB0AF13EDF51100032679 /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				A9BFB0B013EDF51100032679 /* en */,
-				A950440315BC87F600D89B38 /* cs */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
 /* End PBXVariantGroup section */
 
 /* Begin XCBuildConfiguration section */
@@ -3819,665 +3782,6 @@
 			};
 			name = Release;
 		};
-		A9ADDA2815E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ARCHS = "$(ARCHS_STANDARD_32_64_BIT)";
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_VERSION = "";
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				SDKROOT = macosx10.7;
-			};
-			name = AppStore;
-		};
-		A9ADDA2915E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				DYLIB_COMPATIBILITY_VERSION = 1;
-				DYLIB_CURRENT_VERSION = 1;
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"\"$(DEVELOPER_FRAMEWORKS_DIR)\"",
-				);
-				FRAMEWORK_VERSION = A;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_ENABLE_OBJC_GC = required;
-				GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
-				GCC_INLINES_ARE_PRIVATE_EXTERN = NO;
-				GCC_OPTIMIZATION_LEVEL = s;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = ObjCSword_Prefix.pch;
-				GCC_VERSION = "";
-				HEADER_SEARCH_PATHS = "../../include/**";
-				INFOPLIST_FILE = Info.plist;
-				INSTALL_PATH = "@rpath";
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				OTHER_CFLAGS = "-DRELEASE";
-				OTHER_LDFLAGS = (
-					"-lcurl",
-					"-lz",
-					"-licucore",
-				);
-				PRODUCT_NAME = ObjCSword;
-				SDKROOT = macosx10.7;
-				VALID_ARCHS = x86_64;
-				WARNING_CFLAGS = "-Wall";
-				WRAPPER_EXTENSION = framework;
-			};
-			name = AppStore;
-		};
-		A9ADDA2A15E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_ENABLE_OBJC_GC = required;
-				GCC_MODEL_TUNING = G5;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h";
-				INFOPLIST_FILE = "Tests-Info copy.plist";
-				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
-				OTHER_LDFLAGS = (
-					"-framework",
-					Cocoa,
-					"-framework",
-					SenTestingKit,
-				);
-				PRODUCT_NAME = Tests;
-				SDKROOT = macosx10.7;
-				WRAPPER_EXTENSION = octest;
-				ZERO_LINK = NO;
-			};
-			name = AppStore;
-		};
-		A9ADDA2B15E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				FRAMEWORK_SEARCH_PATHS = "$(DEVELOPER_LIBRARY_DIR)/Frameworks";
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_ENABLE_OBJC_GC = required;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "Tests/Tests-Prefix.pch";
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				INFOPLIST_FILE = "Tests/Tests-Info.plist";
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx10.7;
-				WRAPPER_EXTENSION = octest;
-			};
-			name = AppStore;
-		};
-		A9ADDA2C15E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				EXECUTABLE_PREFIX = lib;
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_VERSION = "";
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				HEADER_SEARCH_PATHS = (
-					"$(SRCROOT)/../../include/**",
-					"$(SRCROOT)/dependencies/clucene/**",
-					"$(SRCROOT)/dependencies/icu/include/**",
-				);
-				INSTALL_PATH = "@rpath";
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				OTHER_CFLAGS = (
-					"-DNS_BLOCK_ASSERTIONS=1",
-					"-DCURLAVAILABLE",
-					"-Dunix",
-					"-D__unix__",
-					"-DUSELUCENE",
-					"-D_ICU_",
-				);
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SDKROOT = macosx10.7;
-				USER_HEADER_SEARCH_PATHS = "$(SRCROOT)/../../include/**/** $(SRCROOT)/dependencies/clucene/** $(SRCROOT)/dependencies/icu/include/**";
-				VALID_ARCHS = x86_64;
-			};
-			name = AppStore;
-		};
-		A9ADDA2D15E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_MODEL_TUNING = G5;
-				HEADER_SEARCH_PATHS = (
-					"../../include/**",
-					"$(SRCROOT)/dependencies/icu/include/**",
-				);
-				INSTALL_PATH = /usr/local/bin;
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
-				OTHER_CFLAGS = (
-					"-DCURLAVAILABLE",
-					"-Dunix",
-					"-D__unix__",
-					"-D_ICU_",
-				);
-				OTHER_LDFLAGS = (
-					"-lcurl",
-					"-lz",
-					"-licucore",
-				);
-				PRODUCT_NAME = imp2gbs;
-				SDKROOT = macosx10.7;
-				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
-				ZERO_LINK = NO;
-			};
-			name = AppStore;
-		};
-		A9ADDA2E15E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_MODEL_TUNING = G5;
-				HEADER_SEARCH_PATHS = (
-					"../../include/**",
-					"$(SRCROOT)/dependencies/icu/include/**",
-				);
-				INSTALL_PATH = /usr/local/bin;
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
-				OTHER_CFLAGS = (
-					"-DCURLAVAILABLE",
-					"-Dunix",
-					"-D__unix__",
-					"-D_ICU_",
-				);
-				OTHER_LDFLAGS = (
-					"-lcurl",
-					"-lz",
-					"-licucore",
-				);
-				PRODUCT_NAME = imp2ld;
-				SDKROOT = macosx10.7;
-				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
-				ZERO_LINK = NO;
-			};
-			name = AppStore;
-		};
-		A9ADDA2F15E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_MODEL_TUNING = G5;
-				HEADER_SEARCH_PATHS = (
-					"../../include/**",
-					"$(SRCROOT)/dependencies/icu/include/**",
-				);
-				INSTALL_PATH = /usr/local/bin;
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
-				OTHER_CFLAGS = (
-					"-DCURLAVAILABLE",
-					"-Dunix",
-					"-D__unix__",
-					"-D_ICU_",
-				);
-				OTHER_LDFLAGS = (
-					"-lcurl",
-					"-lz",
-					"-licucore",
-				);
-				PRODUCT_NAME = imp2vs;
-				SDKROOT = macosx10.7;
-				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
-				ZERO_LINK = NO;
-			};
-			name = AppStore;
-		};
-		A9ADDA3015E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_MODEL_TUNING = G5;
-				HEADER_SEARCH_PATHS = (
-					"../../include/**",
-					"$(SRCROOT)/dependencies/icu/include/**",
-				);
-				INSTALL_PATH = /usr/local/bin;
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
-				OTHER_CFLAGS = (
-					"-DCURLAVAILABLE",
-					"-Dunix",
-					"-D__unix__",
-					"-D_ICU_",
-				);
-				OTHER_LDFLAGS = (
-					"-lcurl",
-					"-lz",
-					"-licucore",
-				);
-				PRODUCT_NAME = installmgr;
-				SDKROOT = macosx10.7;
-				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
-				ZERO_LINK = NO;
-			};
-			name = AppStore;
-		};
-		A9ADDA3115E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_MODEL_TUNING = G5;
-				HEADER_SEARCH_PATHS = (
-					"../../include/**",
-					"$(SRCROOT)/dependencies/icu/include/**",
-				);
-				INSTALL_PATH = /usr/local/bin;
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
-				OTHER_CFLAGS = (
-					"-DCURLAVAILABLE",
-					"-Dunix",
-					"-D__unix__",
-					"-D_ICU_",
-				);
-				OTHER_LDFLAGS = (
-					"-lcurl",
-					"-lz",
-					"-licucore",
-				);
-				PRODUCT_NAME = mod2imp;
-				SDKROOT = macosx10.7;
-				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
-				ZERO_LINK = NO;
-			};
-			name = AppStore;
-		};
-		A9ADDA3215E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_MODEL_TUNING = G5;
-				HEADER_SEARCH_PATHS = (
-					"../../include/**",
-					"$(SRCROOT)/dependencies/icu/include/**",
-				);
-				INSTALL_PATH = /usr/local/bin;
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
-				OTHER_CFLAGS = (
-					"-DCURLAVAILABLE",
-					"-Dunix",
-					"-D__unix__",
-					"-D_ICU_",
-				);
-				OTHER_LDFLAGS = (
-					"-lcurl",
-					"-lz",
-					"-licucore",
-				);
-				PRODUCT_NAME = mod2osis;
-				SDKROOT = macosx10.7;
-				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
-				ZERO_LINK = NO;
-			};
-			name = AppStore;
-		};
-		A9ADDA3315E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_MODEL_TUNING = G5;
-				HEADER_SEARCH_PATHS = (
-					"../../include/**",
-					"$(SRCROOT)/dependencies/icu/include/**",
-				);
-				INSTALL_PATH = /usr/local/bin;
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
-				OTHER_CFLAGS = (
-					"-DCURLAVAILABLE",
-					"-Dunix",
-					"-D__unix__",
-					"-D_ICU_",
-				);
-				OTHER_LDFLAGS = (
-					"-lcurl",
-					"-lz",
-					"-licucore",
-				);
-				PRODUCT_NAME = mod2vpl;
-				SDKROOT = macosx10.7;
-				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
-				ZERO_LINK = NO;
-			};
-			name = AppStore;
-		};
-		A9ADDA3415E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_MODEL_TUNING = G5;
-				HEADER_SEARCH_PATHS = (
-					"../../include/**",
-					"$(SRCROOT)/dependencies/icu/include/**",
-				);
-				INSTALL_PATH = /usr/local/bin;
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
-				OTHER_CFLAGS = (
-					"-DCURLAVAILABLE",
-					"-Dunix",
-					"-D__unix__",
-					"-D_ICU_",
-				);
-				OTHER_LDFLAGS = (
-					"-lcurl",
-					"-lz",
-					"-licucore",
-				);
-				PRODUCT_NAME = mod2zmod;
-				SDKROOT = macosx10.7;
-				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
-				ZERO_LINK = NO;
-			};
-			name = AppStore;
-		};
-		A9ADDA3515E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_VERSION = "";
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				HEADER_SEARCH_PATHS = (
-					"../../include/**",
-					"$(SRCROOT)/dependencies/icu/include/**",
-				);
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				OTHER_CFLAGS = (
-					"-DCURLAVAILABLE",
-					"-Dunix",
-					"-D__unix__",
-					"-D_ICU_",
-				);
-				OTHER_LDFLAGS = (
-					"-lcurl",
-					"-lz",
-					"-licucore",
-				);
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = AppStore;
-		};
-		A9ADDA3615E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_VERSION = "";
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				HEADER_SEARCH_PATHS = (
-					"../../include/**",
-					"$(SRCROOT)/dependencies/icu/include/**",
-				);
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				OTHER_CFLAGS = (
-					"-DCURLAVAILABLE",
-					"-Dunix",
-					"-D__unix__",
-					"-D_ICU_",
-				);
-				OTHER_LDFLAGS = (
-					"-lcurl",
-					"-lz",
-					"-licucore",
-				);
-				PRODUCT_NAME = step2vpl;
-			};
-			name = AppStore;
-		};
-		A9ADDA3715E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_VERSION = "";
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				HEADER_SEARCH_PATHS = (
-					"../../include/**",
-					"$(SRCROOT)/dependencies/icu/include/**",
-				);
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				OTHER_CFLAGS = (
-					"-DCURLAVAILABLE",
-					"-Dunix",
-					"-D__unix__",
-					"-D_ICU_",
-				);
-				OTHER_LDFLAGS = (
-					"-lcurl",
-					"-lz",
-					"-licucore",
-				);
-				PRODUCT_NAME = stepdump;
-			};
-			name = AppStore;
-		};
-		A9ADDA3815E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_VERSION = "";
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				HEADER_SEARCH_PATHS = (
-					"../../include/**",
-					"$(SRCROOT)/dependencies/icu/include/**",
-				);
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				OTHER_CFLAGS = (
-					"-DCURLAVAILABLE",
-					"-Dunix",
-					"-D__unix__",
-					"-D_ICU_",
-				);
-				OTHER_LDFLAGS = (
-					"-lcurl",
-					"-lz",
-					"-licucore",
-				);
-				PRODUCT_NAME = tei2mod;
-			};
-			name = AppStore;
-		};
-		A9ADDA3915E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_VERSION = "";
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				HEADER_SEARCH_PATHS = (
-					"../../include/**",
-					"$(SRCROOT)/dependencies/icu/include/**",
-				);
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				OTHER_CFLAGS = (
-					"-DCURLAVAILABLE",
-					"-Dunix",
-					"-D__unix__",
-					"-D_ICU_",
-				);
-				OTHER_LDFLAGS = (
-					"-lcurl",
-					"-lz",
-					"-licucore",
-				);
-				PRODUCT_NAME = vpl2mod;
-			};
-			name = AppStore;
-		};
-		A9ADDA3A15E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_VERSION = "";
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				HEADER_SEARCH_PATHS = (
-					"../../include/**",
-					"$(SRCROOT)/dependencies/icu/include/**",
-				);
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				OTHER_CFLAGS = (
-					"-DCURLAVAILABLE",
-					"-Dunix",
-					"-D__unix__",
-					"-D_ICU_",
-				);
-				OTHER_LDFLAGS = (
-					"-lcurl",
-					"-lz",
-					"-licucore",
-				);
-				PRODUCT_NAME = vs2osisref;
-			};
-			name = AppStore;
-		};
-		A9ADDA3B15E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_VERSION = "";
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				HEADER_SEARCH_PATHS = (
-					"../../include/**",
-					"$(SRCROOT)/dependencies/icu/include/**",
-				);
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				OTHER_CFLAGS = (
-					"-DCURLAVAILABLE",
-					"-Dunix",
-					"-D__unix__",
-					"-D_ICU_",
-				);
-				OTHER_LDFLAGS = (
-					"-lcurl",
-					"-lz",
-					"-licucore",
-				);
-				PRODUCT_NAME = vs2osisreftxt;
-			};
-			name = AppStore;
-		};
-		A9ADDA3C15E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_64_BIT)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
-				GCC_VERSION = "";
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				HEADER_SEARCH_PATHS = (
-					"../../include/**",
-					"$(SRCROOT)/dependencies/icu/include/**",
-				);
-				LD_RUNPATH_SEARCH_PATHS = "@loader_path/../../Frameworks/ObjCSword.framework/Versions/A/Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
-				OTHER_CFLAGS = (
-					"-DCURLAVAILABLE",
-					"-Dunix",
-					"-D__unix__",
-					"-D_ICU_",
-				);
-				OTHER_LDFLAGS = (
-					"-lcurl",
-					"-lz",
-					"-licucore",
-				);
-				PRODUCT_NAME = xml2gbs;
-			};
-			name = AppStore;
-		};
-		A9ADDA3D15E2D73E00675628 /* AppStore */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				PRODUCT_NAME = "$(TARGET_NAME)";
-			};
-			name = AppStore;
-		};
 		A9BDFA691207F9870067ED5B /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -4492,7 +3796,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h";
-				INFOPLIST_FILE = "Tests-Info copy.plist";
+				INFOPLIST_FILE = "test/Tests-Info.plist";
 				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				ONLY_ACTIVE_ARCH = YES;
@@ -4504,6 +3808,7 @@
 				);
 				PRODUCT_NAME = Tests;
 				SDKROOT = macosx10.7;
+				VALID_ARCHS = x86_64;
 				WRAPPER_EXTENSION = octest;
 			};
 			name = Debug;
@@ -4520,7 +3825,7 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "$(SYSTEM_LIBRARY_DIR)/Frameworks/Cocoa.framework/Headers/Cocoa.h";
-				INFOPLIST_FILE = "Tests-Info copy.plist";
+				INFOPLIST_FILE = "test/Tests-Info.plist";
 				INSTALL_PATH = "$(USER_LIBRARY_DIR)/Bundles";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = (
@@ -4531,6 +3836,7 @@
 				);
 				PRODUCT_NAME = Tests;
 				SDKROOT = macosx10.7;
+				VALID_ARCHS = x86_64;
 				WRAPPER_EXTENSION = octest;
 				ZERO_LINK = NO;
 			};
@@ -4547,7 +3853,6 @@
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_ENABLE_OBJC_GC = required;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "Tests/Tests-Prefix.pch";
 				GCC_PREPROCESSOR_DEFINITIONS = (
 					"DEBUG=1",
 					"$(inherited)",
@@ -4556,10 +3861,11 @@
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				INFOPLIST_FILE = "Tests/Tests-Info.plist";
+				INFOPLIST_FILE = "test/Tests-Info.plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx10.7;
+				VALID_ARCHS = x86_64;
 				WRAPPER_EXTENSION = octest;
 			};
 			name = Debug;
@@ -4575,14 +3881,14 @@
 				GCC_ENABLE_OBJC_EXCEPTIONS = YES;
 				GCC_ENABLE_OBJC_GC = required;
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "Tests/Tests-Prefix.pch";
 				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
 				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
 				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				INFOPLIST_FILE = "Tests/Tests-Info.plist";
+				INFOPLIST_FILE = "test/Tests-Info.plist";
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = macosx10.7;
+				VALID_ARCHS = x86_64;
 				WRAPPER_EXTENSION = octest;
 			};
 			name = Release;
@@ -5540,7 +4846,6 @@
 			buildConfigurations = (
 				1DEB91AE08733DA50010E9CD /* Debug */,
 				1DEB91AF08733DA50010E9CD /* Release */,
-				A9ADDA2915E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5550,7 +4855,6 @@
 			buildConfigurations = (
 				1DEB91B208733DA50010E9CD /* Debug */,
 				1DEB91B308733DA50010E9CD /* Release */,
-				A9ADDA2815E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5560,7 +4864,6 @@
 			buildConfigurations = (
 				A954ABC513EE9AB00094E3FE /* Debug */,
 				A954ABC613EE9AB00094E3FE /* Release */,
-				A9ADDA2C15E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5570,7 +4873,6 @@
 			buildConfigurations = (
 				A975EEDE11C792BA007C1532 /* Debug */,
 				A975EEDF11C792BA007C1532 /* Release */,
-				A9ADDA3215E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5580,7 +4882,6 @@
 			buildConfigurations = (
 				A9A7EEBC14D5D61700B76B6A /* Debug */,
 				A9A7EEBD14D5D61700B76B6A /* Release */,
-				A9ADDA3515E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5590,7 +4891,6 @@
 			buildConfigurations = (
 				A9BDFA691207F9870067ED5B /* Debug */,
 				A9BDFA6A1207F9870067ED5B /* Release */,
-				A9ADDA2A15E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5600,7 +4900,6 @@
 			buildConfigurations = (
 				A9BFB0B813EDF51100032679 /* Debug */,
 				A9BFB0B913EDF51100032679 /* Release */,
-				A9ADDA2B15E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5610,7 +4909,6 @@
 			buildConfigurations = (
 				A9D2714C14D717D800DA8926 /* Debug */,
 				A9D2714D14D717D800DA8926 /* Release */,
-				A9ADDA2D15E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5620,7 +4918,6 @@
 			buildConfigurations = (
 				A9D2715914D717FD00DA8926 /* Debug */,
 				A9D2715A14D717FD00DA8926 /* Release */,
-				A9ADDA2E15E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5630,7 +4927,6 @@
 			buildConfigurations = (
 				A9D2716614D7181200DA8926 /* Debug */,
 				A9D2716714D7181200DA8926 /* Release */,
-				A9ADDA2F15E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5640,7 +4936,6 @@
 			buildConfigurations = (
 				A9D2717314D7182300DA8926 /* Debug */,
 				A9D2717414D7182300DA8926 /* Release */,
-				A9ADDA3015E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5650,7 +4945,6 @@
 			buildConfigurations = (
 				A9D2718014D7183B00DA8926 /* Debug */,
 				A9D2718114D7183B00DA8926 /* Release */,
-				A9ADDA3115E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5660,7 +4954,6 @@
 			buildConfigurations = (
 				A9D2718D14D7185800DA8926 /* Debug */,
 				A9D2718E14D7185800DA8926 /* Release */,
-				A9ADDA3315E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5670,7 +4963,6 @@
 			buildConfigurations = (
 				A9D2719A14D7186A00DA8926 /* Debug */,
 				A9D2719B14D7186A00DA8926 /* Release */,
-				A9ADDA3415E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5680,7 +4972,6 @@
 			buildConfigurations = (
 				A9D271A714D7187E00DA8926 /* Debug */,
 				A9D271A814D7187E00DA8926 /* Release */,
-				A9ADDA3615E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5690,7 +4981,6 @@
 			buildConfigurations = (
 				A9D271B414D7189300DA8926 /* Debug */,
 				A9D271B514D7189300DA8926 /* Release */,
-				A9ADDA3715E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5700,7 +4990,6 @@
 			buildConfigurations = (
 				A9D271C114D718A400DA8926 /* Debug */,
 				A9D271C214D718A400DA8926 /* Release */,
-				A9ADDA3815E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5710,7 +4999,6 @@
 			buildConfigurations = (
 				A9D271CE14D718B800DA8926 /* Debug */,
 				A9D271CF14D718B800DA8926 /* Release */,
-				A9ADDA3915E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5720,7 +5008,6 @@
 			buildConfigurations = (
 				A9D271DB14D718C800DA8926 /* Debug */,
 				A9D271DC14D718C800DA8926 /* Release */,
-				A9ADDA3A15E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5730,7 +5017,6 @@
 			buildConfigurations = (
 				A9D271E814D718DF00DA8926 /* Debug */,
 				A9D271E914D718DF00DA8926 /* Release */,
-				A9ADDA3B15E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5740,7 +5026,6 @@
 			buildConfigurations = (
 				A9D271F514D718F500DA8926 /* Debug */,
 				A9D271F614D718F500DA8926 /* Release */,
-				A9ADDA3C15E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
@@ -5750,7 +5035,6 @@
 			buildConfigurations = (
 				A9D271FC14D7193300DA8926 /* Debug */,
 				A9D271FD14D7193300DA8926 /* Release */,
-				A9ADDA3D15E2D73E00675628 /* AppStore */,
 			);
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;

Deleted: trunk/bindings/objc/cs.lproj/InfoPlist.strings
===================================================================
--- trunk/bindings/objc/cs.lproj/InfoPlist.strings	2013-01-24 18:56:49 UTC (rev 2774)
+++ trunk/bindings/objc/cs.lproj/InfoPlist.strings	2013-01-24 19:29:54 UTC (rev 2775)
@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-

Modified: trunk/bindings/objc/test/SwordListKeyTest.m
===================================================================
--- trunk/bindings/objc/test/SwordListKeyTest.m	2013-01-24 18:56:49 UTC (rev 2774)
+++ trunk/bindings/objc/test/SwordListKeyTest.m	2013-01-24 19:29:54 UTC (rev 2775)
@@ -6,14 +6,8 @@
 //  Copyright 2009 __MyCompanyName__. All rights reserved.
 //
 
+#import <ObjCSword/ObjCSword.h>
 #import "SwordListKeyTest.h"
-#ifdef TARGET_IPHONE_SIMULATOR
-#import "SwordListKey.h"
-#import "SwordVerseKey.h"
-#import "VerseEnumerator.h"
-#else
-#import "ObjCSword/ObjCSword.h"
-#endif
 
 @implementation SwordListKeyTest
 
@@ -47,7 +41,7 @@
     
     VerseEnumerator *ve = [lk verseEnumerator];
     int count = 0;
-    NSString *ref = nil;
+    NSString *ref;
     while((ref = [ve nextObject])) {
         count++;
     }

Modified: trunk/bindings/objc/test/SwordManagerTest.m
===================================================================
--- trunk/bindings/objc/test/SwordManagerTest.m	2013-01-24 18:56:49 UTC (rev 2774)
+++ trunk/bindings/objc/test/SwordManagerTest.m	2013-01-24 19:29:54 UTC (rev 2775)
@@ -6,21 +6,13 @@
 //  Copyright 2010 Software by MABE. All rights reserved.
 //
 
+#import <ObjCSword/ObjCSword.h>
 #import "SwordManagerTest.h"
 
-#import "Configuration.h"
-//#import "iOSConfiguration.h"
-#import "OSXConfiguration.h"
-#import "SwordManager.h"
-
 @implementation SwordManagerTest
 
 - (void)setUp {
-#ifdef TARGET_IPHONE_SIMULATOR
-//    [[Configuration config] setClass:[iOSConfiguration class]];
-#else
-#endif
-    [Configuration configWithImpl:[[OSXConfiguration alloc] init]];
+    [Configuration configWithImpl:[[[OSXConfiguration alloc] init] autorelease]];
 }
 
 - (void)testSwordManagerInit {

Modified: trunk/bindings/objc/test/SwordModuleTest.m
===================================================================
--- trunk/bindings/objc/test/SwordModuleTest.m	2013-01-24 18:56:49 UTC (rev 2774)
+++ trunk/bindings/objc/test/SwordModuleTest.m	2013-01-24 19:29:54 UTC (rev 2775)
@@ -6,32 +6,15 @@
 //  Copyright 2010 Software by MABE. All rights reserved.
 //
 
+#import <ObjCSword/ObjCSword.h>
 #import "SwordModuleTest.h"
-#ifdef TARGET_IPHONE_SIMULATOR
-#import "SwordManager.h"
-#import "Configuration.h"
-#import "OSXConfiguration.h"
-//#import "iOSConfiguration.h"
-#import "SwordModule.h"
-#import "SwordModuleTextEntry.h"
-#import "VerseEnumerator.h"
-#import "SwordListKey.h"
-#import "SwordVerseKey.h"
-#else
-#import "ObjCSword/ObjCSword.h"
-#import "ObjCSword/SwordModule+Index.h"
-#endif
 
 @implementation SwordModuleTest
 
 - (void)setUp {
-#ifdef TARGET_IPHONE_SIMULATOR
-//    [[Configuration config] setClass:[iOSConfiguration class]];
-#else
-#endif
-    [Configuration configWithImpl:[[OSXConfiguration alloc] init]];
+    [Configuration configWithImpl:[[[OSXConfiguration alloc] init] autorelease]];
     mgr = [SwordManager managerWithPath:[[Configuration config] defaultModulePath]];
-    mod = [mgr moduleWithName:@"GerNeUe"];    
+    mod = [mgr moduleWithName:@"GerNeUe"];
 }
 
 - (void)testLoopRenderedVerses {
@@ -168,66 +151,11 @@
 
 - (void)testStrippedTextForRef {
     SwordVerseKey *vk = [SwordVerseKey verseKeyWithRef:@"1Mo 1:2"];
-    NSLog(@"start position: %s", [vk keyText]);
+    NSLog(@"start position: %@", [vk keyText]);
     [vk decrement];
-    NSLog(@"decrement position: %s", [vk keyText]);
+    NSLog(@"decrement position: %@", [vk keyText]);
     [vk setVerse:[vk verse] + 3];
-    NSLog(@"verse + 3: %s", [vk keyText]);
+    NSLog(@"verse + 3: %@", [vk keyText]);
 }
 
-/*
- #ifdef __cplusplus
- #include <swtext.h>
- #include <versekey.h>
- #include <regex.h>
- #include <swmodule.h>
- class sword::SWModule;
- #include <iostream>
- #include <versekey.h>
- #include <rawtext.h>
- #include <rawcom.h>
- #include <echomod.h>
- #include <stdlib.h>
- using namespace sword;
- #endif
- 
- - (void)testHeadings {
- mod = [[SwordManager defaultManager] moduleWithName:@"KJV"];
- STAssertNotNil(mod, @"No Mod");
- 
- // enable headings
- [[SwordManager defaultManager] setGlobalOption:SW_OPTION_HEADINGS value:SW_ON];
- [[SwordManager defaultManager] setGlobalOption:SW_OPTION_STRONGS value:SW_ON];
- [[SwordManager defaultManager] setGlobalOption:SW_OPTION_FOOTNOTES value:SW_ON];
- 
- SWModule *target;    
- target = [mod swModule];    
- target->setKey("gen 1:1");    
- target->RenderText();		// force an entry lookup to resolve key to something in the index
- 
- std::cout << "==Raw=Entry===============\n";
- std::cout << target->getKeyText() << ":\n";
- std::cout << target->getRawEntry();
- std::cout << "\n";
- std::cout << "==Render=Entry============\n";
- std::cout << target->RenderText();
- std::cout << "\n";
- std::cout << "==========================\n";
- std::cout << "Entry Attributes:\n\n";
- AttributeTypeList::iterator i1;
- AttributeList::iterator i2;
- AttributeValue::iterator i3;
- for (i1 = target->getEntryAttributes().begin(); i1 != target->getEntryAttributes().end(); i1++) {
- std::cout << "[ " << i1->first << " ]\n";
- for (i2 = i1->second.begin(); i2 != i1->second.end(); i2++) {
- std::cout << "\t[ " << i2->first << " ]\n";
- for (i3 = i2->second.begin(); i3 != i2->second.end(); i3++) {
- std::cout << "\t\t" << i3->first << " = " << i3->second << "\n";
- }
- }
- }
- std::cout << std::endl;
- }
- */
-
 @end

Added: trunk/bindings/objc/test/Tests-Info.plist
===================================================================
--- trunk/bindings/objc/test/Tests-Info.plist	                        (rev 0)
+++ trunk/bindings/objc/test/Tests-Info.plist	2013-01-24 19:29:54 UTC (rev 2775)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIdentifier</key>
+	<string>com.yourcompany.${PRODUCT_NAME:rfc1034identifier}</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundlePackageType</key>
+	<string>BNDL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1</string>
+</dict>
+</plist>




More information about the sword-cvs mailing list