rhodes 2.4.1 → 3.0.0.beta.1

data/platform/wp7/WPApplication/rho/apps/app/layout.erb

@@ -7,7 +7,7 @@
     <title>Wptest</title>
     <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>
 
-    <% if System::get_property('platform') == 'APPLE' || System::get_property('platform') == 'ANDROID' %>
+    <% if System::get_property('platform') == 'APPLE' || System::get_property('platform') == 'ANDROID' || System::get_property('webview') =~ /^WEBKIT/ %>
         <script src="/public/jqtouch/jquery.1.3.2.min.js" type="text/javascript"></script>
         <script src="/public/jqtouch/jqtouch.js" type="text/javascript"></script>
         <link href="/public/jqtouch/jqtouch.css" type="text/css" rel="stylesheet"/>
@@ -33,6 +33,8 @@
         <% else %>
           <link href="/public/css/blackberry.css" type="text/css" rel="stylesheet"/>
         <% end %>
+    <% elsif System::get_property('webview') =~ /^WEBKIT/ %>
+        <link href="/public/css/android.css" type="text/css" rel="stylesheet"/>
     <% else %>
         <link href="/public/css/windows_mobile.css" type="text/css" rel="stylesheet"/>
     <% end %>

data/platform/wp7/build/wp.rake

@@ -7,6 +7,8 @@ namespace "config" do
 		$rubypath = "res/build-tools/RhoRuby.exe"
 		$zippath = "res/build-tools/7za.exe"
 		$wp7runner = "res/build-tools/RhoAppRunner.exe"
+		$wp7explorer = "res/build-tools/wp7explorer.exe"
+		$wp7logserver = "res/build-tools/RhoLogserver.exe"
 		$genpath = "ClassInitGenerator.exe"
 		$builddir = $config["build"]["wppath"] + "/build"
 		$vcbindir = $config["build"]["wppath"] + "/bin"
@@ -24,6 +26,16 @@ namespace "config" do
 		$sdk = $app_config["wpsdk"] unless $app_config["wpsdk"].nil?
 
 		$excludelib = ['**/builtinME.rb','**/ServeME.rb','**/dateME.rb','**/rationalME.rb']
+		
+        if !$app_config["wp"] || !$app_config["wp"]["productid"]
+			puts "Add wp:productid to application build.yml"
+			puts "productid is GUID in format: xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+			puts "for example:"
+			puts "wp:"
+            puts "  productid: 'fd55c4d0-51fa-012e-7844-3caec51bd50e'"
+            
+            exit 1
+		end		
 	end
 end
  
@@ -92,31 +104,44 @@ end
 		end
 		
 		task :ironruby => ["config:wp"] do   	
+		    iron_path = ""
 			if $config["env"]["paths"]["ironruby"].nil?
-				chdir "../ironruby/Solutions"
+				iron_path = "../ironruby"
 			else
-				chdir $config["env"]["paths"]["ironruby"]+"\\Solutions"
+				iron_path = $config["env"]["paths"]["ironruby"]
 			end
+			cp_r File.join( $config["build"]["wppath"], "IronRuby/Languages"), iron_path
+			
+			chdir File.join( iron_path, "Solutions" )
 
 			args = ['Ruby.sln', '/property:Configuration=Silverlight3Release']
-
-			if (!File.exists? "../bin/Silverlight3Release/Microsoft.Dynamic.dll") &&
-			   (!File.exists? "../bin/Silverlight3Release/Microsoft.Scripting.dll") &&
-			   (!File.exists? "../bin/Silverlight3Release/Microsoft.Scripting.Core.dll") && 
-			   (!File.exists? "../bin/Silverlight3Release/IronRuby.Libraries.dll") && 
-			   (!File.exists? "../bin/Silverlight3Release/IronRuby.dll" )
-				puts "\nThe following step may take several minutes or more to complete depending on your processor speed\n\n"
+			
+			#if (!File.exists? "../bin/Silverlight3Release/Microsoft.Dynamic.dll") &&
+			#   (!File.exists? "../bin/Silverlight3Release/Microsoft.Scripting.dll") &&
+			#   (!File.exists? "../bin/Silverlight3Release/Microsoft.Scripting.Core.dll") && 
+			#   (!File.exists? "../bin/Silverlight3Release/IronRuby.Libraries.dll") && 
+			#   (!File.exists? "../bin/Silverlight3Release/IronRuby.dll" )
+			#	puts "\nThe following step may take several minutes or more to complete depending on your processor speed\n\n"
 				Jake.run($msbuild,args)
 				unless $? == 0
 					puts "Error building"
 					exit 1
 				end
-			end
+			#end
  
 			chdir $startdir
+
+            iron_release = File.join( $config["build"]["wppath"], "IronRuby/bin/Silverlight3Release")
+            rm_rf iron_release
+            mkdir_p iron_release
+			cp File.join( iron_path, "bin/Silverlight3Release/IronRuby.dll" ), iron_release
+			cp File.join( iron_path, "bin/Silverlight3Release/IronRuby.Libraries.dll" ), iron_release
+			cp File.join( iron_path, "bin/Silverlight3Release/Microsoft.Dynamic.dll" ), iron_release
+			cp File.join( iron_path, "bin/Silverlight3Release/Microsoft.Scripting.dll" ), iron_release
+			cp File.join( iron_path, "bin/Silverlight3Release/Microsoft.Scripting.Core.dll" ), iron_release
 		end 
 
-		task :rhodes => ["config:wp", "build:wp:rhobundle", "build:wp:ironruby"] do
+		task :rhodes => ["config:wp", "build:wp:rhobundle"] do
 		    out_dir = $startdir + "/"+ $config["build"]["wppath"] +"/rhodes"
 			cp $app_path + "/icon/icon.png", out_dir if File.exists? $app_path + "/icon/icon.ico"     
 		
@@ -173,6 +198,22 @@ end
 		end
 	end
 end
+
+def get_app_log()
+	args = []
+	args << $app_config["wp"]["productid"]
+	args << ""
+	args << ""
+	args << ""
+	args << "RhoLog.txt"
+	cc_run($wp7runner, args) or return false
+	puts "RhoLog.txt stored to " + $app_path
+	return true
+end
+
+def run_rho_log_server()
+    system("START rake run:wp:rhologserver")
+end
  
  namespace "device" do
 	namespace "wp" do
@@ -228,6 +269,7 @@ end
 			mkdir_p $targetdir if not File.exists? $targetdir
 			mv out_dir + $appname + ".xap", $targetdir
 		end
+
 	end
 end
 
@@ -244,18 +286,115 @@ namespace "clean" do
 end
 
 namespace "run" do
+        def getLogPath
+			log_file_path =  File.join($app_path, $app_config["applog"].nil? ? "applog.txt" : $app_config["applog"] )
+			return log_file_path
+		end
+
 		desc "Build, install .xap and run on WP7 emulator"
 		task :wp => ["clean:wm:all", "device:wp:production"] do
-		if $app_config["wp"]["productid"] != nil
+		if $app_config["wp"] && $app_config["wp"]["productid"] != nil
+			#system("START " + $wp7logserver + " " + $app_path + "/rholog.txt")
+
+			File.delete($app_path + "/started") if File.exists?($app_path + "/started")
+			run_rho_log_server()
+			puts "RhoLogServer is starting"
+			while(1)
+			    if File.exists?($app_path + "/started")
+				    break
+			    end
+			end
+
+			Rake::Task["device:wp:addbundletoxapRelease"].invoke
+			out_dir = $startdir + "/" + $vcbindir + "/rhodes/Release/"
+			cp  out_dir + "rhodes.xap", out_dir + $appname + ".xap"
+			mv out_dir + $appname + ".xap", $targetdir
+
 			args = []
 			args << $app_config["wp"]["productid"]
 			args << $app_config["name"]
 			args << $app_path + "/icon/icon.png"
 			args << $targetdir + "/" + $appname + ".xap"
+			args << "emu"
 			puts Jake.run($wp7runner, args)
+
+			#while(1)
+			#	sleep(1000)
+			#end
+			#$rhologfile.close
 		else
 			puts "productid must be set in build.yml"
 			puts "productid's format is xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
 		end
+
+		end
+
+		namespace "wp" do
+		    task :get_log => "config:wp" do
+				puts "log_file=" + getLogPath
+			end
+
+			task :rhologserver => ["config:wp"] do
+				$rhologhostaddr = Jake.localip()
+				$rhologhostport = 0
+				$rhologserver = WEBrick::HTTPServer.new :BindAddress => $rhologhostaddr, :Port => $rhologhostport
+				$rhologhostport = $rhologserver.config[:Port]
+				confpath_content = File.read($srcdir + "/apps/rhoconfig.txt") if File.exists?($srcdir + "/apps/rhoconfig.txt")
+				confpath_content += "\r\n" + "rhologhost=" + $rhologhostaddr
+				confpath_content += "\r\n" + "rhologport=" + $rhologhostport.to_s()
+				File.open($srcdir + "/apps/rhoconfig.txt", "w") { |f| f.write(confpath_content) }  if confpath_content && confpath_content.length()>0
+				puts "LOCAL SERVER STARTED ON #{$rhologhostaddr}:#{$rhologhostport}"
+				started = File.open($app_path + "/started", "w+")
+				started.close
+				Thread.new { $rhologserver.start }
+				#write host and port 4 log server     
+				$rhologfile = File.open(getLogPath, "w+")
+				$rhologserver.mount_proc '/' do |req,res|
+					$rhologfile.puts req.body
+					$rhologfile.flush
+					res.status = 200
+					res.chunked = true
+					res.body = ""
+				end
+				while(1)
+					sleep(1000)
+				end
+			end
+
+			desc "Build, install .xap and run on WP7 device"
+			task :device => ["clean:wm:all", "device:wp:production"] do
+			if $app_config["wp"] && $app_config["wp"]["productid"] != nil
+			    #system("START " + $wp7logserver + " " + $app_path + "/rholog.txt")
+				File.delete($app_path + "/started")  if File.exists?($app_path + "/started")
+				run_rho_log_server()
+				puts "RhoLogServer is starting"
+				while(1)
+				    if File.exists?($app_path + "/started")
+					    break
+				    end
+				end
+
+				Rake::Task["device:wp:addbundletoxapRelease"].invoke
+				out_dir = $startdir + "/" + $vcbindir + "/rhodes/Release/"
+				cp  out_dir + "rhodes.xap", out_dir + $appname + ".xap"
+				mv out_dir + $appname + ".xap", $targetdir
+
+				args = []
+				args << $app_config["wp"]["productid"]
+				args << $app_config["name"]
+				args << $app_path + "/icon/icon.png"
+				args << $targetdir + "/" + $appname + ".xap"
+				args << "dev"
+				puts Jake.run($wp7runner, args)
+
+				#while(1)
+				#	sleep(1000)
+				#end
+				#$rhologfile.close
+			else
+				puts "productid must be set in build.yml"
+				puts "productid's format is xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx"
+			end
+			end
 		end
 end

data/platform/wp7/rhodes.sln

@@ -14,6 +14,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "sqlite3", "sqlite3\sqlite3.
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RhoAppRunner", "RhoAppRunner\RhoAppRunner.csproj", "{FE6CF1DD-B683-4D6E-99D7-CE28861D880D}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RhoLogServer", "RhoLogServer\RhoLogServer.csproj", "{896E5017-59D6-41BD-9CBF-191F77237222}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -72,6 +74,14 @@ Global
 		{FE6CF1DD-B683-4D6E-99D7-CE28861D880D}.Release|Mixed Platforms.ActiveCfg = Release|x86
 		{FE6CF1DD-B683-4D6E-99D7-CE28861D880D}.Release|x86.ActiveCfg = Release|x86
 		{FE6CF1DD-B683-4D6E-99D7-CE28861D880D}.Release|x86.Build.0 = Release|x86
+		{896E5017-59D6-41BD-9CBF-191F77237222}.Debug|Any CPU.ActiveCfg = Debug|x86
+		{896E5017-59D6-41BD-9CBF-191F77237222}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
+		{896E5017-59D6-41BD-9CBF-191F77237222}.Debug|x86.ActiveCfg = Debug|x86
+		{896E5017-59D6-41BD-9CBF-191F77237222}.Debug|x86.Build.0 = Debug|x86
+		{896E5017-59D6-41BD-9CBF-191F77237222}.Release|Any CPU.ActiveCfg = Release|x86
+		{896E5017-59D6-41BD-9CBF-191F77237222}.Release|Mixed Platforms.ActiveCfg = Release|x86
+		{896E5017-59D6-41BD-9CBF-191F77237222}.Release|x86.ActiveCfg = Release|x86
+		{896E5017-59D6-41BD-9CBF-191F77237222}.Release|x86.Build.0 = Release|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

data/platform/wp7/rhodes/App.xaml.cs

@@ -14,12 +14,17 @@ using System.Windows.Shapes;
 using Microsoft.Phone.Controls;
 using Microsoft.Phone.Shell;
 using rho.common;
+using rho.logging;
+using System.ComponentModel;
+using System.Threading;
+using System.Windows;
 
 namespace Rhodes
 {
     public partial class App : Application
     {
         private static CRhodesApp RHODESAPP() { return CRhodesApp.Instance; }
+        //private static BackgroundWorker m_logThread = new BackgroundWorker();
 
         /// <summary>
         /// Provides easy access to the root frame of the Phone Application.
@@ -83,6 +88,7 @@ namespace Rhodes
         private void Application_Closing(object sender, ClosingEventArgs e)
         {
             RHODESAPP().stopApp();
+           // m_logThread.CancelAsync();
         }
 
         // Code to execute if a navigation fails

data/platform/wp7/rhodes/MainPage.xaml

@@ -25,7 +25,10 @@
             <TextBlock x:Name="ApplicationTitle" Text="" Style="{StaticResource PhoneTextNormalStyle}"/>
             <TextBlock x:Name="PageTitle" Text="" Margin="9,-7,0,0" Style="{StaticResource PhoneTextTitle1Style}"/>
         </StackPanel>
+        <Image x:Name="LoadingImage" Source="/apps/app/loading.png"></Image>
+        <ProgressBar Height="40" Name="progressBar" Width="300" />
         <phone:WebBrowser Grid.Row="1" HorizontalAlignment="Left" Name="webBrowser1" VerticalAlignment="Top" Height="607" Width="480" />
+        <phone:WebBrowser Grid.Row="1" HorizontalAlignment="Left" Name="webBrowser2" VerticalAlignment="Top" Height="607" Width="480" />
         <!--ContentPanel - place additional content here-->
     </Grid>
 

data/platform/wp7/rhodes/MainPage.xaml.cs

@@ -50,6 +50,15 @@ namespace Rhodes
             InitializeComponent();
             ApplicationTitle.Text = GetWinPhoneAttribute("Title");
 
+            if (CRhoFile.isResourceFileExist("/apps/app/loading.png") == false)
+            {
+                LoadingImage.Visibility = Visibility.Collapsed;
+                webBrowser2.Visibility = Visibility.Visible;
+            }
+            else
+                webBrowser2.Visibility = Visibility.Collapsed;
+
+            webBrowser1.Visibility = Visibility.Collapsed;
             webBrowser1.IsScriptEnabled = true;
 
             webBrowser1.Loaded += WebBrowser_OnLoaded;
@@ -57,6 +66,7 @@ namespace Rhodes
             webBrowser1.Navigating += WebBrowser_OnNavigating;
             webBrowser1.Navigated += WebBrowser_OnNavigated;
             webBrowser1.ScriptNotify += WebBrowser_OnScriptNotify;
+            progressBar.IsIndeterminate = true;
         }
 
         private CRhodesApp RHODESAPP(){return CRhodesApp.Instance;}
@@ -74,6 +84,8 @@ namespace Rhodes
 
         private void WebBrowser_OnLoaded(object sender, RoutedEventArgs e)
         {
+            if (webBrowser2.Visibility == Visibility.Visible)
+                webBrowser2.NavigateToString(CRhoFile.readStringFromResourceFile("/apps/app/loading.html"));
             RHODESAPP().Init(webBrowser1, this);
         }
 
@@ -91,6 +103,13 @@ namespace Rhodes
 
         private void WebBrowser_OnNavigated(object sender, NavigationEventArgs e)
         {
+            if (webBrowser1.Visibility == Visibility.Collapsed)
+            {
+                LoadingImage.Visibility = Visibility.Collapsed;
+                webBrowser2.Visibility = Visibility.Collapsed;
+                webBrowser1.Visibility = Visibility.Visible;
+                progressBar.Visibility = Visibility.Collapsed;
+            }
             RHODESAPP().addToHistory(e.Uri);
         }
 

data/platform/wp7/rhodes/Rhodes.csproj

@@ -56,7 +56,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="IronRuby.Libraries">
-      <HintPath>..\..\..\..\ironruby\bin\Silverlight3$(Configuration)\IronRuby.Libraries.dll</HintPath>
+      <HintPath>..\ironruby\bin\Silverlight3$(Configuration)\IronRuby.Libraries.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Phone" />
     <Reference Include="Microsoft.Phone.Interop" />
@@ -87,7 +87,9 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <None Include="Properties\AppManifest.xml" />
+    <None Include="Properties\AppManifest.xml">
+      <SubType>Designer</SubType>
+    </None>
     <None Include="Properties\WMAppManifest.xml">
       <SubType>Designer</SubType>
     </None>

data/rakefile.rb

@@ -196,9 +196,10 @@ namespace "config" do
         puts "Could not find rhodes application. Please verify your application setting in #{File.dirname(__FILE__)}/rhobuild.yml"
         exit 1
       end
-      $app_config = Jake.config(File.open(File.join($app_path, "build.yml")))
-
     end
+
+    $app_config = Jake.config(File.open(File.join($app_path, "build.yml")))
+
     Jake.set_bbver($app_config["bbver"].to_s)
     
     extpaths = []
@@ -506,42 +507,12 @@ def common_bundle_start(startdir, dest)
 end
 
 def create_manifest
-  dir = File.join($srcdir, 'apps')
-  #fname = "config.rb"
-  fappManifest = File.new( File.join(dir,'app_manifest.txt'), "w")
-  dir = File.join($srcdir, 'apps/app')
-
-  Find.find(dir) do |path|
-
-    strDir = File.dirname(path)
-    next unless dir == File.dirname(strDir) #one level only
+    require File.dirname(__FILE__) + '/lib/framework/rhoappmanifest'
     
-    if File.basename(path) == "config.rb"
-        puts "******ERROR enumerating models***********"
-        puts "Model definition has changed and doesn't use config.rb anymore: '#{path}' "
-        puts "You should replace config.rb with <model_name>.rb file as described: "
-        puts "http://wiki.rhomobile.com/index.php/Rhom#Rhom_Models"
-        puts "*****************************************"
-        exit 1
-    end
+    fappManifest = Rho::AppManifest.enumerate_models(File.join($srcdir, 'apps/app'))
+    content = fappManifest.read();
     
-    fname = File.dirname(path)
-    fname = File.basename(fname)
-    modelname = fname.split(/(?=[A-Z])/).map{|w| w.downcase}.join("_")
-    fname = modelname + ".rb"
-  
-    if File.basename(path) == fname
-
-      relPath = path[dir.length+1, File.dirname(path).length-1]   #relative path
-      relPath = relPath[0, relPath.length-3] #remove .rb extension and app
-      relPath = File.join(File.dirname(relPath), modelname )
-      fappManifest.puts( relPath )
-
-    end
-  end
-
-  fappManifest.close()
-  
+    File.open( File.join($srcdir,'apps/app_manifest.txt'), "w"){|file| file.write(content)}    
 end
 
 def process_exclude_folders

data/res/generators/templates/application/app/layout.erb

@@ -14,7 +14,7 @@
         <meta name="viewport" content="width=device-width; initial-scale=1.0; maximum-scale=1.0; user-scalable=0;"/>        
     <%% end %>
     
-    <%% if System::get_property('platform') == 'APPLE' || System::get_property('platform') == 'ANDROID' || is_bb6 %>
+    <%% if System::get_property('platform') == 'APPLE' || System::get_property('platform') == 'ANDROID' || is_bb6 || System::get_property('webview') =~ /^WEBKIT/ %>
         <script src="/public/jqtouch/jquery.1.3.2.min.js" type="text/javascript"></script>
         <script src="/public/jqtouch/jqtouch.js" type="text/javascript"></script>
         <link href="/public/jqtouch/jqtouch.css" type="text/css" rel="stylesheet"/>
@@ -35,6 +35,8 @@
     <%% elsif System::get_property('platform') == 'WP7' %>
         <script src="/public/js/wp7.js" type="text/javascript"></script>
 	<link href="/public/css/windows_mobile.css" type="text/css" rel="stylesheet"/>
+    <%% elsif System::get_property('webview') =~ /^WEBKIT/ %>
+        <link href="/public/css/android.css" type="text/css" rel="stylesheet"/>
     <%% else %>        
 	<link href="/public/css/windows_mobile.css" type="text/css" rel="stylesheet"/>
     <%% end %>