JariBakken: Fix Gecko deps by adding an extra rule with slashes rever…

…sed. r12788
mpichlin · Jul 6, 2011 · 46f6141 · 46f6141
1 parent 8b798e3
commit 46f6141
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/Rakefile b/Rakefile
@@ -244,15 +244,15 @@ ie_generate_type_mapping(:name => "ie_result_type_java",
 
 
 GeckoSDKs.new do |sdks|
-  sdks.add 'third_party/gecko-1.9.2/linux'  , 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.2.18/sdk/xulrunner-1.9.2.18.en-US.linux-i686.sdk.tar.bz2'
-  sdks.add 'third_party/gecko-2/linux'  , 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/2.0/sdk/xulrunner-2.0.en-US.linux-i686.sdk.tar.bz2'
-  sdks.add 'third_party/gecko-2/linux64', 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/2.0/sdk/xulrunner-2.0.en-US.linux-x86_64.sdk.tar.bz2'
-  sdks.add 'third_party/gecko-2/mac'    , 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/2.0/sdk/xulrunner-2.0.en-US.mac-x86_64.sdk.tar.bz2'
-  sdks.add 'third_party\\gecko-2\\win32'  , 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/2.0/sdk/xulrunner-2.0.en-US.win32.sdk.zip'
-  sdks.add 'third_party/gecko-5/linux'  , 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/5.0/sdk/xulrunner-5.0.en-US.linux-i686.sdk.tar.bz2'
-  sdks.add 'third_party/gecko-5/linux64', 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/5.0/sdk/xulrunner-5.0.en-US.linux-x86_64.sdk.tar.bz2'
-  sdks.add 'third_party/gecko-5/mac'    , 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/5.0/sdk/xulrunner-5.0.en-US.mac-i386.sdk.tar.bz2'
-  sdks.add 'third_party\\gecko-5\\win32'  , 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/5.0/sdk/xulrunner-5.0.en-US.win32.sdk.zip'
+  sdks.add 'third_party/gecko-1.9.2/linux', 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/1.9.2.18/sdk/xulrunner-1.9.2.18.en-US.linux-i686.sdk.tar.bz2'
+  sdks.add 'third_party/gecko-2/linux'    , 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/2.0/sdk/xulrunner-2.0.en-US.linux-i686.sdk.tar.bz2'
+  sdks.add 'third_party/gecko-2/linux64'  , 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/2.0/sdk/xulrunner-2.0.en-US.linux-x86_64.sdk.tar.bz2'
+  sdks.add 'third_party/gecko-2/mac'      , 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/2.0/sdk/xulrunner-2.0.en-US.mac-x86_64.sdk.tar.bz2'
+  sdks.add 'third_party/gecko-2/win32'    , 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/2.0/sdk/xulrunner-2.0.en-US.win32.sdk.zip'
+  sdks.add 'third_party/gecko-5/linux'    , 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/5.0/sdk/xulrunner-5.0.en-US.linux-i686.sdk.tar.bz2'
+  sdks.add 'third_party/gecko-5/linux64'  , 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/5.0/sdk/xulrunner-5.0.en-US.linux-x86_64.sdk.tar.bz2'
+  sdks.add 'third_party/gecko-5/mac'      , 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/5.0/sdk/xulrunner-5.0.en-US.mac-i386.sdk.tar.bz2'
+  sdks.add 'third_party/gecko-5/win32'    , 'http://releases.mozilla.org/pub/mozilla.org/xulrunner/releases/5.0/sdk/xulrunner-5.0.en-US.win32.sdk.zip'
 end
 
 task :'selenium-server_zip' do

diff --git a/rake-tasks/gecko_sdks.rb b/rake-tasks/gecko_sdks.rb
@@ -20,7 +20,7 @@ def add(path, url)
   private
 
   def define_rule(path, url)
-    file path do
+    download_task = file(path) do
       mkdir_p path
       next unless platform_matches?(path)
 
@@ -43,6 +43,11 @@ def define_rule(path, url)
         rm_rf sdk if sdk && File.exist?(sdk)
       end
     end
+
+    # this really shouldn't be necessary.
+    if Platform.windows?
+      file path.gsub("/", "\\") => download_task
+    end
   end
 
   def platform_matches?(path)