rhodes 2.0.0.rc1 → 2.0.0.rc2

data/CHANGELOG

@@ -1,4 +1,11 @@
-== 2.0.0
+## 2.0.0.rc2
+* #3992192 - send_log no longer requires login
+* #4028896 - iPhone crash on location init
+* #4032345 - iOS 3.x build crashed on iOS 4 simulator
+* iOS device build issues
+* fixed compile error in BB build related to MapView
+
+## 2.0.0.beta1-13, 2.0.0.rc1
 * client support of sync protocol 3 with rhosync 2.0
 * partial support
 * callback calls from menu and toolbar
@@ -24,28 +31,28 @@
 * NativeBar.create now re-use WebView so no more need to call WebView.navigate
   after NativeBar.create
 
-== 1.5.4
+## 1.5.4
 * Fix issue #3132788 - rake clean:iphone fails
 
-== 1.5.3
+## 1.5.3
 * Fix issue #2980590 - iphone: call NetRequest from toolbar
 * Fix issue #3104338 - rake run:iphone doesn't install into iphone sdk 3.2
 
-== 1.5.2
+## 1.5.2
 * Fix AsyncHttp 'cancel request'
 * Implement #2948610 - enable AysyncHttp synchronous call
 * Implement #2950632 - BB: System.get_property('has_network')
 * Fix issue #2948834 - iPhone: ringtonemanager
 * Fix issue #2964439 - Android: build problems when no Google API add-ons installed
 
-== 1.5.1
+## 1.5.1
 * Fix issue #2924952 - BB Sim doesn't launch on windows 7
 * Fix issue #2931788 - iPhone: wrong refresh
 * Fix AsyncHttp 'cancel request'
 * Fix issue #2948834 - iPhone: ringtonemanager
 * Fix issue #2964439 - Android: build problems when no Google API add-ons installed
 
-== 1.5.0
+## 1.5.0
 * native screen resolution for iPad
 * native tab bar for android
 * support of SSL in AsyncHttp for iPhone and Android
@@ -54,7 +61,7 @@
 * native geo mapping for android
 * support of splash screen for iPhone, Android, Blackberry and Windows Mobile
 
-== 1.4.2
+## 1.4.2
 * Fix for BB push data
 * Fix issue #2547236 - BB map: incorrect drawing of world bounds (90N/90S, 180W/180E)
 * Fix issue #2539966 - System::get_property('platform') on Android is UNKNOWN
@@ -64,10 +71,10 @@
 * Fix issue #2561958 - iPhone map: crash in case of wrong input parameters
 * Fix issue #2581678 - Android: GPS updates does not work
  
-== 1.4.1
+## 1.4.1
 * fixed issue with empty cookie check failing
 
-== 1.4.0
+## 1.4.0
 * improved spec running framework, see spec/framework_spec for details
 * added api for returning screensize
 * improved 404/500 error page reporting
@@ -78,10 +85,10 @@
 * added crypt, openssl, digest, lang, set, fcntl, net/http(s), json, rexml extensions
 * support for RIM 5.0 JDE
 
-== 1.2.1
+## 1.2.1
 * Fixed issue with broken gem dependencies
 
-== 1.2.0
+## 1.2.0
 * Push support for RIM & iPhone
 * Improved Rhom performance by using horizontal resultset to rhom object conversion
 * Support android 1.5
@@ -90,11 +97,11 @@
 * Alert (popup) ruby API
 * DateTime Picker ruby API
 
-== 1.1.1
+## 1.1.1
 * #630 - handle rhoconfig.txt without newline at EOF
 * #721 - RIM save changes to DB on interrupted shutdown
 
-== 1.1.0
+## 1.1.0
 * Stability fixes in 1.0
 * Support HSQLDB on RIM
 * Integrated mspec framework for testing
@@ -105,10 +112,10 @@
 * remove prebuilt binaries to save space
 * iPhone OS 3.0 support w/ 2.2.1 build -> 3.0 device compatibility
 
-== 1.0.0
+## 1.0.0
 * Initial support for Android
 
-== 0.3.0 & 0.3.1
+## 0.3.0 & 0.3.1
 Major features:
 * incremental sync enhancements
 * source refresh enhancements
@@ -117,7 +124,7 @@ Major features:
 Known issues:
 * see http://rhomobile.lighthouseapp.com/projects/17413/milestones/29833-03x
 
-== 0.2.0
+## 0.2.0
 Major features:
 * scripted build process for all platforms
 * incremental sync
@@ -142,7 +149,7 @@ Known issues:
 * [#188] opera mini browser opens when launching on HTC Fuze (as workaround you can close manually)
 * [#166] RIM needs format on reinstall to delete database
 
-== 0.1.0 
+## 0.1.0 
 * Initial support for iPhone, RIM (v4.6), and Windows Mobile (v6)
 * Support for full sync
 * sample applications Rhosugar and RhoSiebel

data/platform/android/build/android.rake

@@ -462,6 +462,7 @@ namespace "build" do
       args << "-DHAVE_CONFIG_H"
       args << "-I#{srcdir}/../include"
       args << "-I#{srcdir}"
+      args << "-I#{$shareddir}"      
 
       cc_build 'libcurl', objdir, args or exit 1
       cc_ar libname, Dir.glob(objdir + "/**/*.o") or exit 1
@@ -1064,6 +1065,19 @@ def is_device_running
   return false
 end
 
+def run_application (target_flag)
+  args = []
+  args << target_flag
+  args << "shell"
+  args << "am"
+  args << "start"
+  args << "-a"
+  args << "android.intent.action.MAIN"
+  args << "-n"
+  args << $app_package_name + "/com.rhomobile.rhodes.Rhodes"
+  Jake.run($adb, args)
+end
+
 namespace "run" do
   namespace "android" do
     task :emulator => "device:android:debug" do
@@ -1113,11 +1127,15 @@ namespace "run" do
         sleep 1
         count += 1
       end
-      puts "Loading complete, you may now run the application" if done
+
+      puts "Loading complete, starting application.." if done
+      run_application("-e") if done
     end
 
     desc "build and install on device"
     task :device => "device:android:install" do
+      puts "Starting application..."
+      run_application("-d")
     end
   end
 

data/platform/bb/build/rhodes_build.files

@@ -35,5 +35,6 @@ platform\bb\rhodes\src\rhomobile\mapview\GoogleMapField.java
 platform\bb\rhodes\src\rhomobile\mapview\GoogleMapProvider.java
 platform\bb\rhodes\src\rhomobile\mapview\MapProvider.java
 platform\bb\rhodes\src\rhomobile\mapview\MapView.java
+platform\bb\rhodes\src\rhomobile\mapview\MapViewParent.java
 platform\bb\rhodes\src\rhomobile\mapview\MapViewScreen.java
 platform\bb\rhodes\src\rhomobile\mapview\RhoMapField.java

data/platform/bb/rhodes/rhodes.jdp

@@ -59,6 +59,7 @@ src\rhomobile\mapview\GoogleMapField.java
 src\rhomobile\mapview\GoogleMapProvider.java
 src\rhomobile\mapview\MapProvider.java
 src\rhomobile\mapview\MapView.java
+src\rhomobile\mapview\MapViewParent.java
 src\rhomobile\mapview\MapViewScreen.java
 src\rhomobile\mapview\RhoMapField.java
 src\rhomobile\NativeBar.java

data/platform/bb/rhodes/src/rhomobile/RhodesApplication.java

@@ -438,6 +438,14 @@ final public class RhodesApplication extends UiApplication implements SystemList
     private static boolean m_bRubyInit = false;
 	public void activate()
 	{
+		rhodes_activate();
+		super.activate();
+	}
+	
+	private boolean m_bActivate = false;
+	private void rhodes_activate()
+	{
+		m_bActivate = true;
 		//DO NOT DO ANYTHING before doStartupWork 
 		doStartupWork();
 		showSplashScreen();
@@ -960,6 +968,10 @@ final public class RhodesApplication extends UiApplication implements SystemList
 	    	
 	        PrimaryResourceFetchThread.Create(this);
 	        LOG.INFO("RHODES STARTUP COMPLETED: ***----------------------------------*** " );
+	        
+	        if ( com.rho.Capabilities.RUNAS_SERVICE && !m_bActivate &&
+	        	 RhoConf.getInstance().getBool("activate_at_startup"))
+	        	rhodes_activate();
     	}catch(Exception exc)
     	{
     		LOG.ERROR("doStartupWork failed", exc);

data/platform/iphone/Classes/GeoLocation/LocationController.h

@@ -22,6 +22,7 @@
 @property (nonatomic, retain) CLLocationManager *_locationManager;
 @property (assign) SEL onUpdateLocation;
 
+- (void) initLocationManager;
 - (void)  stop; 
 
 - (double) getLatitude;

data/platform/iphone/Classes/GeoLocation/LocationController.m

@@ -23,13 +23,13 @@ static void _TimerCallBack(CFRunLoopTimerRef timer, void* context);
 // This is a singleton class, see below
 static LocationController *sharedLC = nil;
 
-@interface LocationControllerInit : NSObject {}
+@interface LocationManagerInit : NSObject {}
 + (void)run;
 @end
 
-@implementation LocationControllerInit
+@implementation LocationManagerInit
 + (void)run {
-    [[LocationController alloc] init]; // assignment not done here
+    [[LocationController sharedInstance] initLocationManager];
 }
 @end
 
@@ -40,6 +40,8 @@ static LocationController *sharedLC = nil;
 @synthesize onUpdateLocation; 
 
 - (bool)update{
+    if (!_locationManager)
+        return false;
 	if (!_locationManager.locationServicesEnabled) {
 		return false;
 	}
@@ -67,12 +69,16 @@ static LocationController *sharedLC = nil;
 	[self update];
 }
 
+- (void) initLocationManager {
+    self._locationManager = [[[CLLocationManager alloc] init] autorelease];
+    self._locationManager.desiredAccuracy = kCLLocationAccuracyBest;
+    self._locationManager.delegate = self; // Tells the location manager to send updates to this object
+}
+
 - (id) init {
 	self = [super init];
 	if (self != nil) {
-		self._locationManager = [[[CLLocationManager alloc] init] autorelease];
-		self._locationManager.desiredAccuracy = kCLLocationAccuracyBest;
-		self._locationManager.delegate = self; // Tells the location manager to send updates to this object
+		[Rhodes performOnUiThread:[LocationManagerInit class] wait:NO];
 		
 		self.onUpdateLocation = @selector(doUpdateLocation);	
 		_dLatitude = 0;
@@ -87,6 +93,8 @@ static LocationController *sharedLC = nil;
 }
 
 - (void) stop {
+    if (!_locationManager)
+        return;
 	[_locationManager stopUpdatingLocation];
 	
     // Get rid of the timer, if it still exists
@@ -166,7 +174,7 @@ static LocationController *sharedLC = nil;
 + (LocationController *)sharedInstance {
     @synchronized(self) {
         if (sharedLC == nil) {
-            [Rhodes performOnUiThread:[LocationControllerInit class] wait:NO];
+            [[LocationController alloc] init]; // assignment not done here
         }
     }
     return sharedLC;

data/platform/iphone/Classes/Rhodes.m

@@ -201,15 +201,18 @@ static Rhodes *instance = NULL;
         // Show picker
 #ifdef __IPHONE_3_2
         if (UI_USER_INTERFACE_IDIOM() == UIUserInterfaceIdiomPad) {
-            UIPopoverController *popover = [[UIPopoverController alloc] initWithContentViewController:picker];
-            popover.delegate = delegateObject;
+            // WARNING!!! DO NOT USE UIPopoverController DIRECTLY HERE!!!
+            // It will cause problem of starting application on iPhone OS < 3.2
+            // All such stuff should be loaded in runtime using NSClassFromString
+            id popover = [[NSClassFromString(@"UIPopoverController") alloc] initWithContentViewController:picker];
+            [popover setDelegate:delegateObject];
             delegateObject->popover = popover;
             CGRect rect = [[[self mainView] view] frame];
             rect.origin.x += rect.size.width/4;
             rect.origin.y += rect.size.height/4;
             rect.size.width /= 2;
             rect.size.height /= 2;
-            popover.popoverContentSize = CGSizeMake(CGRectGetWidth(rect), CGRectGetHeight(rect));
+            [popover setPopoverContentSize:CGSizeMake(CGRectGetWidth(rect), CGRectGetHeight(rect))];
             [popover presentPopoverFromRect:rect inView:[[self mainView] view] permittedArrowDirections:UIPopoverArrowDirectionAny animated:YES];
         }
         else

data/platform/iphone/RhoLib/RhoLib.xcodeproj/project.pbxproj

@@ -427,7 +427,7 @@
 					"-fvisibility=hidden",
 				);
 				PRODUCT_NAME = rholib;
-				SDKROOT = iphonesimulator2.2.1;
+				SDKROOT = iphonesimulator3.2;
 				SYMROOT = ../build;
 				USER_HEADER_SEARCH_PATHS = "../../shared/curl/include ../../shared";
 			};
@@ -447,7 +447,7 @@
 					"-fvisibility=hidden",
 				);
 				PRODUCT_NAME = rholib;
-				SDKROOT = iphoneos2.2.1;
+				SDKROOT = iphoneos3.2;
 				SYMROOT = ../build;
 				USER_HEADER_SEARCH_PATHS = "../../shared/curl/include ../../shared";
 			};
@@ -461,9 +461,10 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = ../../shared;
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
-				SDKROOT = iphonesimulator3.0;
+				SDKROOT = iphonesimulator3.2;
 			};
 			name = Debug;
 		};
@@ -474,6 +475,7 @@
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = ../../shared;
 				PREBINDING = NO;
 				SDKROOT = macosx10.5;
 			};
@@ -486,6 +488,7 @@
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = ../../shared;
 				PREBINDING = NO;
 				SDKROOT = macosx10.5;
 			};
@@ -505,7 +508,7 @@
 					"-fvisibility=hidden",
 				);
 				PRODUCT_NAME = rholib;
-				SDKROOT = iphoneos2.2.1;
+				SDKROOT = iphoneos3.2;
 				SYMROOT = ../build;
 				USER_HEADER_SEARCH_PATHS = "../../shared/curl/include ../../shared";
 			};

data/platform/iphone/Tests/Tests.xcodeproj/project.pbxproj

@@ -420,7 +420,7 @@
 					"-lrhosynclib",
 				);
 				PRODUCT_NAME = Tests;
-				SDKROOT = iphonesimulator2.2.1;
+				SDKROOT = iphonesimulator3.2;
 				SYMROOT = ../build;
 				USER_HEADER_SEARCH_PATHS = "../../shared/ ../../shared/syncengine ../../shared/logging ../../shared/common ../../shared/test/gtest/include ../../shared/test/gtest ../../shared/test";
 			};
@@ -448,7 +448,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = NO;
 				PREBINDING = NO;
-				SDKROOT = iphonesimulator2.2.1;
+				SDKROOT = iphonesimulator3.2;
 			};
 			name = Debug;
 		};

data/platform/iphone/curl/curl.xcodeproj/project.pbxproj

@@ -750,12 +750,13 @@
 				GCC_MODEL_TUNING = G5;
 				GCC_OPTIMIZATION_LEVEL = 0;
 				INSTALL_PATH = /usr/local/lib;
+				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"-DHAVE_CONFIG_H",
 					"-DUSE_RHOSSL",
 				);
 				PRODUCT_NAME = curl;
-				SDKROOT = iphonesimulator2.2.1;
+				SDKROOT = iphonesimulator3.2;
 				SYMROOT = ../build;
 			};
 			name = Debug;
@@ -773,7 +774,7 @@
 					"-DUSE_RHOSSL",
 				);
 				PRODUCT_NAME = curl;
-				SDKROOT = iphoneos2.2.1;
+				SDKROOT = iphoneos3.2;
 				SYMROOT = ../build;
 			};
 			name = Release;
@@ -786,6 +787,7 @@
 				GCC_OPTIMIZATION_LEVEL = 0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = ../../shared;
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
 				SDKROOT = macosx10.5;
@@ -799,6 +801,7 @@
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = ../../shared;
 				PREBINDING = NO;
 				SDKROOT = macosx10.5;
 			};
@@ -811,6 +814,7 @@
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = ../../shared;
 				PREBINDING = NO;
 				SDKROOT = macosx10.5;
 			};
@@ -829,7 +833,7 @@
 					"-DUSE_RHOSSL",
 				);
 				PRODUCT_NAME = curl;
-				SDKROOT = iphoneos2.2.1;
+				SDKROOT = iphoneos3.2;
 				SYMROOT = ../build;
 			};
 			name = Distribution;

data/platform/iphone/rhoextlib/rhoextlib.xcodeproj/project.pbxproj

@@ -158,7 +158,9 @@
 				GCC_PREFIX_HEADER = rhoextlib_Prefix.pch;
 				GCC_VERSION = "";
 				INSTALL_PATH = /usr/local/lib;
+				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = rhoextlib;
+				SDKROOT = iphonesimulator3.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Debug;
@@ -174,7 +176,9 @@
 				GCC_PREFIX_HEADER = rhoextlib_Prefix.pch;
 				GCC_VERSION = "";
 				INSTALL_PATH = /usr/local/lib;
+				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = rhoextlib;
+				SDKROOT = iphoneos3.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 			};
 			name = Release;
@@ -188,9 +192,10 @@
 				GCC_VERSION = 4.0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = ../../shared;
 				OTHER_LDFLAGS = "-ObjC";
 				PREBINDING = NO;
-				SDKROOT = iphonesimulator3.0;
+				SDKROOT = iphonesimulator3.2;
 				SYMROOT = ../build;
 				USER_HEADER_SEARCH_PATHS = "../../shared/ ../../shared/syncengine ../../shared/logging ../../shared/common ../../shared/ruby ../../shared/ruby/include ../../shared/ruby/iphone";
 			};
@@ -204,9 +209,10 @@
 				GCC_VERSION = 4.0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = ../../shared;
 				OTHER_LDFLAGS = "-ObjC";
 				PREBINDING = NO;
-				SDKROOT = iphonesimulator2.2.1;
+				SDKROOT = iphonesimulator3.2;
 				SYMROOT = ../build;
 				USER_HEADER_SEARCH_PATHS = "../../shared/ ../../shared/syncengine ../../shared/logging ../../shared/common ../../shared/ruby ../../shared/ruby/include ../../shared/ruby/iphone";
 			};
@@ -220,9 +226,10 @@
 				GCC_VERSION = 4.0;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = ../../shared;
 				OTHER_LDFLAGS = "-ObjC";
 				PREBINDING = NO;
-				SDKROOT = iphonesimulator2.2.1;
+				SDKROOT = iphonesimulator3.2;
 				SYMROOT = ../build;
 				USER_HEADER_SEARCH_PATHS = "../../shared/ ../../shared/syncengine ../../shared/logging ../../shared/common ../../shared/ruby ../../shared/ruby/include ../../shared/ruby/iphone";
 			};

data/platform/iphone/rhorubylib/rhorubylib.xcodeproj/project.pbxproj

@@ -768,8 +768,9 @@
 					../../shared,
 				);
 				INSTALL_PATH = /usr/local/lib;
+				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = rhorubylib;
-				SDKROOT = macosx10.5;
+				SDKROOT = iphonesimulator3.2;
 				SYMROOT = ../build;
 			};
 			name = Debug;
@@ -790,7 +791,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = rhorubylib;
-				SDKROOT = iphoneos2.2.1;
+				SDKROOT = iphoneos3.2;
 				SYMROOT = ../build;
 			};
 			name = Release;
@@ -805,7 +806,7 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				PREBINDING = NO;
-				SDKROOT = iphonesimulator3.0;
+				SDKROOT = iphonesimulator3.2;
 				SYMROOT = ../build;
 			};
 			name = Debug;
@@ -852,7 +853,7 @@
 				INSTALL_PATH = /usr/local/lib;
 				ONLY_ACTIVE_ARCH = YES;
 				PRODUCT_NAME = rhorubylib;
-				SDKROOT = iphoneos2.2.1;
+				SDKROOT = iphoneos3.2;
 				SYMROOT = ../build;
 			};
 			name = Distribution;

data/platform/iphone/rhorunner.xcodeproj/project.pbxproj

@@ -839,7 +839,7 @@
 				PRODUCT_NAME = rhorunner;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphoneos3.0;
+				SDKROOT = iphonesimulator3.2;
 				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "../shared/curl/include ../shared/ ../shared/syncengine ../shared/logging ../shared/common rhoextlib";
@@ -850,6 +850,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CODE_SIGN_ENTITLEMENTS = Entitlements.plist;
 				CODE_SIGN_IDENTITY = "Don't Code Sign";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Don't Code Sign";
 				COPY_PHASE_STRIP = YES;
@@ -862,7 +863,7 @@
 				LIBRARY_SEARCH_PATHS = (
 					"$(inherited)",
 					"$(SRCROOT)",
-					"$(SRCROOT)/build/Debug-iphonesimulator",
+					"$(SRCROOT)/build/Release-iphoneos",
 				);
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
@@ -881,7 +882,7 @@
 					"$(EXTENSIONS_LDFLAGS)",
 				);
 				PRODUCT_NAME = rhorunner;
-				SDKROOT = iphoneos2.2.1;
+				SDKROOT = iphoneos3.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "../shared/curl/include ../shared/ ../shared/syncengine ../shared/logging ../shared/common rhoextlib";
 			};
@@ -896,6 +897,7 @@
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = ../shared;
 				"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
 					"-framework",
 					CFNetwork,
@@ -960,7 +962,7 @@
 				);
 				PREBINDING = NO;
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphoneos2.0;
+				SDKROOT = iphoneos3.2;
 				USER_HEADER_SEARCH_PATHS = "../shared/ ../shared/syncengine ../shared/logging ../shared/common rhoextlib";
 			};
 			name = Distribution;
@@ -1027,7 +1029,7 @@
 					"$(EXTENSIONS_LDFLAGS)",
 				);
 				PRODUCT_NAME = rhorunner;
-				SDKROOT = iphoneos2.2.1;
+				SDKROOT = iphoneos3.2;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				USER_HEADER_SEARCH_PATHS = "../shared/curl/include ../shared/ ../shared/syncengine ../shared/logging ../shared/common rhoextlib";
 			};
@@ -1044,6 +1046,7 @@
 				GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1";
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = ../shared;
 				IBC_FLATTEN_NIBS = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
@@ -1063,7 +1066,7 @@
 				PREBINDING = NO;
 				PROVISIONING_PROFILE = "";
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphonesimulator3.0;
+				SDKROOT = iphonesimulator3.2;
 				STANDARD_C_PLUS_PLUS_LIBRARY_TYPE = dynamic;
 				SYMROOT = build;
 				USER_HEADER_SEARCH_PATHS = "../shared/ ../shared/syncengine ../shared/logging ../shared/common rhoextlib";
@@ -1078,6 +1081,7 @@
 				GCC_C_LANGUAGE_STANDARD = c99;
 				GCC_WARN_ABOUT_RETURN_TYPE = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
+				HEADER_SEARCH_PATHS = ../shared;
 				"OTHER_LDFLAGS[sdk=iphoneos*][arch=*]" = (
 					"-framework",
 					CFNetwork,
@@ -1098,7 +1102,7 @@
 				);
 				PREBINDING = NO;
 				"PROVISIONING_PROFILE[sdk=iphoneos*]" = "";
-				SDKROOT = iphoneos2.0;
+				SDKROOT = iphoneos3.2;
 				USER_HEADER_SEARCH_PATHS = "../shared/ ../shared/syncengine ../shared/logging ../shared/common rhoextlib";
 			};
 			name = Release;