rhodes 2.2.4.beta.1 → 2.2.5.beta.1

data/platform/wm/rhodes/rhodes.vcproj

@@ -1024,6 +1024,22 @@
 				RelativePath=".\MainWindow.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\MetaHandler.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\MetaHandler.h"
+				>
+			</File>
+			<File
+				RelativePath=".\SyncStatusDlg.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\SyncStatusDlg.h"
+				>
+			</File>
 			<File
 				RelativePath=".\menubar.cpp"
 				>
@@ -1182,6 +1198,10 @@
 				RelativePath=".\resource.h"
 				>
 			</File>
+			<File
+				RelativePath=".\RhoNativeViewManagerWM.h"
+				>
+			</File>
 			<File
 				RelativePath=".\RingtoneManager.h"
 				>
@@ -1357,6 +1377,14 @@
 				</FileConfiguration>
 			</File>
 		</Filter>
+		<Filter
+			Name="NativeViewmanager"
+			>
+			<File
+				RelativePath=".\RhoNativeViewManager.cpp"
+				>
+			</File>
+		</Filter>
 		<Filter
 			Name="signature"
 			>

data/rakefile.rb

@@ -51,6 +51,94 @@ namespace "framework" do
 end
 
 
+$application_build_configs_keys = ['security_token']
+
+def make_application_build_config_header_file
+  inc_file = File.join($startdir, "platform", "shared", "common", "app_build_configs.c")
+  File.open(inc_file, "w") do |f|
+    f.puts "// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!"
+    f.puts "// Generated #{Time.now.to_s}"
+    f.puts ""
+    f.puts "#include <string.h>"
+    f.puts ""
+    f.puts '#include "app_build_configs.h"'
+    f.puts ""
+      
+    f.puts 'static const char* keys[] = { ""'
+    $application_build_configs.keys.each do |key|
+      f.puts ',"'+key+'"'
+    end
+    f.puts '};'
+    f.puts ''
+
+    count = 1
+
+    f.puts 'static const char* values[] = { ""'
+    $application_build_configs.keys.each do |key|
+      f.puts ',"'+$application_build_configs[key]+'"'
+      count = count + 1
+    end
+    f.puts '};'
+    f.puts ''
+
+    f.puts '#define APP_BUILD_CONFIG_COUNT '+count.to_s
+    f.puts ''
+    f.puts 'const char* get_app_build_config_item(const char* key) {'
+    f.puts '  int i;'
+    f.puts '  for (i = 1; i < APP_BUILD_CONFIG_COUNT; i++) {'
+    f.puts '    if (strcmp(key, keys[i]) == 0) {'
+    f.puts '      return values[i];'
+    f.puts '    }'
+    f.puts '  }'
+    f.puts '  return 0;'
+    f.puts '}'
+    f.puts ''
+
+  end	 
+end
+
+def make_application_build_config_java_file
+      file_name = $startdir + "/platform/bb/RubyVM/src/com/rho/AppBuildConfig.java"
+
+      File.open(file_name, "w") do |f|
+        f.puts "// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!"
+        f.puts "// Generated #{Time.now.to_s}"
+        
+        f.puts "package com.rho;"
+        f.puts ""
+        f.puts "public class AppBuildConfig {"
+        
+        f.puts 'static final String keys[] = { ""'
+        $application_build_configs.keys.each do |key|
+          f.puts ',"'+key+'"'
+        end
+        f.puts '};'
+        f.puts ''
+
+        count = 1
+
+        f.puts 'static final String values[] = { ""'
+        $application_build_configs.keys.each do |key|
+          f.puts ',"'+$application_build_configs[key]+'"'
+          count = count + 1
+        end
+        f.puts '};'
+        f.puts ''
+
+        f.puts 'static final int APP_BUILD_CONFIG_COUNT = '+count.to_s + ';'
+        f.puts ''
+        f.puts 'public static String getItem(String key){'
+        f.puts '  for (int i = 1; i < APP_BUILD_CONFIG_COUNT; i++) {'
+        f.puts '    if ( key.compareTo( keys[i]) == 0) {'
+        f.puts '      return values[i];'
+        f.puts '    }'
+        f.puts '  }'
+        f.puts '  return null;'
+        f.puts '}'
+        f.puts "}"
+      end
+end
+
 namespace "config" do
   task :common do
     $startdir = File.dirname(__FILE__)
@@ -106,6 +194,32 @@ namespace "config" do
     extensions += $app_config[$config["platform"]]["extensions"] if $app_config[$config["platform"]] and
        $app_config[$config["platform"]]["extensions"] and $app_config[$config["platform"]]["extensions"].is_a? Array
     $app_config["extensions"] = extensions
+    
+    $hidden_app = $app_config["hidden_app"].nil?() ? "0" : $app_config["hidden_app"]
+    
+
+    #application build configs
+    application_build_configs = {}
+
+    $application_build_configs_keys.each do |key|
+      value = $app_config[key]
+      if $app_config[$config["platform"]] != nil
+        if $app_config[$config["platform"]][key] != nil
+          value = $app_config[$config["platform"]][key]
+        end
+      end
+      if value != nil
+        application_build_configs[key] = value
+      end
+    end	
+    $application_build_configs = application_build_configs
+
+    if $current_platform == "bb"  
+      make_application_build_config_java_file
+    else  
+      make_application_build_config_header_file    
+    end
+
   end
 
   out = `javac -version 2>&1`
@@ -311,7 +425,7 @@ def common_bundle_start(startdir, dest)
   clear_linker_settings
 
   init_extensions(startdir, dest)
-  
+
   chdir startdir
   #throw "ME"
   cp_r app + '/app',File.join($srcdir,'apps'), :preserve => true
@@ -419,6 +533,7 @@ namespace "build" do
     task :xruby do
       #needs $config, $srcdir, $excludelib, $bindir
       app = $app_path
+	  jpath = $config["env"]["paths"]["java"]
       startdir = pwd
       dest =  $srcdir
       xruby =  File.dirname(__FILE__) + '/res/build-tools/xruby-0.3.3.jar'
@@ -482,8 +597,9 @@ namespace "build" do
       rm_rf $tmpdir
       mkdir_p $tmpdir
       chdir $srcdir
-=end      
-      puts `jar uf ../RhoBundle.jar apps/#{$all_files_mask}`
+=end  
+
+      puts `"#{File.join(jpath,'jar')}" uf ../RhoBundle.jar apps/#{$all_files_mask}`
       unless $? == 0
         puts "Error creating Rhobundle.jar"
         exit 1

data/res/build-tools/iphonesim/README

@@ -0,0 +1,58 @@
+  iPhone Simulator 
+  ----------------
+
+  The iPhone Simulator is a simple command line utility for 
+  launching an iphone application in the simulator. This allows
+  for nice things like automated testing of unit tests, etc without
+  having to open XCode.
+
+  The original code was written by Landon Fuller (with license
+  below).  Minor modifications made by Jeff Haynie (Appcelerator).
+
+
+  You can run the application by first building your application in
+  xcode using the xcodebuild command from the command line.  You can
+  then run it in the simulator using the following as an example:
+
+  ./iphonesim launch ~/tmp/yourproject/build/Debug.simulator/yourproject.app
+
+  You need to point to either Debug.simulator or Release.simulator based 
+  on which build type you built with.
+
+
+  Cheers!
+
+  Jeff Haynie
+  jhaynie@appcelerator.com
+    
+
+
+  Author: Landon Fuller <landonf@plausiblelabs.com>
+  Copyright (c) 2008 Plausible Labs Cooperative, Inc.
+  All rights reserved.
+          
+  Permission is hereby granted, free of charge, to any person
+  obtaining a copy of this software and associated documentation
+  files (the "Software"), to deal in the Software without
+  restriction, including without limitation the rights to use,
+  copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the
+  Software is furnished to do so, subject to the following
+  conditions:
+
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+  
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+  OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+  HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+  WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+  OTHER DEALINGS IN THE SOFTWARE.
+  
+
+  Modifications made by Appcelerator, Inc. relicensed under
+  the same license as above.
+

data/res/build-tools/iphonesim/Source/iPhoneSimulator.h

@@ -0,0 +1,43 @@
+/*
+ * Author: Landon Fuller <landonf@plausiblelabs.com>
+ * Copyright (c) 2008 Plausible Labs Cooperative, Inc.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+ /**
+  * Modifications made by Appcelerator, Inc. relicensed under
+  * the same license as above.
+  */
+
+#import <Foundation/Foundation.h>
+#import <iPhoneSimulatorRemoteClient/iPhoneSimulatorRemoteClient.h>
+
+@interface iPhoneSimulator : NSObject <DTiPhoneSimulatorSessionDelegate> {
+@private
+   DTiPhoneSimulatorSystemRoot *sdkRoot;
+}
+
+- (void) runWithArgc: (int) argc argv: (char **) argv;
+
+@end

data/res/build-tools/iphonesim/Source/iPhoneSimulator.m

@@ -0,0 +1,224 @@
+/*
+ * Author: Landon Fuller <landonf@plausiblelabs.com>
+ * Copyright (c) 2008 Plausible Labs Cooperative, Inc.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+ /**
+  * Modifications made by Appcelerator, Inc. licensed under the
+  * same license as above.
+  */
+
+#import "iPhoneSimulator.h"
+#import "nsprintf.h"
+
+/**
+ * A simple iPhoneSimulatorRemoteClient framework.
+ */
+@implementation iPhoneSimulator
+
+/**
+ * Print usage.
+ */
+- (void) printUsage {
+    fprintf(stderr, "Usage: iphonesim <options> <command> ...\n");
+    fprintf(stderr, "Commands:\n");
+    fprintf(stderr, "  showsdks\n");
+    fprintf(stderr, "  launch <application path> [sdkversion] [family] [uuid]\n");
+}
+
+
+/**
+ * List available SDK roots.
+ */
+- (int) showSDKs {
+    NSArray *roots = [DTiPhoneSimulatorSystemRoot knownRoots];
+
+    nsprintf(@"Simulator SDK Roots:");
+    for (DTiPhoneSimulatorSystemRoot *root in roots) {
+        nsfprintf(stderr, @"'%@' (%@)\n\t%@", [root sdkDisplayName], [root sdkVersion], [root sdkRootPath]);
+    }
+
+    return EXIT_SUCCESS;
+}
+
+- (void) session: (DTiPhoneSimulatorSession *) session didEndWithError: (NSError *) error {
+    nsprintf(@"Session did end with error %@", error);
+    
+    if (error != nil)
+        exit(EXIT_FAILURE);
+
+    exit(EXIT_SUCCESS);
+}
+
+
+- (void) session: (DTiPhoneSimulatorSession *) session didStart: (BOOL) started withError: (NSError *) error {
+    if (started) {
+        nsprintf(@"Session started");
+    } else {
+        nsprintf(@"Session could not be started: %@", error);
+        exit(EXIT_FAILURE);
+    }
+}
+
+
+/**
+ * Launch the given Simulator binary.
+ */
+- (int) launchApp: (NSString *) path withFamily:(NSString*)family uuid:(NSString*)uuid{
+    DTiPhoneSimulatorApplicationSpecifier *appSpec;
+    DTiPhoneSimulatorSessionConfig *config;
+    DTiPhoneSimulatorSession *session;
+    NSError *error;
+
+    /* Create the app specifier */
+    appSpec = [DTiPhoneSimulatorApplicationSpecifier specifierWithApplicationPath: path];
+    if (appSpec == nil) {
+        nsprintf(@"Could not load application specification for %s", path);
+        return EXIT_FAILURE;
+    }
+    nsprintf(@"App Spec: %@", appSpec);
+
+    /* Load the default SDK root */
+    
+    nsprintf(@"SDK Root: %@", sdkRoot);
+
+    /* Set up the session configuration */
+    config = [[[DTiPhoneSimulatorSessionConfig alloc] init] autorelease];
+    [config setApplicationToSimulateOnStart: appSpec];
+    [config setSimulatedSystemRoot: sdkRoot];
+    [config setSimulatedApplicationShouldWaitForDebugger: NO];
+
+    [config setSimulatedApplicationLaunchArgs: [NSArray array]];
+    [config setSimulatedApplicationLaunchEnvironment: [NSDictionary dictionary]];
+
+    [config setLocalizedClientName: @"Rhodes Developer"];
+
+	// this was introduced in 3.2 of SDK
+	if ([config respondsToSelector:@selector(setSimulatedDeviceFamily:)])
+	{
+		if (family == nil)
+		{
+			family = @"iphone";
+		}
+
+		nsprintf(@"using device family %@",family);
+
+		if ([family isEqualToString:@"ipad"])
+		{
+			[config setSimulatedDeviceFamily:[NSNumber numberWithInt:2]];
+		}
+		else
+		{
+			if ([family isEqualToString:@"iphone4"])
+			{
+				[config setSimulatedDeviceFamily:[NSNumber numberWithInt:3]];
+			}
+			else
+			{
+				[config setSimulatedDeviceFamily:[NSNumber numberWithInt:1]];
+			}
+		}
+	}
+
+    /* Start the session */
+    session = [[[DTiPhoneSimulatorSession alloc] init] autorelease];
+    [session setDelegate: self];
+    [session setSimulatedApplicationPID: [NSNumber numberWithInt: 35]];
+	if (uuid!=nil)
+	{
+		[session setUuid:uuid];
+	}
+
+    if (![session requestStartWithConfig: config timeout: 30 error: &error]) {
+        nsprintf(@"Could not start simulator session: %@", error);
+        return EXIT_FAILURE;
+    }
+
+    return EXIT_SUCCESS;
+}
+
+
+/**
+ * Execute 'main'
+ */
+- (void) runWithArgc: (int) argc argv: (char **) argv {
+    /* Read the command */
+    if (argc < 2) {
+        [self printUsage];
+        exit(EXIT_FAILURE);
+    }
+
+    if (strcmp(argv[1], "showsdks") == 0) {
+        exit([self showSDKs]);
+    }
+    else if (strcmp(argv[1], "launch") == 0) {
+        /* Requires an additional argument */
+        if (argc < 3) {
+            fprintf(stderr, "Missing application path argument\n");
+            [self printUsage];
+            exit(EXIT_FAILURE);
+        }
+        if (argc > 3) {
+            NSString* ver = [NSString stringWithCString:argv[3] encoding:NSUTF8StringEncoding];
+            NSArray *roots = [DTiPhoneSimulatorSystemRoot knownRoots];
+            for (DTiPhoneSimulatorSystemRoot *root in roots) {
+                NSString *v = [root sdkVersion];
+                if ([v isEqualToString:ver])
+                {
+                    sdkRoot = root;
+                    break;
+                }
+            }
+            if (sdkRoot == nil)
+            {
+                fprintf(stderr,"Unknown or unsupported SDK version: %s\n",argv[3]);
+                [self showSDKs];
+                exit(EXIT_FAILURE);
+            }
+        }
+        else {
+            sdkRoot = [DTiPhoneSimulatorSystemRoot defaultRoot];
+        }
+
+        /* Don't exit, adds to runloop */
+		NSString *family = nil;
+		NSString *uuid = nil;
+		if (argc > 4)
+		{
+			family = [NSString stringWithUTF8String:argv[4]];
+		}
+		if (argc > 5)
+		{
+			uuid = [NSString stringWithUTF8String:argv[5]];
+		}
+        [self launchApp: [NSString stringWithUTF8String: argv[2]] withFamily:family uuid:uuid];
+    } else {
+        fprintf(stderr, "Unknown command\n");
+        [self printUsage];
+        exit(EXIT_FAILURE);
+    }
+}
+
+@end

data/res/build-tools/iphonesim/Source/main.m

@@ -0,0 +1,52 @@
+/*
+ * Author: Landon Fuller <landonf@plausiblelabs.com>
+ * Copyright (c) 2008 Plausible Labs Cooperative, Inc.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+ /**
+  * Some modifications made by Appcelerator which are licensed 
+  * under the same license as above.
+  */
+
+#import <AppKit/AppKit.h>
+
+#import "iPhoneSimulator.h"
+
+/*
+ * Runs the iPhoneSimulator backed by a main runloop.
+ */
+int main (int argc, char *argv[]) {
+    NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+    iPhoneSimulator *sim = [[iPhoneSimulator alloc] init];
+    
+    /* Execute command line handler */
+    [sim runWithArgc: argc argv: argv];
+
+    /* Run the loop to handle added input sources, if any */
+    [[NSRunLoop mainRunLoop] run];
+
+    [pool release];
+    return 0;
+}

data/res/build-tools/iphonesim/Source/nsprintf.h

@@ -0,0 +1,3 @@
+int nsvfprintf (FILE *stream, NSString *format, va_list args);
+int nsfprintf (FILE *stream, NSString *format, ...);
+int nsprintf (NSString *format, ...);

data/res/build-tools/iphonesim/Source/nsprintf.m

@@ -0,0 +1,42 @@
+/*
+ * NSLog() clone, but writes to arbitrary output stream
+ */
+
+#import <Foundation/Foundation.h>
+#import <stdio.h>
+
+int nsvfprintf (FILE *stream, NSString *format, va_list args) {
+    int retval;
+
+    NSString *str = (NSString *) CFStringCreateWithFormatAndArguments(NULL, NULL, (CFStringRef) format, args);
+    retval = fprintf(stream, "[DEBUG] %s\n", [str UTF8String]);
+    [str release];
+
+    return retval;
+}
+
+int nsfprintf (FILE *stream, NSString *format, ...) {
+    va_list ap;
+    int retval;
+
+    va_start(ap, format);
+    {
+        retval = nsvfprintf(stream, format, ap);
+    } 
+    va_end(ap);
+
+    return retval;
+}
+
+int nsprintf (NSString *format, ...) {
+    va_list ap;
+    int retval;
+
+    va_start(ap, format);
+    {
+        retval = nsvfprintf(stderr, format, ap);
+    } 
+    va_end(ap);
+
+    return retval;
+}