[sword-svn] r2609 - in trunk/bindings/objc: . test

[mdbergmann at crosswire.org]

Author: mdbergmann
Date: 2011-03-13 07:49:11 -0700 (Sun, 13 Mar 2011)
New Revision: 2609

Removed:
   trunk/bindings/objc/ObjCSword-iOS.xcodeproj/
   trunk/bindings/objc/ObjCSword-iOS_Prefix.pch
Modified:
   trunk/bindings/objc/test/SwordListKeyTest.m
   trunk/bindings/objc/test/SwordManagerTest.m
   trunk/bindings/objc/test/SwordModuleLongRunTest.mm
   trunk/bindings/objc/test/SwordModuleTest.m
Log:
removed iOS Xcode project. Cocoa Touch static libraries do not allow other library bindings. However it is relatively easy to use the ObjCSword wrapper source codes in external projects.

Deleted: trunk/bindings/objc/ObjCSword-iOS_Prefix.pch
===================================================================
--- trunk/bindings/objc/ObjCSword-iOS_Prefix.pch	2011-03-10 17:28:25 UTC (rev 2608)
+++ trunk/bindings/objc/ObjCSword-iOS_Prefix.pch	2011-03-13 14:49:11 UTC (rev 2609)
@@ -1,15 +0,0 @@
-//
-// Prefix header for all source files of the 'ObjCSword' target in the 'ObjCSword' project.
-//
-
-#ifdef __OBJC__
-    #import <Foundation/Foundation.h>
-#endif
-
-#ifdef DEBUG
-    #define DLog(...) NSLog(@"%s %@", __PRETTY_FUNCTION__, [NSString stringWithFormat:__VA_ARGS__])
-    #define ALog(...) NSLog(@"%s %@", __PRETTY_FUNCTION__, [NSString stringWithFormat:__VA_ARGS__])
-#else
-    #define DLog(...) ;
-    #define ALog(...) NSLog(@"%s %@", __PRETTY_FUNCTION__, [NSString stringWithFormat:__VA_ARGS__])
-#endif

Modified: trunk/bindings/objc/test/SwordListKeyTest.m
===================================================================
--- trunk/bindings/objc/test/SwordListKeyTest.m	2011-03-10 17:28:25 UTC (rev 2608)
+++ trunk/bindings/objc/test/SwordListKeyTest.m	2011-03-13 14:49:11 UTC (rev 2609)
@@ -7,7 +7,13 @@
 //
 
 #import "SwordListKeyTest.h"
+#ifdef TARGET_IPHONE_SIMULATOR
+#import "SwordListKey.h"
+#import "SwordVerseKey.h"
+#import "VerseEnumerator.h"
+#else
 #import "ObjCSword/ObjCSword.h"
+#endif
 
 @implementation SwordListKeyTest
 

Modified: trunk/bindings/objc/test/SwordManagerTest.m
===================================================================
--- trunk/bindings/objc/test/SwordManagerTest.m	2011-03-10 17:28:25 UTC (rev 2608)
+++ trunk/bindings/objc/test/SwordManagerTest.m	2011-03-13 14:49:11 UTC (rev 2609)
@@ -7,19 +7,33 @@
 //
 
 #import "SwordManagerTest.h"
+
+#ifdef TARGET_IPHONE_SIMULATOR
+#import "Configuration.h"
+#import "iOSConfiguration.h"
+#import "OSXConfiguration.h"
+#import "SwordManager.h"
+#else
 #import "ObjCSword/SwordManager.h"
 #import "ObjCSword/Configuration.h"
 #import "ObjCSword/OSXConfiguration.h"
+#endif
 
-
 @implementation SwordManagerTest
 
 - (void)setUp {
+#ifdef TARGET_IPHONE_SIMULATOR
+    [[Configuration config] setClass:[iOSConfiguration class]];
+#else
     [[Configuration config] setClass:[OSXConfiguration class]];
+#endif
 }
 
 - (void)testSwordManagerInit {
-    SwordManager *sm = [SwordManager defaultManager];
+    NSString *modPath = [[Configuration config] defaultModulePath];
+    NSLog(@"%@", modPath);
+    
+    SwordManager *sm = [SwordManager managerWithPath:modPath]; 
     STAssertTrue([[sm modules] count] > 0, @"");
 }
 

Modified: trunk/bindings/objc/test/SwordModuleLongRunTest.mm
===================================================================
--- trunk/bindings/objc/test/SwordModuleLongRunTest.mm	2011-03-10 17:28:25 UTC (rev 2608)
+++ trunk/bindings/objc/test/SwordModuleLongRunTest.mm	2011-03-13 14:49:11 UTC (rev 2609)
@@ -7,12 +7,26 @@
 //
 
 #import "SwordModuleTest.h"
+#ifdef TARGET_IPHONE_SIMULATOR
+#import "SwordManager.h"
+#import "Configuration.h"
+#import "iOSConfiguration.h"
+#import "SwordModule.h"
+#import "SwordBibleTextEntry.h"
+#import "VerseEnumerator.h"
+#import "SwordListKey.h"
+#else
 #import "ObjCSword/ObjCSword.h"
+#endif
 
 @implementation SwordModuleTest
 
 - (void)setUp {
+#ifdef TARGET_IPHONE_SIMULATOR
+    [[Configuration config] setClass:[iOSConfiguration class]];
+#else
     [[Configuration config] setClass:[OSXConfiguration class]];
+#endif
     mod = [[SwordManager defaultManager] moduleWithName:@"GerNeUe"];    
 }
 

Modified: trunk/bindings/objc/test/SwordModuleTest.m
===================================================================
--- trunk/bindings/objc/test/SwordModuleTest.m	2011-03-10 17:28:25 UTC (rev 2608)
+++ trunk/bindings/objc/test/SwordModuleTest.m	2011-03-13 14:49:11 UTC (rev 2609)
@@ -7,14 +7,28 @@
 //
 
 #import "SwordModuleTest.h"
+#ifdef TARGET_IPHONE_SIMULATOR
+#import "SwordManager.h"
+#import "Configuration.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:[OSXConfiguration class]];
+#else
+    [[Configuration config] setClass:[OSXConfiguration class]];
+#endif
     mod = [[SwordManager defaultManager] moduleWithName:@"GerNeUe"];    
 }