Merge branch 'master' of github.com:/handlino/FireApp

KKBOX · Jun 30, 2013 · c96dde9 · c96dde9
2 parents b8167f9 + 65bbbcc
commit c96dde9
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 6 deletions.
diff --git a/Rakefile b/Rakefile
@@ -42,6 +42,9 @@ INFO_ENDL
       %x{mkdir -p  #{CONFIG.osx_output_dir}/#{CONFIG.project_name}.app/Contents/Resources/lib/swt}
       %x{cp -R lib/swt/swt_osx* #{CONFIG.osx_output_dir}/#{CONFIG.project_name}.app/Contents/Resources/lib/swt}
 
+      %x{mkdir -p  #{CONFIG.osx_output_dir}/#{CONFIG.project_name}.app/Contents/Resources/lib/nodejs/osx}
+      %x{cp -R lib/nodejs/osx/node* #{CONFIG.osx_output_dir}/#{CONFIG.project_name}.app/Contents/Resources/lib/nodejs/osx/node}
+
       %w{ruby images applescript documents javascripts}.each do | copy_dir |
         %x{cp -R lib/#{copy_dir} #{CONFIG.osx_output_dir}/#{CONFIG.project_name}.app/Contents/Resources/lib }
       end
@@ -63,8 +66,8 @@ INFO_ENDL
       %x{mkdir -p  #{CONFIG.windows_output_dir}/lib/swt}
       %x{cp -R lib/swt/swt_win* #{CONFIG.windows_output_dir}/lib/swt}
 
-      %x{mkdir -p  #{CONFIG.windows_output_dir}/lib/nodejs}
-      %x{cp -R lib/nodejs/node-win* #{CONFIG.windows_output_dir}/lib/nodejs/node.exe}
+      %x{mkdir -p  #{CONFIG.windows_output_dir}/lib/nodejs/win}
+      %x{cp -R lib/nodejs/win/node-win* #{CONFIG.windows_output_dir}/lib/nodejs/win/node.exe}
 
       %w{ruby images documents javascripts}.each do | copy_dir |
         %x{cp -R lib/#{copy_dir} #{CONFIG.windows_output_dir}/lib }
@@ -85,6 +88,9 @@ INFO_ENDL
       %x{mkdir -p  package/jar/lib/swt}
       %x{cp -R lib/swt/swt_linux* package/jar/lib/swt}
 
+      %x{mkdir -p  package/jar/lib/nodejs/linux}
+      %x{cp -R lib/nodejs/linux/node* package/jar/lib/nodejs/linux/node}
+
       %w{ruby images documents javascripts}.each do | copy_dir |
         %x{cp -R lib/#{copy_dir} package/jar/lib }
       end

diff --git a/lib/nodejs/linux/node b/lib/nodejs/linux/node
diff --git a/lib/nodejs/osx/node b/lib/nodejs/osx/node
diff --git a/lib/nodejs/node-win32-0.8.20.exe → lib/nodejs/win/node-win32-0.8.20.exe b/lib/nodejs/node-win32-0.8.20.exe → lib/nodejs/win/node-win32-0.8.20.exe
diff --git a/lib/ruby/common/tka-serve b/lib/ruby/common/tka-serve
diff --git a/src/main.rb b/src/main.rb
@@ -11,11 +11,19 @@
   LIB_PATH = File.expand_path 'lib' 
 end
 
+# set execjs runtime
+ENV["EXECJS_RUNTIME"] = "Node"
+
 # bundle nodejs for windows so we need add node.exe path to ENV['PATH']
 if org.jruby.platform.Platform::IS_WINDOWS
-  ENV['PATH'] = File.join(LIB_PATH,'nodejs')+File::PATH_SEPARATOR+ENV['PATH']
+  ENV['PATH'] = File.join(LIB_PATH,'nodejs','win')+File::PATH_SEPARATOR+ENV['PATH']
+elsif org.jruby.platform.Platform::IS_MAC
+  ENV['PATH'] = File.join(LIB_PATH,'nodejs','osx')+File::PATH_SEPARATOR+ENV['PATH']
+elsif org.jruby.platform.Platform::IS_LINUX
+  ENV['PATH'] = File.join(LIB_PATH,'nodejs','linux')+File::PATH_SEPARATOR+ENV['PATH']
 end
 
+
 require "swt_wrapper"
 require "ui/splash_window"
 SplashWindow.instance.replace('Loading...')

diff --git a/src/ui/change_options_panel.rb b/src/ui/change_options_panel.rb
@@ -480,7 +480,7 @@ def save_handler
       #evt.widget.shell.dispose if Tray.instance.watching_dir
 
       msg_window = ProgressWindow.new
-      msg_window.replace('Saving...', false, true)
+      msg_window.replace('Regenerating...', false, true)
 
       # -- update general --
       # Tray.instance.update_config( "http_path", @http_path_text.getText.inspect )

diff --git a/src/ui/tray.rb b/src/ui/tray.rb
@@ -447,7 +447,7 @@ def clean_project(options = {}) # options = {:show_report(boolean), :show_progre
     options = { :show_report => false, :show_progress => false }.merge(options)
 
     msg_window = ProgressWindow.new if options[:show_progress]
-    msg_window.replace("Compiling...", false, true) if msg_window
+    msg_window.replace("Building...", false, true) if msg_window
 
     dir = @watching_dir
     stop_watch