@@ -97,9 +97,9 @@ const char* RhoGetRootPath(); */ - (void) configure { -#if TARGET_IPHONE_SIMULATOR - bool replaceFiles = YES; -#else +//#if TARGET_IPHONE_SIMULATOR +// bool replaceFiles = YES; +//#else NSString* bundleVersion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]; const char* version = [bundleVersion cStringUsingEncoding:[NSString defaultCStringEncoding]]; char* currentVersion = rho_conf_getString("currentVersion"); @@ -108,21 +108,21 @@ const char* RhoGetRootPath(); replaceFiles = YES; } rho_conf_freeString(currentVersion); -#endif +//#endif [self copyFromMainBundle:@"apps" replace:replaceFiles]; [self copyFromMainBundle:@"lib" replace:replaceFiles]; -#if TARGET_IPHONE_SIMULATOR - [self copyFromMainBundle:@"db" replace:NO]; //TBD: need to check db version reset db if different -#else +//#if TARGET_IPHONE_SIMULATOR +// [self copyFromMainBundle:@"db" replace:NO]; //TBD: need to check db version reset db if different +//#else [self copyFromMainBundle:@"db" replace:replaceFiles]; //TBD: need to check db version reset db if different -#endif +//#endif if (replaceFiles) { rho_logconf_Init(RhoGetRootPath()); -#ifndef TARGET_IPHONE_SIMULATOR - config_setString("currentVersion", version); - config_save(); -#endif +//#ifndef TARGET_IPHONE_SIMULATOR + rho_conf_setString("currentVersion", version); + rho_conf_save(); +//#endif } } platform/iphone/Classes/AppManager/AppManager.m @@ -25,7 +25,7 @@ public: User::Invariant(); // exit(-1); #elif defined(OS_MACOSX) - __assert_rtn(__func__, __FILE__, __LINE__,"RhoFatalError"); +// __assert_rtn(__func__, __FILE__, __LINE__,"RhoFatalError"); #else exit(-1); #endif platform/shared/common/RhoFatalError.h b858993b9773768f88f84d2f8c50cb42913fdf1b lars larsburgess@gmail.com http://github.com/rhomobile/rhodes/commit/37fd7894dd059c8d4cff31e5a8c96ac8b2825030 37fd7894dd059c8d4cff31e5a8c96ac8b2825030 2009-06-23T09:45:19-07:00 2009-06-23T09:45:19-07:00 TARGET_IPHONE_SIMULATOR is defined on device also??? Disabling this code since it no longer works in released 3.0 SDK [#741 state:resolved] 34720a2254ea48d7c60a359ce02ec959e5dac229 lars larsburgess@gmail.com