From 0aff05532329c5e8084a51cf2b7e0af106db421e Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Tue, 1 Mar 2011 20:29:26 -0500 Subject: make sisu: v2 require >=ruby1.8.7; v3 require >=ruby1.9.2 * bin/sisu bin/sisu3 modified accordingly note: there are issues with sisu and early versions of ruby1.9.2 ruby1.9.2p0 is known to segfault on a number of operations ruby1.9.2p180 does not have these issues * v3 includes changelog updates * v2 includes changelog updates and version update 2.8.1 --- bin/sisu | 16 +++++++++++++++- bin/sisu3 | 17 ++++++++++++++++- 2 files changed, 31 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/sisu b/bin/sisu index dd1db245..80eda718 100644 --- a/bin/sisu +++ b/bin/sisu @@ -2,7 +2,19 @@ # coding: utf-8 #SiSU: copyright (C) 1997 - 2011 Ralph Amissah; License GPL, see appended program information #raise "Please, use Ruby1.8 (1.8.4 or later), current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' or RUBY_VERSION > '1.9' -raise "Please, use Ruby1.8.4 or later, current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' +def check_sisu_stable_ruby_version? + rbv_sisu_stable='1.8.7' + if RUBY_VERSION < rbv_sisu_stable + raise "Please, use Ruby#{rbv_sisu_stable} or later, current Ruby #{RUBY_VERSION}" + end +end +def check_sisu_dev_ruby_version? + rbv_sisu_dev='1.9.2' + if RUBY_VERSION < rbv_sisu_dev + raise "Please, use Ruby#{rbv_sisu_dev} or later, current Ruby #{RUBY_VERSION}" + end +end +check_sisu_stable_ruby_version? $VERBOSE=nil $KCODE='u' if RUBY_VERSION < '1.9' argv=$* @@ -10,8 +22,10 @@ SiSU_version_dir=case argv.inspect when /--v2/ 'v2' when /--v3/ + check_sisu_dev_ruby_version? 'v3' when /--dev/ + check_sisu_dev_ruby_version? 'v3' else 'v2' diff --git a/bin/sisu3 b/bin/sisu3 index ca5be5e7..03f41d6e 100644 --- a/bin/sisu3 +++ b/bin/sisu3 @@ -2,7 +2,19 @@ # coding: utf-8 #SiSU: copyright (C) 1997 - 2011 Ralph Amissah; License GPL, see appended program information #raise "Please, use Ruby1.8 (1.8.4 or later), current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' or RUBY_VERSION > '1.9' -raise "Please, use Ruby1.8.4 or later, current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' +def check_sisu_stable_ruby_version? + rbv_sisu_stable='1.8.7' + if RUBY_VERSION < rbv_sisu_stable + raise "Please, use Ruby#{rbv_sisu_stable} or later, current Ruby #{RUBY_VERSION}" + end +end +def check_sisu_dev_ruby_version? + rbv_sisu_dev='1.9.2' + if RUBY_VERSION < rbv_sisu_dev + raise "Please, use Ruby#{rbv_sisu_dev} or later, current Ruby #{RUBY_VERSION}" + end +end +check_sisu_stable_ruby_version? $VERBOSE=nil $KCODE='u' if RUBY_VERSION < '1.9' argv=$* @@ -10,10 +22,13 @@ SiSU_version_dir=case argv.inspect when /--v2/ 'v2' when /--v3/ + check_sisu_dev_ruby_version? 'v3' when /--dev/ + check_sisu_dev_ruby_version? 'v3' else + check_sisu_dev_ruby_version? 'v3' end SiSU_lib="sisu/#{SiSU_version_dir}" -- cgit v1.2.3