rhodes 1.5.5 → 2.0.0.beta1

data/platform/iphone/Classes/TabbedMainView.h

@@ -0,0 +1,24 @@
+//
+//  TabbedMainView.h
+//  rhorunner
+//
+//  Created by Dmitry Moskalchuk on 26.03.10.
+//  Copyright 2010 Rhomobile. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "RhoMainView.h"
+
+@interface TabbedMainView : UIViewController<RhoMainView> {
+    UIView *parent;
+    UITabBarController *tabbar;
+    NSArray *tabbarData;
+}
+
+@property (nonatomic,retain) UITabBarController *tabbar;
+@property (nonatomic,retain) NSArray *tabbarData;
+
+- (id)initWithParentView:(UIView*)v items:(NSArray*)items;
+- (id)initWithParentView:(UIView*)v frame:(CGRect)frame items:(NSArray*)items;
+
+@end

data/platform/iphone/Classes/TabbedMainView.m

@@ -0,0 +1,202 @@
+    //
+//  TabbedMainView.m
+//  rhorunner
+//
+//  Created by Dmitry Moskalchuk on 26.03.10.
+//  Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+#import "TabbedMainView.h"
+#import "SimpleMainView.h"
+#import "Rhodes.h"
+#import "AppManager.h"
+#import "logging/RhoLog.h"
+
+#undef DEFAULT_LOGCATEGORY
+#define DEFAULT_LOGCATEGORY "TabbedMainView"
+
+@interface RhoTabBarData : NSObject {
+@public
+    NSString *url;
+    BOOL loaded;
+    BOOL reload;
+}
+
+@property (retain) NSString *url;
+@property (assign) BOOL loaded;
+@property (assign) BOOL reload;
+
+- (id)init;
+- (void)dealloc;
+
+@end
+
+@implementation RhoTabBarData
+
+@synthesize url, loaded, reload;
+
+- (id)init {
+    url = nil;
+    loaded = NO;
+    reload = NO;
+    return self;
+}
+
+- (void)dealloc {
+    [url release];
+    [super dealloc];
+}
+
+@end
+
+
+@implementation TabbedMainView
+
+@synthesize tabbar, tabbarData;
+
+- (id)initWithParentView:(UIView *)v items:(NSArray *)items {
+    return [self initWithParentView:v frame:v.frame items:items];
+}
+
+- (id)initWithParentView:(UIView *)v frame:(CGRect)frame items:(NSArray*)items {
+    parent = v;
+    
+    tabbar = [[UITabBarController alloc] initWithNibName:nil bundle:nil];
+    tabbar.delegate = [Rhodes sharedInstance];
+    tabbar.view.frame = frame;
+    tabbar.selectedIndex = 0;
+    
+    int count = [items count]/4;
+    NSMutableArray *views = [NSMutableArray arrayWithCapacity:count];
+    NSMutableArray *tabs = [[NSMutableArray alloc] initWithCapacity:count];
+    
+    for (int i = 0; i < count; ++i) {
+        int index = i*4 - 1;
+        NSString *label = [items objectAtIndex:++index];
+        NSString *url = [items objectAtIndex:++index];
+        NSString *icon = [items objectAtIndex:++index];
+        NSString *reload = [items objectAtIndex:++index];
+        
+        if (label && url && icon) {
+            RhoTabBarData *td = [[RhoTabBarData alloc] init];
+            td.url = url;
+            td.reload = [reload isEqualToString:@"true"];
+            
+            SimpleMainView *subController = [[SimpleMainView alloc] initWithParentView:tabbar.view];
+            subController.title = label;
+            NSString *imagePath = [[AppManager getApplicationsRootPath] stringByAppendingPathComponent:icon];
+            subController.tabBarItem.image = [UIImage imageWithContentsOfFile:imagePath];
+            [subController navigate:url tab:0];
+            
+            [tabs addObject:td];
+            [views addObject:subController];
+            
+            [td release];
+            [subController release];
+        }
+    }
+    tabbar.viewControllers = views;
+    tabbar.customizableViewControllers = NO;
+    tabbar.view.hidden = NO;
+    
+    self.tabbarData = tabs;
+    [tabs release];
+    
+    CGRect vFrame = tabbar.view.frame;
+    CGRect tbFrame = tabbar.tabBar.frame;
+    tbFrame.origin.y = vFrame.size.height - tbFrame.size.height - vFrame.origin.y;
+    tabbar.tabBar.frame = tbFrame;
+    
+    return self;
+}
+
+- (void)didReceiveMemoryWarning {
+    // Releases the view if it doesn't have a superview.
+    [super didReceiveMemoryWarning];
+    
+    // Release any cached data, images, etc that aren't in use.
+}
+
+- (void)viewDidUnload {
+    [super viewDidUnload];
+    self.tabbar = nil;
+}
+
+- (void)dealloc {
+    [tabbar release];
+    [super dealloc];
+}
+
+- (SimpleMainView*)subView:(int)index {
+    return (SimpleMainView*)[tabbar.viewControllers objectAtIndex:index];
+}
+
+- (RhoTabBarData*)tabData:(int)index {
+    return (RhoTabBarData*)[tabbarData objectAtIndex:index];
+}
+
+// RhoMainView implementation
+
+- (UIView*)view {
+    return tabbar.view;
+}
+
+- (void)loadHTMLString:(NSString *)data {
+    [[self subView:[self activeTab]] loadHTMLString:data];
+}
+
+- (void)back:(int)index {
+    [[self subView:index] back:0];
+}
+
+- (void)forward:(int)index {
+    [[self subView:index] forward:0];
+}
+
+- (void)navigate:(NSString *)url tab:(int)index {
+    [[self subView:index] navigate:url tab:0];
+}
+
+- (void)navigateRedirect:(NSString *)url tab:(int)index {
+    [[self subView:index] navigateRedirect:url tab:0];
+}
+
+- (void)reload:(int)index {
+    [[self subView:index] reload:0];
+}
+
+- (void)executeJs:(NSString*)js tab:(int)index {
+    RAWLOG_INFO1("Executing JS: %s", [js UTF8String]);
+    [[self subView:index] executeJs:js tab:0];
+}
+
+- (NSString*)currentLocation:(int)index {
+    return [[self subView:index] currentLocation:0];
+}
+
+- (void)switchTab:(int)index {
+    tabbar.selectedIndex = index;
+}
+
+- (void)onSwitchTab {
+    int index = [self activeTab];
+    RhoTabBarData *td = [self tabData:index];
+    if (!td.loaded || td.reload) {
+        [self navigateRedirect:td.url tab:index];
+        td.loaded = YES;
+    }
+}
+
+- (int)activeTab {
+    return tabbar.selectedIndex;
+}
+
+- (void)setNavBar:(NSString*)title left:(NSArray*)left right:(NSArray*)right {
+    [[self subView:[self activeTab]] setNavBar:title left:left right:right];
+}
+
+- (void)removeNavBar {
+    [[self subView:[self activeTab]] removeNavBar];
+}
+
+@end

data/platform/iphone/Classes/WebView.m

@@ -0,0 +1,123 @@
+//
+//  RhoMainView.m
+//  rhorunner
+//
+//  Created by Dmitry Moskalchuk on 26.03.10.
+//  Copyright 2010 __MyCompanyName__. All rights reserved.
+//
+
+//#import "RhoMainView.h"
+#import "Rhodes.h"
+#include "common/RhodesApp.h"
+#include "ruby/ext/rho/rhoruby.h"
+
+@interface RhoWebViewNavigateTask : NSObject {}
++ (void)run:(NSString*)url :(NSValue*)index;
+@end
+
+@implementation RhoWebViewNavigateTask
++ (void)run:(NSString*)url :(NSValue*)value {
+    // Workaround:
+    // Navigation MUST be done through 'redirect_to' - otherwise WebView does not
+    // perform actual url loading from time to time
+    int index;
+    [value getValue:&index];
+    [[[Rhodes sharedInstance] mainView] navigateRedirect:url tab:index];
+}
+@end
+
+@interface RhoWebViewNavigateBackTask : NSObject {}
++ (void)run;
+@end
+
+@implementation RhoWebViewNavigateBackTask
++ (void)run {
+    id mainView = [[Rhodes sharedInstance] mainView];
+    [mainView back:[mainView activeTab]];
+}
+@end
+
+@interface RhoWebViewActiveTabTask : NSObject {}
++ (void)run:(NSValue*)value;
+@end
+
+@implementation RhoWebViewActiveTabTask
++ (void)run:(NSValue*)value {
+    int *pIndex = [value pointerValue];
+    *pIndex = [[[Rhodes sharedInstance] mainView] activeTab];
+}
+@end
+
+@interface RhoWebViewReloadTask : NSObject {}
++ (void)run:(NSValue*)value;
+@end
+
+@implementation RhoWebViewReloadTask
++ (void)run:(NSValue*)value {
+    int index;
+    [value getValue:&index];
+    [[[Rhodes sharedInstance] mainView] reload:index];
+}
+@end
+
+@interface RhoWebViewExecuteJsTask : NSObject {}
++ (void)run:(NSString*)js :(NSValue*)value;
+@end
+
+@implementation RhoWebViewExecuteJsTask
++ (void)run:(NSString*)js :(NSValue*)value {
+    int index;
+    [value getValue:&index];
+    [[[Rhodes sharedInstance] mainView] executeJs:js tab:index];
+}
+@end
+
+
+void rho_webview_navigate(const char* url, int index) {
+    id runnable = [RhoWebViewNavigateTask class];
+    id arg1 = [NSString stringWithUTF8String:url];
+    id arg2 = [NSValue valueWithBytes:&index objCType:@encode(int)];
+    [Rhodes performOnUiThread:runnable arg:arg1 arg:arg2 wait:NO];
+}
+
+int rho_webview_active_tab() {
+    int index;
+    id runnable = [RhoWebViewActiveTabTask class];
+    id arg = [NSValue valueWithPointer:&index];
+    [Rhodes performOnUiThread:runnable arg:arg wait:YES];
+    return index;
+}
+
+void rho_webview_refresh(int index) {
+    id runnable = [RhoWebViewReloadTask class];
+    id arg = [NSValue valueWithBytes:&index objCType:@encode(int)];
+    [Rhodes performOnUiThread:runnable arg:arg wait:NO];
+}
+
+const char* rho_webview_execute_js(const char* js, int index) {
+    id runnable = [RhoWebViewExecuteJsTask class];
+    id arg1 = [NSString stringWithUTF8String:js];
+    id arg2 = [NSValue valueWithBytes:&index objCType:@encode(int)];
+    [Rhodes performOnUiThread:runnable arg:arg1 arg:arg2 wait:NO];
+    return "";
+}
+
+const char* rho_webview_current_location(int index) {
+    return rho_rhodesapp_getcurrenturl(index);
+}
+
+void rho_webview_set_menu_items(VALUE valMenu) {
+    rho_rhodesapp_setViewMenu(valMenu);
+}
+
+void rho_webview_navigate_back()
+{
+    id runnable = [RhoWebViewNavigateBackTask class];
+    [Rhodes performOnUiThread:runnable wait:NO];
+}
+
+void rho_webview_full_screen_mode(int enable)
+{
+    [Rhodes setStatusBarHidden:enable];
+}
+

data/platform/iphone/Classes/rho/net/NetRequestImpl.m

@@ -72,13 +72,13 @@ int isNetworkAvailableFlags(SCNetworkReachabilityFlags *outFlags)
 	BOOL isReachable = FALSE;
 	int reachable = 0;
 	SCNetworkReachabilityRef defaultRouteReachability;
-	NSString *hostNameOrAddress; 
+	//NSString *hostNameOrAddress; 
 	bzero(&zeroAddress, sizeof(zeroAddress));
 	zeroAddress.sin_len = sizeof(zeroAddress);
 	zeroAddress.sin_family = AF_INET;
 	
 	defaultRouteReachability = SCNetworkReachabilityCreateWithAddress(NULL, (struct sockaddr *)&zeroAddress);
-	hostNameOrAddress = @"0.0.0.0";
+	//hostNameOrAddress = @"0.0.0.0";
 	
 	SCNetworkReachabilityFlags flags;
 	BOOL gotFlags = SCNetworkReachabilityGetFlags(defaultRouteReachability, &flags);

data/platform/iphone/Classes/rho/net/sslimpl.cpp

@@ -47,7 +47,7 @@ void SSLImpl::freeStorage(void *ptr)
     free(ptr);
 }
     
-CURLcode SSLImpl::connect(int sockfd, int nonblocking, int *done, void *storage)
+CURLcode SSLImpl::connect(int sockfd, int nonblocking, int *done, int ssl_verify_peer, void *storage)
 {
     ssl_data_t *data = (ssl_data_t*)storage;
     
@@ -56,6 +56,18 @@ CURLcode SSLImpl::connect(int sockfd, int nonblocking, int *done, void *storage)
     CFReadStreamSetProperty(data->readStream, kCFStreamPropertySocketSecurityLevel, kCFStreamSocketSecurityLevelSSLv3);
     CFWriteStreamSetProperty(data->writeStream, kCFStreamPropertySocketSecurityLevel, kCFStreamSocketSecurityLevelSSLv3);
     
+    CFMutableDictionaryRef dict = CFDictionaryCreateMutable(kCFAllocatorDefault, 0,
+                &kCFTypeDictionaryKeyCallBacks, &kCFTypeDictionaryValueCallBacks);
+    if (!dict) {
+        RAWLOG_ERROR("Can not allocate CFMutableDictionaryRef");
+        return CURLE_SSL_CONNECT_ERROR;
+    }
+    
+    CFDictionarySetValue(dict, kCFStreamSSLValidatesCertificateChain, ssl_verify_peer ? kCFBooleanTrue : kCFBooleanFalse);
+    CFReadStreamSetProperty(data->readStream, kCFStreamPropertySSLSettings, dict);
+    CFWriteStreamSetProperty(data->writeStream, kCFStreamPropertySSLSettings, dict);
+    CFRelease(dict);
+    
     if (!CFReadStreamOpen(data->readStream) || !CFWriteStreamOpen(data->writeStream)) {
         RAWLOG_ERROR("SSL connection error");
         return CURLE_SSL_CONNECT_ERROR;

data/platform/iphone/Classes/rho/net/sslimpl.h

@@ -22,7 +22,7 @@ public:
     void *createStorage();
     void freeStorage(void *ptr);
     
-    CURLcode connect(int sockfd, int nonblocking, int *done, void *storage);
+    CURLcode connect(int sockfd, int nonblocking, int *done, int ssl_verify_peer, void *storage);
     void shutdown(void *storage);
     ssize_t send(const void *mem, size_t len, void *storage);
     ssize_t recv(char *buf, size_t size, int *wouldblock, void *storage);

data/platform/iphone/Info.plist

@@ -21,7 +21,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.5.5</string>
+	<string>2.0.0</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 </dict>

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

@@ -7,9 +7,13 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		5C2F10BB116146930054AC80 /* RhoRuby.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C2F10B9116146930054AC80 /* RhoRuby.cpp */; };
+		5C2F10BC116146930054AC80 /* RhoRuby.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C2F10BA116146930054AC80 /* RhoRuby.h */; };
 		5C5335530FC2977600F268F0 /* IRhoThreadImpl.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C5335500FC2977600F268F0 /* IRhoThreadImpl.h */; };
 		5C5335540FC2977600F268F0 /* RhoThread.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C5335510FC2977600F268F0 /* RhoThread.cpp */; };
 		5C5335550FC2977600F268F0 /* RhoThread.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C5335520FC2977600F268F0 /* RhoThread.h */; };
+		5C59BF4D115B4BC300E96ADE /* unzip.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C59BF4B115B4BC300E96ADE /* unzip.cpp */; };
+		5C59BF4E115B4BC300E96ADE /* unzip.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C59BF4C115B4BC300E96ADE /* unzip.h */; };
 		5C6855E910A02EAA008DA047 /* RhodesApp.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C6855E610A02EAA008DA047 /* RhodesApp.cpp */; };
 		5C6855EA10A02EAA008DA047 /* RhodesApp.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C6855E710A02EAA008DA047 /* RhodesApp.h */; };
 		5C6B448C0F946589003CB43A /* RhoConf.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5C6B448A0F946589003CB43A /* RhoConf.cpp */; };
@@ -46,6 +50,8 @@
 		5C98174E0FBC4FCE002597A5 /* irhoclassfactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C98174B0FBC4FCE002597A5 /* irhoclassfactory.h */; };
 		5CBD462A1087399700107D0D /* URI.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CBD46271087399700107D0D /* URI.cpp */; };
 		5CBD462B1087399700107D0D /* URI.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CBD46281087399700107D0D /* URI.h */; };
+		5CCD7EBC116CE2D5005E6CA3 /* AppMenu.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CCD7EBA116CE2D5005E6CA3 /* AppMenu.cpp */; };
+		5CCD7EBD116CE2D5005E6CA3 /* AppMenu.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CCD7EBB116CE2D5005E6CA3 /* AppMenu.h */; };
 		5CE294121009D8D9009A75F6 /* isysteminfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 5CE294111009D8D9009A75F6 /* isysteminfo.h */; };
 		5CECDBB3113FE3620084A75B /* System.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5CECDBB2113FE3620084A75B /* System.cpp */; };
 		BD2C950810AE0D4B008D4692 /* PosixThreadImpl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = BD2C950610AE0D4B008D4692 /* PosixThreadImpl.cpp */; };
@@ -64,9 +70,13 @@
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
+		5C2F10B9116146930054AC80 /* RhoRuby.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RhoRuby.cpp; path = ../../shared/rubyext/RhoRuby.cpp; sourceTree = SOURCE_ROOT; };
+		5C2F10BA116146930054AC80 /* RhoRuby.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RhoRuby.h; path = ../../shared/rubyext/RhoRuby.h; sourceTree = SOURCE_ROOT; };
 		5C5335500FC2977600F268F0 /* IRhoThreadImpl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = IRhoThreadImpl.h; path = ../../shared/common/IRhoThreadImpl.h; sourceTree = SOURCE_ROOT; };
 		5C5335510FC2977600F268F0 /* RhoThread.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RhoThread.cpp; path = ../../shared/common/RhoThread.cpp; sourceTree = SOURCE_ROOT; };
 		5C5335520FC2977600F268F0 /* RhoThread.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RhoThread.h; path = ../../shared/common/RhoThread.h; sourceTree = SOURCE_ROOT; };
+		5C59BF4B115B4BC300E96ADE /* unzip.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = unzip.cpp; path = ../../shared/unzip/unzip.cpp; sourceTree = SOURCE_ROOT; };
+		5C59BF4C115B4BC300E96ADE /* unzip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = unzip.h; path = ../../shared/unzip/unzip.h; sourceTree = SOURCE_ROOT; };
 		5C6855E610A02EAA008DA047 /* RhodesApp.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RhodesApp.cpp; path = ../../shared/common/RhodesApp.cpp; sourceTree = SOURCE_ROOT; };
 		5C6855E710A02EAA008DA047 /* RhodesApp.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RhodesApp.h; path = ../../shared/common/RhodesApp.h; sourceTree = SOURCE_ROOT; };
 		5C6B448A0F946589003CB43A /* RhoConf.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = RhoConf.cpp; path = ../../shared/common/RhoConf.cpp; sourceTree = SOURCE_ROOT; };
@@ -103,6 +113,8 @@
 		5C98174B0FBC4FCE002597A5 /* irhoclassfactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = irhoclassfactory.h; path = ../../shared/common/irhoclassfactory.h; sourceTree = SOURCE_ROOT; };
 		5CBD46271087399700107D0D /* URI.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = URI.cpp; path = ../../shared/net/URI.cpp; sourceTree = SOURCE_ROOT; };
 		5CBD46281087399700107D0D /* URI.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = URI.h; path = ../../shared/net/URI.h; sourceTree = SOURCE_ROOT; };
+		5CCD7EBA116CE2D5005E6CA3 /* AppMenu.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = AppMenu.cpp; path = ../../shared/common/AppMenu.cpp; sourceTree = SOURCE_ROOT; };
+		5CCD7EBB116CE2D5005E6CA3 /* AppMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppMenu.h; path = ../../shared/common/AppMenu.h; sourceTree = SOURCE_ROOT; };
 		5CE294111009D8D9009A75F6 /* isysteminfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = isysteminfo.h; path = ../../shared/common/isysteminfo.h; sourceTree = SOURCE_ROOT; };
 		5CECDBB2113FE3620084A75B /* System.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = System.cpp; path = ../../shared/rubyext/System.cpp; sourceTree = SOURCE_ROOT; };
 		BD2C950610AE0D4B008D4692 /* PosixThreadImpl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = PosixThreadImpl.cpp; path = ../../shared/common/PosixThreadImpl.cpp; sourceTree = SOURCE_ROOT; };
@@ -145,6 +157,7 @@
 		08FB7795FE84155DC02AAC07 /* Source */ = {
 			isa = PBXGroup;
 			children = (
+				5C59BF4A115B4BA300E96ADE /* unzip */,
 				5C798931113BD10C005F8736 /* rubyext */,
 				5CBD46251087397B00107D0D /* net */,
 				5C6B45280F9468C5003CB43A /* statistic */,
@@ -162,6 +175,15 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		5C59BF4A115B4BA300E96ADE /* unzip */ = {
+			isa = PBXGroup;
+			children = (
+				5C59BF4B115B4BC300E96ADE /* unzip.cpp */,
+				5C59BF4C115B4BC300E96ADE /* unzip.h */,
+			);
+			name = unzip;
+			sourceTree = "<group>";
+		};
 		5C6B45280F9468C5003CB43A /* statistic */ = {
 			isa = PBXGroup;
 			children = (
@@ -174,6 +196,8 @@
 		5C7162600F8B7DEE0096B6AA /* common */ = {
 			isa = PBXGroup;
 			children = (
+				5CCD7EBA116CE2D5005E6CA3 /* AppMenu.cpp */,
+				5CCD7EBB116CE2D5005E6CA3 /* AppMenu.h */,
 				BDD11ECB113664E700349BE3 /* rhoparams.c */,
 				BDD11ECC113664E700349BE3 /* rhoparams.h */,
 				BD2C950610AE0D4B008D4692 /* PosixThreadImpl.cpp */,
@@ -226,6 +250,8 @@
 		5C798931113BD10C005F8736 /* rubyext */ = {
 			isa = PBXGroup;
 			children = (
+				5C2F10B9116146930054AC80 /* RhoRuby.cpp */,
+				5C2F10BA116146930054AC80 /* RhoRuby.h */,
 				5CECDBB2113FE3620084A75B /* System.cpp */,
 				5C798932113BD148005F8736 /* GeoLocation.cpp */,
 				5C798933113BD148005F8736 /* GeoLocation.h */,
@@ -299,6 +325,9 @@
 				BDD11ECE113664E700349BE3 /* rhoparams.h in Headers */,
 				5C798935113BD148005F8736 /* GeoLocation.h in Headers */,
 				BD8DF8891147C8090041A968 /* SplashScreen.h in Headers */,
+				5C59BF4E115B4BC300E96ADE /* unzip.h in Headers */,
+				5C2F10BC116146930054AC80 /* RhoRuby.h in Headers */,
+				5CCD7EBD116CE2D5005E6CA3 /* AppMenu.h in Headers */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -364,6 +393,9 @@
 				5C798934113BD148005F8736 /* GeoLocation.cpp in Sources */,
 				5CECDBB3113FE3620084A75B /* System.cpp in Sources */,
 				BD8DF8881147C8090041A968 /* SplashScreen.cpp in Sources */,
+				5C59BF4D115B4BC300E96ADE /* unzip.cpp in Sources */,
+				5C2F10BB116146930054AC80 /* RhoRuby.cpp in Sources */,
+				5CCD7EBC116CE2D5005E6CA3 /* AppMenu.cpp in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -382,6 +414,10 @@
 				INSTALL_PATH = /usr/local/lib;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-fvisibility=hidden",
+				);
 				PRODUCT_NAME = rholib;
 				SDKROOT = iphonesimulator2.2.1;
 				SYMROOT = ../build;
@@ -398,6 +434,10 @@
 				INSTALL_PATH = /usr/local/lib;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-fvisibility=hidden",
+				);
 				PRODUCT_NAME = rholib;
 				SDKROOT = iphoneos2.2.1;
 				SYMROOT = ../build;
@@ -452,6 +492,10 @@
 				INSTALL_PATH = /usr/local/lib;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = "";
+				OTHER_CPLUSPLUSFLAGS = (
+					"$(OTHER_CFLAGS)",
+					"-fvisibility=hidden",
+				);
 				PRODUCT_NAME = rholib;
 				SDKROOT = iphoneos2.2.1;
 				SYMROOT = ../build;