Switch browser.js to browserjs. Fix External build problems

.gitmodules

@@ -1,12 +1,12 @@
 [submodule "External/narwhal"]
 	path = External/narwhal
 	url = git://github.com/tlrobinson/narwhal.git
-[submodule "External/browser.js"]
-	path = External/browser.js
-	url = git://github.com/tlrobinson/browser.js.git
-[submodule "External/ojunit"]
-	path = External/ojunit
-	url = git://github.com/280north/ojunit.git
 [submodule "External/jack"]
 	path = External/jack
 	url = git://github.com/tlrobinson/jack.git
+[submodule "External/browserjs"]
+	path = External/browserjs
+	url = git://github.com/tlrobinson/browserjs.git
+[submodule "External/ojunit"]
+	path = External/ojunit
+	url = git://github.com/280north/ojunit.git

External/Rakefile

@@ -8,36 +8,33 @@ require 'rake/clean'
 require 'fileutils'
 
 $ENVIRONMENT_NARWHAL_PRODUCT = File.join($ENVIRONMENT_DIR, 'narwhal')
-$ENVIRONMENT_BROWSERJS_PRODUCT = File.join($ENVIRONMENT_NARWHAL_PRODUCT, 'packages', 'browser')
+$ENVIRONMENT_BROWSERJS_PRODUCT = File.join($ENVIRONMENT_NARWHAL_PRODUCT, 'packages', 'browserjs')
 $ENVIRONMENT_JACK_PRODUCT = File.join($ENVIRONMENT_NARWHAL_PRODUCT, 'packages', 'jack')
 
 $ENVIRONMENT_NARWHAL_EXECUTABLE = File.join($ENVIRONMENT_BIN_DIR, 'narwhal')
 
-file_d $ENVIRONMENT_NARWHAL_PRODUCT do
-    cp_r('narwhal', $ENVIRONMENT_NARWHAL_PRODUCT)
+file_d $ENVIRONMENT_DIR do
+  mkdir_p $ENVIRONMENT_DIR
 end
 
-file_d $ENVIRONMENT_NARWHAL_EXECUTABLE => [$ENVIRONMENT_NARWHAL_PRODUCT] do
+file_d $ENVIRONMENT_NARWHAL_EXECUTABLE do
   FileUtils.ln_sf('../narwhal/bin/narwhal', $ENVIRONMENT_NARWHAL_EXECUTABLE)
 end
 
-file_d $ENVIRONMENT_BROWSERJS_PRODUCT => [$ENVIRONMENT_NARWHAL_PRODUCT] do
-    cp_r('browser.js', $ENVIRONMENT_BROWSERJS_PRODUCT)
-end
-
-file_d $ENVIRONMENT_JACK_PRODUCT => [$ENVIRONMENT_NARWHAL_PRODUCT] do
-    cp_r('jack', $ENVIRONMENT_JACK_PRODUCT)
-end
-
 task :update_submodules do
-    if executable_exists? "git"
-        system %{cd .. && git submodule update --init}
-    else
-        puts "Git not installed"
-        rake abort
-    end
+  if executable_exists? "git"
+    system %{cd .. && git submodule update --init}
+  else
+    puts "Git not installed"
+    rake abort
+  end
 end
 
-task :build => [:update_submodules, $ENVIRONMENT_NARWHAL_PRODUCT, $ENVIRONMENT_BROWSERJS_PRODUCT, $ENVIRONMENT_JACK_PRODUCT, $ENVIRONMENT_NARWHAL_EXECUTABLE]
+task :build => [:update_submodules, $ENVIRONMENT_DIR, $ENVIRONMENT_NARWHAL_EXECUTABLE] do
+  rm_rf($ENVIRONMENT_NARWHAL_PRODUCT)
+  cp_r('narwhal', $ENVIRONMENT_NARWHAL_PRODUCT)
+  cp_r('browserjs', $ENVIRONMENT_BROWSERJS_PRODUCT)
+  cp_r('jack', $ENVIRONMENT_JACK_PRODUCT)
+end
 
-CLOBBER.include($ENVIRONMENT_NARWHAL_PRODUCT, $ENVIRONMENT_BROWSERJS_PRODUCT, $ENVIRONMENT_JACK_PRODUCT, $ENVIRONMENT_NARWHAL_EXECUTABLE)
+CLOBBER.include($ENVIRONMENT_NARWHAL_PRODUCT, $ENVIRONMENT_NARWHAL_EXECUTABLE)

Objective-J/Tools/Rakefile

@@ -14,10 +14,6 @@ $OBJJC_JS_COMPILER_RHINO = File.join($ENVIRONMENT_LIB_DIR, 'js.jar')
 $EXECUTABLES = ['objj', 'objjc', 'plutil']
 $EXECUTABLES_PRODUCTS = $EXECUTABLES.map {|e| File.join($ENVIRONMENT_BIN_DIR, e) }
 
-file_d $ENVIRONMENT_OBJJ_PRODUCT do
-    cp_r('objj', $ENVIRONMENT_OBJJ_PRODUCT)
-end
-
 $EXECUTABLES.each do |executable|
   source = File.join('objj', 'bin', executable)
   dest = File.join($ENVIRONMENT_BIN_DIR, executable)
@@ -28,13 +24,16 @@ $EXECUTABLES.each do |executable|
 end
 
 file_d $OBJJC_JS_COMPILER => 'shrinksafe.jar' do
-    cp('shrinksafe.jar', $OBJJC_JS_COMPILER)
+  cp('shrinksafe.jar', $OBJJC_JS_COMPILER)
 end
 
 file_d $OBJJC_JS_COMPILER_RHINO => 'js.jar' do
-    cp('js.jar', $OBJJC_JS_COMPILER_RHINO)
+  cp('js.jar', $OBJJC_JS_COMPILER_RHINO)
 end
 
-task :build => [$ENVIRONMENT_OBJJ_PRODUCT, $OBJJC_JS_COMPILER, $OBJJC_JS_COMPILER_RHINO].concat($EXECUTABLES_PRODUCTS)
+task :build => [$OBJJC_JS_COMPILER, $OBJJC_JS_COMPILER_RHINO].concat($EXECUTABLES_PRODUCTS) do
+  rm_rf($ENVIRONMENT_OBJJ_PRODUCT)
+  cp_r('objj', $ENVIRONMENT_OBJJ_PRODUCT)
+end
 
 CLOBBER.include($ENVIRONMENT_OBJJ_PRODUCT, $EXECUTABLES_PRODUCTS, $OBJJC_JS_COMPILER, $OBJJC_JS_COMPILER_RHINO)