rhodes 1.5.5 → 2.0.0.beta1

data/platform/wm/tools/rhosetup/stdafx.cpp

@@ -0,0 +1,8 @@
+// stdafx.cpp : source file that includes just the standard includes
+// rhosetup.pch will be the pre-compiled header
+// stdafx.obj will contain the pre-compiled type information
+
+#include "stdafx.h"
+
+// TODO: reference any additional headers you need in STDAFX.H
+// and not in this file

data/platform/wm/tools/rhosetup/stdafx.h

@@ -0,0 +1,59 @@
+// stdafx.h : include file for standard system include files,
+// or project specific include files that are used frequently, but
+// are changed infrequently
+//
+
+#pragma once
+
+#pragma comment(linker, "/nodefaultlib:libc.lib")
+#pragma comment(linker, "/nodefaultlib:libcd.lib")
+
+// NOTE - this value is not strongly correlated to the Windows CE OS version being targeted
+#define WINVER _WIN32_WCE
+
+#include <ceconfig.h>
+#if defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP)
+#define SHELL_AYGSHELL
+#endif
+
+#ifdef _CE_DCOM
+#define _ATL_APARTMENT_THREADED
+#endif
+
+#include <windows.h>
+#include <commctrl.h>
+
+#ifdef SHELL_AYGSHELL
+#include <aygshell.h>
+#pragma comment(lib, "aygshell.lib") 
+#endif // SHELL_AYGSHELL
+
+
+// Windows Header Files:
+#include <windows.h>
+
+
+#if defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP)
+#ifndef _DEVICE_RESOLUTION_AWARE
+#define _DEVICE_RESOLUTION_AWARE
+#endif
+#endif
+
+#ifdef _DEVICE_RESOLUTION_AWARE
+#include "DeviceResolutionAware.h"
+#endif
+
+#if _WIN32_WCE < 0x500 && ( defined(WIN32_PLATFORM_PSPC) || defined(WIN32_PLATFORM_WFSP) )
+	#pragma comment(lib, "ccrtrtti.lib")
+	#ifdef _X86_	
+		#if defined(_DEBUG)
+			#pragma comment(lib, "libcmtx86d.lib")
+		#else
+			#pragma comment(lib, "libcmtx86.lib")
+		#endif
+	#endif
+#endif
+
+#include <altcecrt.h>
+
+// TODO: reference additional headers your program requires here

data/rakefile.rb

@@ -11,7 +11,7 @@ module Rake
   end
 end
 
-
+$app_basedir = pwd
 chdir File.dirname(__FILE__)
 
 require 'lib/build/jake.rb'
@@ -54,6 +54,7 @@ end
 namespace "config" do
   task :common do
     $startdir = File.dirname(__FILE__)
+    $binextensions = []
     buildyml = 'rhobuild.yml'
 
     buildyml = ENV["RHOBUILD"] unless ENV["RHOBUILD"].nil?
@@ -75,6 +76,15 @@ namespace "config" do
 
     end
     Jake.set_bbver($app_config["bbver"].to_s)
+    
+    extpaths = []
+
+    extpaths << $app_config["paths"]["extensions"] if $app_config["paths"] and $app_config["paths"]["extensions"]
+    extpaths << $config["env"]["paths"]["extensions"] if $config["env"]["paths"]["extensions"]
+    extpaths << File.join($app_path, "extensions")
+    extpaths << "lib/extensions"
+    $app_config["extpaths"] = extpaths
+    
   end
 
   out = `javac -version 2>&1`
@@ -127,7 +137,7 @@ def add_linker_library(libraryname)
         tmpdir = $startdir + "/platform/iphone/build/rhorunner.build/#{$configuration}-" +
           ( simulator ? "iphonesimulator" : "iphoneos") + "/rhorunner.build"
       end
-  $ldflags << "#{tmpdir}/lib#{libraryname}.a\n" unless $ldflags.nil?
+  $ldflags << "#{tmpdir}/#{libraryname}\n" unless $ldflags.nil?
 end
 
 def set_linker_flags
@@ -189,15 +199,16 @@ def common_bundle_start(startdir, dest)
 
   extentries = []
   extlibs = [] 
+  extpaths = $app_config["extpaths"]
+  
   $app_config["extensions"].each do |extname|
-    rhoextpath = "lib/extensions/" + extname
-    appextpath = $app_path + "/extensions/" + extname
     extpath = nil
-
-    if File.exists? appextpath
-      extpath = appextpath
-    elsif File.exists? rhoextpath
-      extpath = rhoextpath
+    extpaths.each do |p|
+      ep = File.join(p, extname)
+      if File.exists? ep
+        extpath = ep
+        break
+      end
     end
 
     unless extpath.nil?
@@ -209,7 +220,13 @@ def common_bundle_start(startdir, dest)
         entry = extconf["entry"]
         extentries << entry unless entry.nil?
         libs = extconf["libraries"]
-        extlibs += libs if !libs.nil? and libs.is_a? Array
+        libs = [] unless libs.is_a? Array
+        if $config["platform"] == "wm"
+          libs.map! { |lib| lib + ".lib" }
+        else
+          libs.map! { |lib| "lib" + lib + ".a" }
+        end
+        extlibs += libs
       end
     end
 
@@ -226,6 +243,12 @@ def common_bundle_start(startdir, dest)
     File.open(exts, "w") do |f|
       f.puts "// WARNING! THIS FILE IS GENERATED AUTOMATICALLY! DO NOT EDIT IT MANUALLY!"
       f.puts "// Generated #{Time.now.to_s}"
+      if $config["platform"] == "wm"
+        # Add libraries through pragma
+        extlibs.each do |lib|
+          f.puts "#pragma comment(lib, \"#{lib}\")"
+        end
+      end
       extentries.each do |entry|
         f.puts "extern void #{entry}(void);"
       end

data/res/build-tools/db/syncdb.schema

@@ -1,41 +1,43 @@
 CREATE TABLE client_info (
- client_id VARCHAR(255) PRIMARY KEY,
+ client_id VARCHAR(255) default NULL,
+ session VARCHAR(255) default NULL,
  token VARCHAR(255) default NULL,
- token_sent int default 0,
- reset int default 0,
+ token_sent BIGINT default 0,
+ reset BIGINT default 0,
  port VARCHAR(10) default NULL,
- initialsync_state int default 0, 
  last_sync_success VARCHAR(100) default NULL);
 CREATE TABLE object_values (
- id INTEGER PRIMARY KEY,
- source_id int default NULL,
+ source_id BIGINT default NULL,
  attrib varchar(255) default NULL,
  object varchar(255) default NULL,
- value varchar default NULL,
- attrib_type varchar(255) default NULL);
+ value varchar default NULL);
 CREATE TABLE changed_values (
- source_id int default NULL,
+ source_id BIGINT default NULL,
  attrib varchar(255) default NULL,
  object varchar(255) default NULL,
  value varchar default NULL,
  attrib_type varchar(255) default NULL,
  update_type varchar(255) default NULL,
- sent int default 0,
- main_id INTEGER default 0);
+ sent BIGINT default 0);
 CREATE TABLE sources (
- source_id int PRIMARY KEY,
- source_url VARCHAR(255),
+ source_id BIGINT PRIMARY KEY,
  name VARCHAR(255) default NULL,
- token INTEGER default NULL,
- priority INTEGER,
- session VARCHAR(255) default NULL,
- last_updated int default 0,
- last_inserted_size int default 0,
- last_deleted_size int default 0,
- last_sync_duration int default 0,
- last_sync_success int default 0,
- backend_refresh_time int default 0,
- source_attribs varchar default NULL);
+ token BIGINT default NULL,
+ priority BIGINT,
+ partition VARCHAR(255),
+ sync_type VARCHAR(255),
+ metadata varchar default NULL, 
+ last_updated BIGINT default 0,
+ last_inserted_size BIGINT default 0,
+ last_deleted_size BIGINT default 0,
+ last_sync_duration BIGINT default 0,
+ last_sync_success BIGINT default 0,
+ backend_refresh_time BIGINT default 0,
+ source_attribs varchar default NULL,
+ schema varchar default NULL,
+ schema_version varchar default NULL,
+ links varchar default NULL,
+ blob_attribs varchar default NULL);
 CREATE INDEX by_src_id on object_values (source_id);
 CREATE UNIQUE INDEX by_src_object ON object_values (object, attrib, source_id);
 CREATE INDEX by_src_value ON object_values (attrib, source_id, value);

data/res/build-tools/db/syncdb.triggers

@@ -1,6 +1,6 @@
 CREATE TRIGGER rhodeleteTrigger BEFORE DELETE ON object_values FOR EACH ROW 
    BEGIN 
-       SELECT rhoOnDeleteObjectRecord(OLD.value, OLD.attrib_type, OLD.source_id, OLD.attrib );
+       SELECT rhoOnDeleteObjectRecord(OLD.value, OLD.source_id, OLD.attrib );
    END;
 ;   
 CREATE TRIGGER rhoinsertTrigger AFTER INSERT ON object_values FOR EACH ROW 

data/res/generators/rhogen.rb

@@ -64,7 +64,12 @@ module Rhogen
       template.source = 'app/index.erb'
       template.destination = "#{name}/app/index.erb"
     end
-    
+
+    template :bb_index do |template|
+      template.source = 'app/index.bb.erb'
+      template.destination = "#{name}/app/index.bb.erb"
+    end   
+
     template :layout do |template|
       template.source = 'app/layout.erb'
       template.destination = "#{name}/app/layout.erb"
@@ -149,11 +154,31 @@ module Rhogen
       template.source = 'new.erb'
       template.destination = "app/#{name.camel_case}/new.erb"
     end
-    
+
     template :new do |template|
       template.source = 'show.erb'
       template.destination = "app/#{name.camel_case}/show.erb"
     end
+    
+    template :bb_index do |template|
+      template.source = 'index.bb.erb'
+      template.destination = "app/#{name.camel_case}/index.bb.erb"
+    end
+
+    template :bb_edit do |template|
+      template.source = 'edit.bb.erb'
+      template.destination = "app/#{name.camel_case}/edit.bb.erb"
+    end
+
+    template :bb_new do |template|
+      template.source = 'new.bb.erb'
+      template.destination = "app/#{name.camel_case}/new.bb.erb"
+    end
+    
+    template :bb_show do |template|
+      template.source = 'show.bb.erb'
+      template.destination = "app/#{name.camel_case}/show.bb.erb"
+    end
 
     template :controller do |template|
       underscore_name = name.camel_case.split(/(?=[A-Z])/).map{|w| w.downcase}.join("_")
@@ -186,25 +211,6 @@ module Rhogen
     end
   end
 
-  class SourceGenerator < BaseGenerator
-    def self.source_root
-      File.join(File.dirname(__FILE__), 'templates', 'source')
-    end
-
-    desc <<-DESC
-      Generates a new source adapter with the given name.
-    DESC
-
-    first_argument :name, :required => true, :desc => "model name"
-    second_argument :attributes, :as => :array, :default => [], :required => false, :desc => "array of attributes (only string suppported right now)"
-
-    template :config do |template|
-      template.source = 'source_adapter.rb'
-      template.destination = "lib/#{name.snake_case}.rb"
-    end
-
-  end
-
   class SpecGenerator < BaseGenerator
 
     def self.source_root
@@ -252,7 +258,6 @@ module Rhogen
 
   add :app, AppGenerator
   add :model, ModelGenerator
-  add :source, SourceGenerator
   add :spec, SpecGenerator
 
 end

data/res/generators/templates/application/app/Settings/controller.rb

@@ -1,8 +1,10 @@
 require 'rho'
 require 'rho/rhocontroller'
 require 'rho/rhoerror'
+require 'helpers/browser_helper'
 
 class SettingsController < Rho::RhoController
+  include BrowserHelper
   
   def index
     @msg = @params['msg']
@@ -18,7 +20,7 @@ class SettingsController < Rho::RhoController
     errCode = @params['error_code'].to_i
     if errCode == 0
       # run sync if we were successful
-      WebView.navigate Rho::RhoConfig.start_path
+      WebView.navigate Rho::RhoConfig.options_path
       SyncEngine.dosync
     else
       if errCode == Rho::RhoError::ERR_CUSTOMSYNCSERVER

data/res/generators/templates/application/app/Settings/home.bb.erb

@@ -0,0 +1,17 @@
+<div id="pageTitle">
+	<h1>Home</h1>
+</div>
+
+<div id="toolbar">
+    <% if SyncEngine::logged_in > 0 %>
+	    <%=  link_to "Logout", :action => :logout %>
+	<% else %>
+	    <%=  link_to "Login", :action => :login %>
+	<% end %>
+</div>
+
+<div id="content">
+    <ul>
+    	<li>Add links here...</li>
+    </ul>
+</div>

data/res/generators/templates/application/app/Settings/home.erb

@@ -1,14 +1,23 @@
-<div class="toolbar">
-	<h1 id="pageTitle">
-		Home
-	</h1>
+<div id="pageTitle">>
+	<h1>Home</h1>
 </div>
 
-<ul id="home" selected="true" title="Home">
-	<li>Add links here...</li>
-	<% if SyncEngine::logged_in > 0 %>
-	<li><%=  link_to "Logout", :action => :logout %></li>
-	<% else %>
-	<li><%=  link_to "Login", :action => :login %></li>
-	<% end %>
-</ul>
+<div id="toolbar">
+    <div id="leftItem" class="blueButton"><%%= link_to "Sync", :action => :do_sync %></div>
+    <%% if SyncEngine::logged_in > 0 %>
+      <div id="rightItem" class="regularButton"><%%= link_to "Logout", :action => :logout %></div>
+    <%% else %>
+      <div id="rightItem" class="regularButton"><%%= link_to "Login", :action => :login %></div>
+    <%% end %>
+</div>
+
+<div id="content">
+    <ul>
+        <li>
+            <a href="#">
+                <span class="title">Add Links Here...</span>
+                <span class="disclosure_indicator"></span>
+            </a>
+        </li>
+    </ul>
+</div>

data/res/generators/templates/application/app/Settings/index.bb.erb

@@ -0,0 +1,32 @@
+<div id="pageTitle">
+    <h1>Settings</h1>
+</div>
+
+<div id="content">
+    <% if @msg %>
+      <div class="alert" align="center"><%= @msg %></div>
+    <% end %>
+
+    <ul>
+        <li>
+            <p>Client ID: <span class="cid"><%= Rhom::Rhom::client_id %></span></p>
+        </li>
+        <li>
+            <%= link_to "Reset Database", :action => :reset %>
+        </li>
+        <li>
+            <%= link_to "Sync", :action => :do_sync %>
+        </li>
+
+    	<% if SyncEngine::logged_in > 0 %>		
+    	    <li>
+    	        <%= link_to "Logout", :action => :logout %>
+    	    </li>
+    	<% else %>
+    	    <li>
+    	        <%= link_to "Login", :action => :login %>
+    	    </li>
+    	<% end %>
+    </ul>
+    
+</div>

data/res/generators/templates/application/app/Settings/index.erb

@@ -1,17 +1,46 @@
-<div class="toolbar">
-	<h1 id="pageTitle">
-		Settings
-	</h1>
+<div id="pageTitle">
+	<h1>Settings</h1>
 </div>
 
-<ul id="settings" selected="true" title="Settings">
-	<% if @msg %><li style="color:#ff0000" align="center"><%=@msg%></li><% end %>
-	<li>Client ID: <br/><span style="font-size: 60%"><%=Rhom::Rhom::client_id%></span></li>
-	<li><%=link_to "Reset Database", :action => :reset%></li>
-	<li><%=link_to "Perform Sync", :action => :do_sync%></li>
-	<% if SyncEngine::logged_in > 0 %>		
-	<li><%=link_to "Logout", :action => :logout%></li>
-	<% else %>
-	<li><%=link_to "Login", :action => :login%></li>
-	<% end %>
-</ul>
+<div id="toolbar"></div>
+
+<div id="content">
+    <ul id="settings">
+        <% if @msg %>
+        <li class="alertMessage">
+            <span class="message"><%= @msg %></span>
+        </li>
+        <% end %>
+        <li>
+            <div class="itemLabel">
+                <span class="title">Client ID:</span>
+            </div>
+            <div class="itemValue">
+                <span class="clientID"><%= Rhom::Rhom::client_id %></span>
+            </div>
+        </li>
+        <li>
+          <a href="<%= url_for :action => :reset %>">
+              <span class="title">Reset Database</span>
+          </a>
+        </li>
+        <li>
+          <a href="<%= url_for :action => :do_sync %>">
+              <span class="title">Perform Sync</span>
+          </a>
+        </li>
+        <% if SyncEngine::logged_in > 0 %>
+        <li>
+            <a href="<%= url_for :action => :logout %>">
+              <span class="title">Logout</span>
+            </a>
+        </li>
+        <% else %>
+        <li>
+          <a href="<%= url_for :action => :login %>">
+               <span class="title">Login</span>
+          </a>
+        </li>
+        <% end %>
+    </ul>
+</div>