From 9e82ccef5eeb3228c7c958b049de4cbbf6b0d8a2 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 23 Mar 2011 21:49:33 -0400 Subject: v3, v2: bin/sisu*: v3 development ruby >=1.9.2p180; v2 maintenance ruby >=1.8.7 * bin/sisu* version checks --- bin/sisu | 92 +++++++++++++++++++++++++++++++-------------- bin/sisu3 | 93 +++++++++++++++++++++++++++++++--------------- bin/sisu_termsheet | 80 +++++++++++++++++++++++++++++++-------- bin/sisu_webrick | 80 +++++++++++++++++++++++++++++++-------- data/doc/sisu/CHANGELOG_v2 | 9 ++++- data/doc/sisu/CHANGELOG_v3 | 8 +++- data/sisu/v2/v/version.yml | 6 +-- data/sisu/v3/v/version.yml | 4 +- 8 files changed, 278 insertions(+), 94 deletions(-) diff --git a/bin/sisu b/bin/sisu index 5da17513..ceeebd6c 100644 --- a/bin/sisu +++ b/bin/sisu @@ -1,37 +1,73 @@ #!/usr/bin/env ruby # encoding: 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' -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}" +begin + 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}" + else check_incompatible_ruby_build? + end 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}" + 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}" + else check_incompatible_ruby_build? + end end + def check_incompatible_ruby_build? + require 'rbconfig' + e=Config::CONFIG + if RUBY_VERSION == '1.9.2' \ + and e['PATCHLEVEL'].to_i < 180 + raise < '1.9' -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}" +begin + 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}" + else check_incompatible_ruby_build? + end 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}" + 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}" + else check_incompatible_ruby_build? + end end + def check_incompatible_ruby_build? + require 'rbconfig' + e=Config::CONFIG + if RUBY_VERSION == '1.9.2' \ + and e['PATCHLEVEL'].to_i < 180 + raise < '1.9' -#raise "Please, use Ruby1.8.4 or later, current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' -$VERBOSE=nil -argv=$* -SiSU_version_dir=case argv.inspect -when /--v2/ - 'v2' -when /--v3/ - 'v3' -when /--dev/ - 'v3' -else - 'v2' +begin + 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}" + else check_incompatible_ruby_build? + 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}" + else check_incompatible_ruby_build? + end + end + def check_incompatible_ruby_build? + require 'rbconfig' + e=Config::CONFIG + if RUBY_VERSION == '1.9.2' \ + and e['PATCHLEVEL'].to_i < 180 + raise < '1.9' -#raise "Please, use Ruby1.8.4 or later, current Ruby #{RUBY_VERSION}" if RUBY_VERSION < '1.8.4' -$VERBOSE=nil -argv=$* -SiSU_version_dir=case argv.inspect -when /--v2/ - 'v2' -when /--v3/ - 'v3' -when /--dev/ - 'v3' -else - 'v2' +begin + 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}" + else check_incompatible_ruby_build? + 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}" + else check_incompatible_ruby_build? + end + end + def check_incompatible_ruby_build? + require 'rbconfig' + e=Config::CONFIG + if RUBY_VERSION == '1.9.2' \ + and e['PATCHLEVEL'].to_i < 180 + raise <=1.9.2p180: simplify development of v3 and maintenance of v2 + * bin/sisu demand ruby >=1.9.2p180 (version checks) + * debian/control, dependencies + [enforcing use of ruby >= 1.9.2 reason for version bump, note should at + least be v1.9.2p180, when issues in earlier versions of ruby-1.9.2 were + first observed to be gone] + * vim syntax highlighting, fix typo %% 2.8.2.orig.tar.gz (2011-03-11:10/5) [see 3.0.3] diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3 index 6ae16842..192a830f 100644 --- a/data/doc/sisu/CHANGELOG_v3 +++ b/data/doc/sisu/CHANGELOG_v3 @@ -13,13 +13,19 @@ Reverse Chronological: %% Development branch UNSTABLE v3 branch once stable will supersede & replace current stable v2 branch -%% 3.0.5.orig.tar.gz (2011-03-20:11/7) +%% 3.0.5.orig.tar.gz (2011-03-23:12/3) http://git.sisudoc.org/?p=code/sisu.git;a=log;h=refs/tags/debian/3.0.5-1 http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.5.orig.tar.gz sisu_3.0.5.orig.tar.gz sisu_3.0.5-1.dsc sisu_3.0.5-1.debian.tar.gz + * move to ruby >=1.9.2p180: simplify development of v3 and maintenance of v2 + * bin/sisu demand ruby >=1.9.2p180 (version checks) + * debian/control, dependencies + [note should at least be v1.9.2p180, when issues in earlier versions of + ruby-1.9.2 were first observed to be gone] + * vim syntax highlighting, fix typo %% 3.0.4.orig.tar.gz (2011-03-11:10/5) diff --git a/data/sisu/v2/v/version.yml b/data/sisu/v2/v/version.yml index bb6a21b0..be98c78f 100644 --- a/data/sisu/v2/v/version.yml +++ b/data/sisu/v2/v/version.yml @@ -1,5 +1,5 @@ --- -:version: 2.8.3 -:date_stamp: 2011w11/7 -:date: "2011-03-20" +:version: 2.9.0 +:date_stamp: 2011w12/3 +:date: "2011-03-23" :project: SiSU diff --git a/data/sisu/v3/v/version.yml b/data/sisu/v3/v/version.yml index ef6be262..4baf4911 100644 --- a/data/sisu/v3/v/version.yml +++ b/data/sisu/v3/v/version.yml @@ -1,5 +1,5 @@ --- :version: 3.0.5-beta-rb1.9.2p180 -:date_stamp: 2011w11/7 -:date: "2011-03-20" +:date_stamp: 2011w12/3 +:date: "2011-03-23" :project: SiSU -- cgit v1.2.3