Skip to content
This repository
Browse code

Don't copy in Couchbase.framework resources

Also don't show a custom splash screen while loading.
  • Loading branch information...
commit ba0a7644ee29fa7e4de22f90d6590d651f14d0f6 1 parent 9a72f7c
Jens Alfke authored
22  CouchDemo.xcodeproj/project.pbxproj
@@ -10,7 +10,6 @@
10 10
 		27167F1A13C4FA57001CC5B6 /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28AD735F0D9D9599002E5188 /* MainWindow.xib */; };
11 11
 		27167F1B13C4FA57001CC5B6 /* RootViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 28F335F01007B36200424DE2 /* RootViewController.xib */; };
12 12
 		27167F1D13C4FA57001CC5B6 /* Entitlements.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3DEAED5712A2EB7400EEBD22 /* Entitlements.plist */; };
13  
-		27167F2213C4FA57001CC5B6 /* grocery-sync.couch in Resources */ = {isa = PBXBuildFile; fileRef = 27ED52D713C3944B00AB846D /* grocery-sync.couch */; };
14 13
 		27167F2513C4FA57001CC5B6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; };
15 14
 		27167F2613C4FA57001CC5B6 /* DemoAppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 1D3623250D0F684500981E51 /* DemoAppDelegate.m */; };
16 15
 		27167F2713C4FA57001CC5B6 /* RootViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 28C286E00D94DF7D0034E888 /* RootViewController.m */; };
@@ -62,7 +61,6 @@
62 61
 		27AFCEBA13EA08D600F00AFB /* background.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = background.jpg; sourceTree = "<group>"; };
63 62
 		27AFCEBB13EA08D700F00AFB /* background~ipad.jpg */ = {isa = PBXFileReference; lastKnownFileType = image.jpeg; path = "background~ipad.jpg"; sourceTree = "<group>"; };
64 63
 		27CDDE4C13F1D7ED002C5079 /* couchbase-mobile-icon-nameless.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "couchbase-mobile-icon-nameless.png"; sourceTree = "<group>"; };
65  
-		27ED52D713C3944B00AB846D /* grocery-sync.couch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "grocery-sync.couch"; sourceTree = "<group>"; };
66 64
 		2892E40F0DC94CBA00A64D0F /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
67 65
 		28A0AAE50D9B0CCF005BE974 /* CouchDemo_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CouchDemo_Prefix.pch; path = Source/CouchDemo_Prefix.pch; sourceTree = "<group>"; };
68 66
 		28AD735F0D9D9599002E5188 /* MainWindow.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MainWindow.xib; sourceTree = "<group>"; };
@@ -154,7 +152,6 @@
154 152
 				CBD32A5313E15E8500CF15A9 /* Default~ipad.png */,
155 153
 				8D1107310486CEB800E47090 /* CouchDemo-Info.plist */,
156 154
 				3DEAED5712A2EB7400EEBD22 /* Entitlements.plist */,
157  
-				27ED52D713C3944B00AB846D /* grocery-sync.couch */,
158 155
 				279C6595140FEF9A00A0E56D /* icon.png */,
159 156
 				279C6597140FEFCF00A0E56D /* icon@2x.png */,
160 157
 				279C6599140FF07000A0E56D /* icon~ipad.png */,
@@ -204,7 +201,6 @@
204 201
 			buildConfigurationList = 27167F5E13C4FA57001CC5B6 /* Build configuration list for PBXNativeTarget "GrocerySync" */;
205 202
 			buildPhases = (
206 203
 				27167F1913C4FA57001CC5B6 /* Resources */,
207  
-				27167F2313C4FA57001CC5B6 /* Copy CouchDB */,
208 204
 				27167F2413C4FA57001CC5B6 /* Sources */,
209 205
 				27167F5713C4FA57001CC5B6 /* Frameworks */,
210 206
 			);
@@ -253,7 +249,6 @@
253 249
 				27167F1A13C4FA57001CC5B6 /* MainWindow.xib in Resources */,
254 250
 				27167F1B13C4FA57001CC5B6 /* RootViewController.xib in Resources */,
255 251
 				27167F1D13C4FA57001CC5B6 /* Entitlements.plist in Resources */,
256  
-				27167F2213C4FA57001CC5B6 /* grocery-sync.couch in Resources */,
257 252
 				CBD6E08413E01ECB001EFA8C /* Default.png in Resources */,
258 253
 				CBD32A2D13E0293300CF15A9 /* list_area___checkbox___checked.png in Resources */,
259 254
 				CBD32A2E13E0293300CF15A9 /* list_area___checkbox___unchecked.png in Resources */,
@@ -276,23 +271,6 @@
276 271
 		};
277 272
 /* End PBXResourcesBuildPhase section */
278 273
 
279  
-/* Begin PBXShellScriptBuildPhase section */
280  
-		27167F2313C4FA57001CC5B6 /* Copy CouchDB */ = {
281  
-			isa = PBXShellScriptBuildPhase;
282  
-			buildActionMask = 2147483647;
283  
-			files = (
284  
-			);
285  
-			inputPaths = (
286  
-			);
287  
-			name = "Copy CouchDB";
288  
-			outputPaths = (
289  
-			);
290  
-			runOnlyForDeploymentPostprocessing = 0;
291  
-			shellPath = /bin/sh;
292  
-			shellScript = "# The 'CouchbaseResources' subfolder of the framework contains Erlang code and other resources needed at runtime. Copy it into the app bundle:\nrsync -a \"${SRCROOT}/Frameworks/Couchbase.framework/CouchbaseResources\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}\"";
293  
-		};
294  
-/* End PBXShellScriptBuildPhase section */
295  
-
296 274
 /* Begin PBXSourcesBuildPhase section */
297 275
 		27167F2413C4FA57001CC5B6 /* Sources */ = {
298 276
 			isa = PBXSourcesBuildPhase;
0  Resources/grocery-sync.couch
No changes.
3  Source/DemoAppDelegate.h
@@ -23,9 +23,6 @@
23 23
 
24 24
 
25 25
 @interface DemoAppDelegate : NSObject <UIApplicationDelegate, UIAlertViewDelegate>
26  
-{
27  
-    UIImageView *splashView;
28  
-}
29 26
 
30 27
 @property (nonatomic, retain) CouchDatabase *database;
31 28
 
29  Source/DemoAppDelegate.m
@@ -35,12 +35,6 @@
35 35
 //#define USE_REMOTE_SERVER @"http://localhost:5984/"
36 36
 
37 37
 
38  
-@interface DemoAppDelegate ()
39  
-- (void)showSplash;
40  
-- (void)removeSplash;
41  
-@end
42  
-
43  
-
44 38
 @implementation DemoAppDelegate
45 39
 
46 40
 
@@ -64,8 +58,6 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
64 58
     // Add the navigation controller's view to the window and display.
65 59
 	[window addSubview:navigationController.view];
66 60
 	[window makeKeyAndVisible];
67  
-    
68  
-    [self showSplash];
69 61
 
70 62
     // Start the Couchbase Mobile server:
71 63
     gCouchLogLevel = 1;
@@ -97,30 +89,10 @@ - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(
97 89
     // Tell the RootViewController:
98 90
     RootViewController* root = (RootViewController*)navigationController.topViewController;
99 91
     [root useDatabase: database];
100  
-    
101  
-    [self removeSplash];
102 92
     return YES;
103 93
 }
104 94
 
105 95
 
106  
--(void)showSplash {
107  
-    // Show the splash screen until Couchbase starts up:
108  
-    UIImage *splash = [UIImage imageNamed:@"Default.png"];
109  
-    splashView = [[UIImageView alloc] initWithFrame:CGRectMake(0, 20,
110  
-                                                               splash.size.width,
111  
-                                                               splash.size.height)];
112  
-    splashView.image = splash;
113  
-	[self.window addSubview:splashView];
114  
-}
115  
-
116  
-
117  
--(void)removeSplash {
118  
-	[splashView removeFromSuperview];
119  
-	[splashView release];
120  
-    splashView = nil;
121  
-}
122  
-
123  
-
124 96
 // Display an error alert, without blocking.
125 97
 // If 'fatal' is true, the app will quit when it's pressed.
126 98
 - (void)showAlert: (NSString*)message error: (NSError*)error fatal: (BOOL)fatal {
@@ -142,7 +114,6 @@ - (void)alertView:(UIAlertView *)alertView didDismissWithButtonIndex:(NSInteger)
142 114
 
143 115
 
144 116
 - (void)dealloc {
145  
-	[splashView release];
146 117
 	[navigationController release];
147 118
 	[window release];
148 119
     [database release];

0 notes on commit ba0a764

Please sign in to comment.
Something went wrong with that request. Please try again.