diff options
| author | Jérémy Zurcher <jeremy@asynk.ch> | 2012-08-31 16:07:58 +0200 |
|---|---|---|
| committer | Jérémy Zurcher <jeremy@asynk.ch> | 2012-08-31 16:07:58 +0200 |
| commit | fc1567d99977e5f3a025cb6c12c229c0e3c64eb1 (patch) | |
| tree | 879670d46b8b9da7c4b59c1210033b276c13ef9b /tasks | |
| parent | 15e5e9c2be935215de143cb39beae9237fa0044e (diff) | |
| download | ayk-fc1567d99977e5f3a025cb6c12c229c0e3c64eb1.zip ayk-fc1567d99977e5f3a025cb6c12c229c0e3c64eb1.tar.gz | |
Diffstat (limited to 'tasks')
| -rw-r--r-- | tasks/constants.rb | 18 | ||||
| -rw-r--r-- | tasks/svn.rake | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/tasks/constants.rb b/tasks/constants.rb index 78a7625..8a7fdfa 100644 --- a/tasks/constants.rb +++ b/tasks/constants.rb @@ -27,19 +27,19 @@ if USE_RAKE_COMPILER ENV['RUBY_CC_VERSION'] = '1.8.7:1.9.2' end -LIBEXT = case Config::CONFIG['host_os'].downcase +LIBEXT = case RbConfig::CONFIG['host_os'].downcase when /darwin/ "dylib" when /mswin|mingw/ "dll" else - Config::CONFIG['DLEXT'] + RbConfig::CONFIG['DLEXT'] end -CPU = case Config::CONFIG['host_cpu'].downcase +CPU = case RbConfig::CONFIG['host_cpu'].downcase when /i[3456]86/ # Darwin always reports i686, even when running in 64bit mode - if Config::CONFIG['host_os'] =~ /darwin/ && 0xfee1deadbeef.is_a?(Fixnum) + if RbConfig::CONFIG['host_os'] =~ /darwin/ && 0xfee1deadbeef.is_a?(Fixnum) "x86_64" else "i386" @@ -51,10 +51,10 @@ CPU = case Config::CONFIG['host_cpu'].downcase when /ppc|powerpc/ "powerpc" else - Config::CONFIG['host_cpu'] + RbConfig::CONFIG['host_cpu'] end -OS = case Config::CONFIG['host_os'].downcase +OS = case RbConfig::CONFIG['host_os'].downcase when /linux/ "linux" when /darwin/ @@ -68,12 +68,12 @@ OS = case Config::CONFIG['host_os'].downcase when /mswin|mingw/ "win32" else - Config::CONFIG['host_os'].downcase + RbConfig::CONFIG['host_os'].downcase end -CC=ENV['CC'] || Config::CONFIG['CC'] || "gcc" +CC=ENV['CC'] || RbConfig::CONFIG['CC'] || "gcc" -GMAKE = Config::CONFIG['host_os'].downcase =~ /bsd|solaris/ ? "gmake" : "make" +GMAKE = RbConfig::CONFIG['host_os'].downcase =~ /bsd|solaris/ ? "gmake" : "make" DIFF = if WIN32 then 'diff.exe' diff --git a/tasks/svn.rake b/tasks/svn.rake index ae9426e..b831cbb 100644 --- a/tasks/svn.rake +++ b/tasks/svn.rake @@ -35,7 +35,7 @@ namespace :svn do puts "Creating SVN tag '#{tag}'" unless system "svn cp -m '#{msg}' #{trunk} #{tag}" - abort "Tag creation failed" + abort "Tag creation failed" end end |