Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of github.com:slagyr/limelight

  • Loading branch information...
commit ab570d8fa49851a45bf4df0949909a3e86ea4fe6 2 parents 4bd4533 + ecb2ad9
@slagyr slagyr authored
Showing with 4 additions and 15 deletions.
  1. +4 −15 etc/tasks/_common.rake
View
19 etc/tasks/_common.rake
@@ -1,4 +1,5 @@
require 'fileutils'
+require 'rbconfig'
LIMELIGHT_ROOT = File.expand_path(File.dirname(__FILE__) + "/../../")
@@ -30,27 +31,15 @@ ensure
end
def darwin?
- if defined?(Java)
- java.lang.System.getProperty('os.name') =~ /Mac/
- else
- RUBY_PLATFORM =~ /darwin/
- end
+ Config::CONFIG["host_os"] =~ /darwin/
end
def windows?
- if defined?(Java)
- java.lang.System.getProperty('os.name') =~ /Windows/
- else
- RUBY_PLATFORM =~ /win/
- end
+ Config::CONFIG["host_os"] =~ /mswin/
end
def linux?
- if defined?(Java)
- java.lang.System.getProperty('os.name') =~ /Linux/
- else
- RUBY_PLATFORM =~ /linux/
- end
+ Config::CONFIG["host_os"] =~ /linux/ #???
end
def path_separator
Please sign in to comment.
Something went wrong with that request. Please try again.