@@ -10,8 +10,8 @@ require Pathname('rake/rdoctask') DIR = Pathname(__FILE__).dirname.expand_path.to_s -WIN32 = (PLATFORM =~ /win32|cygwin/) rescue nil -SUDO = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS']) +WINDOWS = (RUBY_PLATFORM =~ /mswin|mingw|cygwin/) rescue nil +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) # projects = %w[data_objects do_jdbc do_mysql do_postgres do_sqlite3] # Took out do_jdbc since it doesn't build yet. Rakefile @@ -4,8 +4,8 @@ require 'rake/gempackagetask' require 'spec/rake/spectask' require 'pathname' -WIN32 = (PLATFORM =~ /win32|cygwin/) rescue nil -SUDO = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS']) +WINDOWS = (RUBY_PLATFORM =~ /mswin|mingw|cygwin/) rescue nil +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) spec = Gem::Specification.new do |s| s.name = 'data_objects' data_objects/Rakefile @@ -2,8 +2,8 @@ require 'rubygems' require 'rake/gempackagetask' require 'spec/rake/spectask' -WIN32 = (RUBY_PLATFORM =~ /mswin|mingw|cygwin/) rescue nil -SUDO = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS']) +WINDOWS = (RUBY_PLATFORM =~ /mswin|mingw|cygwin/) rescue nil +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) spec = Gem::Specification.new do |s| s.name = 'do_jdbc' do_jdbc/Rakefile @@ -10,8 +10,8 @@ CLEAN.include '**/*.o', '**/*.so', '**/*.bundle', '**/*.a', '**/*.log', '{ext,lib}/*.{bundle,so,obj,pdb,lib,def,exp}', 'ext/Makefile' -WIN32 = (RUBY_PLATFORM =~ /mswin|mingw|cygwin/) rescue nil -SUDO = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS']) +WINDOWS = (RUBY_PLATFORM =~ /mswin|mingw|cygwin/) rescue nil +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) spec = Gem::Specification.new do |s| s.name = 'do_mysql' do_mysql/Rakefile @@ -10,8 +10,8 @@ CLEAN.include '**/*.o', '**/*.so', '**/*.bundle', '**/*.a', '**/*.log', '{ext,lib}/*.{bundle,so,obj,pdb,lib,def,exp}', 'ext/Makefile' -WIN32 = (RUBY_PLATFORM =~ /mswin|mingw|cygwin/) rescue nil -SUDO = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS']) +WINDOWS = (RUBY_PLATFORM =~ /mswin|mingw|cygwin/) rescue nil +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) spec = Gem::Specification.new do |s| s.name = 'do_postgres' do_postgres/Rakefile @@ -10,8 +10,8 @@ CLEAN.include '**/*.o', '**/*.so', '**/*.bundle', '**/*.a', '**/*.log', '{ext,lib}/*.{bundle,so,obj,pdb,lib,def,exp}', 'ext/Makefile', '**/*.db' -WIN32 = (RUBY_PLATFORM =~ /mswin|mingw|cygwin/) rescue nil -SUDO = WIN32 ? '' : ('sudo' unless ENV['SUDOLESS']) +WINDOWS = (RUBY_PLATFORM =~ /mswin|mingw|cygwin/) rescue nil +SUDO = WINDOWS ? '' : ('sudo' unless ENV['SUDOLESS']) spec = Gem::Specification.new do |s| s.name = 'do_sqlite3' do_sqlite3/Rakefile 994b4ad7336c4bb764adf19201bf70669829c03d Alex Coles alexbcoles@mac.com http://github.com/sam/do/commit/5d79e287a4b4567888a4940b5c8860e995253d8e 5d79e287a4b4567888a4940b5c8860e995253d8e 2008-05-17T12:26:15-07:00 2008-05-17T12:26:15-07:00 Updated platform testing code to add mingw * Updated Rakefiles missed in previous commit (994b4ad) * Changed constant from PLATFORM to RUBY_PLATFORM for Ruby 1.9 compatibility. * Also changed WIN32 to WINDOWS, to better reflect code that is for WINDOWS-like platforms (and also because it sounds "very 1990's"). cc8121bcb410fe6968b98c61b8397c5b64e3e770 Alex Coles alexbcoles@mac.com