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 --- CHANGELOG_v2 | 8 ++++++++ CHANGELOG_v3 | 6 ++++++ bin/sisu | 16 +++++++++++++++- bin/sisu3 | 17 ++++++++++++++++- data/doc/sisu/v2/CHANGELOG | 8 ++++++++ data/doc/sisu/v3/CHANGELOG | 8 ++++++++ data/sisu/v2/v/version.yml | 6 +++--- 7 files changed, 64 insertions(+), 5 deletions(-) diff --git a/CHANGELOG_v2 b/CHANGELOG_v2 index 1e2b6829..790b1b10 100644 --- a/CHANGELOG_v2 +++ b/CHANGELOG_v2 @@ -12,6 +12,14 @@ Reverse Chronological: %% STABLE Branch +%% 2.8.1.orig.tar.gz (2011-03-01:09/2) +http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.1.orig.tar.gz + sisu_2.8.1.orig.tar.gz + sisu_2.8.1-1.dsc + sisu_2.8.1-1.diff.gz + + * make sisu: v2 require >=ruby1.8.7; v3 require >=ruby1.9.2 + %% 2.8.0.orig.tar.gz (2011-02-01:05/2) http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.0-1 http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.0.orig.tar.gz diff --git a/CHANGELOG_v3 b/CHANGELOG_v3 index f6701d4a..1126fa0c 100644 --- a/CHANGELOG_v3 +++ b/CHANGELOG_v3 @@ -20,6 +20,12 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.2.orig.tar.gz sisu_3.0.2-1.debian.tar.gz v3, target ruby1.9.2, ruby1.9.2p180 is ok + 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 + + * make sisu: v3 require >=ruby1.9.2 (v2 require >=ruby1.8.7) + bin/sisu bin/sisu3 modified accordingly * urls, param, two unrelated regex fixes, check 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}" diff --git a/data/doc/sisu/v2/CHANGELOG b/data/doc/sisu/v2/CHANGELOG index ec971aee..5067d8bc 100644 --- a/data/doc/sisu/v2/CHANGELOG +++ b/data/doc/sisu/v2/CHANGELOG @@ -12,6 +12,14 @@ Reverse Chronological: %% STABLE Branch +%% 2.8.1.orig.tar.gz (2011-03-01:09/2) +http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.1.orig.tar.gz + sisu_2.8.1.orig.tar.gz + sisu_2.8.1-1.dsc + sisu_2.8.1-1.diff.gz + + * make sisu: v2 require >=ruby1.8.7; v3 require >=ruby1.9.2 + %% 2.8.0.orig.tar.gz (2011-02-01:05/2) http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.0-1 http://www.jus.uio.no/sisu/pkg/src/sisu_2.8.0.orig.tar.gz diff --git a/data/doc/sisu/v3/CHANGELOG b/data/doc/sisu/v3/CHANGELOG index 5199637d..47599557 100644 --- a/data/doc/sisu/v3/CHANGELOG +++ b/data/doc/sisu/v3/CHANGELOG @@ -20,9 +20,17 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.2.orig.tar.gz sisu_3.0.2-1.debian.tar.gz v3, target ruby1.9.2, ruby1.9.2p180 is ok + 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 + + * make sisu: v3 require >=ruby1.9.2 (v2 require >=ruby1.8.7) + bin/sisu bin/sisu3 modified accordingly * urls, param, two unrelated regex fixes, check + * hub, minor rearranging + %% 3.0.1.orig.tar.gz (2011-02-16:07/3) http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.1-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.1.orig.tar.gz diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index 131e0b6e..8766ef99 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 2.8.0 -:date_stamp: 2011w06/1 -:date: "2011-02-07" +:version: 2.8.1 +:date_stamp: 2011w09/2 +:date: "2011-03-01" :project: SiSU -- cgit v1.2.3