v2 v3: bin/sisu2 introduced (complement bin/sisu3), currently same as bin/sisu

* later switch bin/sisu to bin/sisu3
* consider using update-alternatives

3 files changed, 137 insertions, 0 deletions

diff --git a/bin/sisu2 b/bin/sisu2
new file mode 100644
index 00000000..9facda87
--- /dev/null
+++ b/bin/sisu2
@@ -0,0 +1,131 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+#SiSU: copyright (C) 1997 - 2011 Ralph Amissah; License GPL, see appended program information
+begin
+  def ruby_version_ok?(base_version)
+    @v ||=RUBY_VERSION.scan(/\d+/)
+    vb=base_version.scan(/\d+/)
+    if @v[0].to_i <  vb[0].to_i \
+    or @v[0].to_i == vb[0].to_i \
+    && @v[1].to_i <  vb[1].to_i \
+    or @v[0].to_i == vb[0].to_i \
+    && @v[1].to_i == vb[1].to_i \
+    && @v[1].to_i <  vb[2].to_i
+      raise "Please, use Ruby#{vb} 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' \
+    && e['PATCHLEVEL'].to_i < 180
+      raise <<WOK
+There are known issues with early versions of ruby1.9.2.
+Please, use Ruby 1.9.2p180 or later,
+current version #{e['RUBY_PROGRAM_VERSION']}p#{e['PATCHLEVEL']}
+#{%x{ruby -v}.strip.to_s}
+
+WOK
+    end
+  end
+  def check_sisu_stable_ruby_version?
+    rbv_sisu_stable='1.8.7'
+    ruby_version_ok?(rbv_sisu_stable)
+  end
+  def check_sisu_dev_ruby_version?
+    rbv_sisu_dev='1.9.2'
+    ruby_version_ok?(rbv_sisu_dev)
+  end
+  $VERBOSE=nil
+  $KCODE='u' if RUBY_VERSION < '1.9'
+  argv=$*
+  SiSU_version_dir=case argv.inspect
+  when /--v2/
+    check_sisu_stable_ruby_version?
+    'v2'
+  when /--v3/
+    check_sisu_dev_ruby_version?
+    'v3'
+  when /--dev/
+    check_sisu_dev_ruby_version?
+    'v3'
+  else
+    check_sisu_stable_ruby_version?
+    'v2'
+  end
+  SiSU_lib="sisu/#{SiSU_version_dir}"
+  require "#{SiSU_lib}/hub"
+rescue
+  STDERR.puts 'ERROR'
+  STDERR.puts $!
+  STDERR.puts $@
+  require 'rbconfig'
+  e=Config::CONFIG
+  puts %{
+                   #{%x{ruby -v}.strip.to_s}
+                   #{RUBY_VERSION}
+    ruby version:  #{e['RUBY_PROGRAM_VERSION']}p#{e['PATCHLEVEL']}
+    ruby named:    #{e['ruby_version']}
+    rubylib:       #{e['rubylibdir']}
+    rubylib local: #{e['sitelibdir']}
+  }
+  system(%{echo "
+    system RUBYPATH: ${RUBYPATH}
+    system RUBYLIB: ${RUBYLIB}
+  "})
+end
+__END__
+
+ * Name: SiSU
+
+ * Description: a framework for document structuring, publishing and search
+
+ * Author: Ralph Amissah
+
+ * Copyright: (C) 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
+   2007, 2008, 2009, 2010, 2011 Ralph Amissah All Rights Reserved.
+
+ * License: GPL 3 or later:
+
+   SiSU, a framework for document structuring, publishing and search
+
+   Copyright (C) Ralph Amissah
+
+   This program is free software: you can redistribute it and/or modify it
+   under the terms of the GNU General Public License as published by the Free
+   Software Foundation, either version 3 of the License, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful, but WITHOUT
+   ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+   FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+   more details.
+
+   You should have received a copy of the GNU General Public License along with
+   this program. If not, see <http://www.gnu.org/licenses/>.
+
+   If you have Internet connection, the latest version of the GPL should be
+   available at these locations:
+   <http://www.fsf.org/licensing/licenses/gpl.html>
+   <http://www.gnu.org/licenses/gpl.html>
+
+   <http://www.jus.uio.no/sisu/gpl.fsf/toc.html>
+   <http://www.jus.uio.no/sisu/gpl.fsf/doc.html>
+   <http://www.jus.uio.no/sisu/gpl.fsf/plain.txt>
+
+ * SiSU uses:
+   * Standard SiSU markup syntax,
+   * Standard SiSU meta-markup syntax, and the
+   * Standard SiSU object citation numbering and system
+
+ * Hompages:
+   <http://www.jus.uio.no/sisu>
+   <http://www.sisudoc.org>
+
+ * Download:
+   <http://www.jus.uio.no/sisu/SiSU/download.html>
+
+ * Ralph Amissah
+   <ralph@amissah.com>
+   <ralph.amissah@gmail.com>
diff --git a/data/doc/sisu/CHANGELOG_v2 b/data/doc/sisu/CHANGELOG_v2
index a8fe889b..e4da5529 100644
--- a/data/doc/sisu/CHANGELOG_v2
+++ b/data/doc/sisu/CHANGELOG_v2
@@ -15,6 +15,9 @@ Reverse Chronological:
 %% 2.9.4.orig.tar.gz (2011-05-15:19/7) [see 3.0.9]
 http://git.sisudoc.org/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/3.0.9-1
 
+  * bin/sisu2 introduced (to complement bin/sisu3), currently same as bin/sisu
+    (later switch bin/sisu to bin/sisu3; consider using update-alternatives)
+
   * copyright file, softlink, make more visible in tarball and update
     * sisu-mode.el assigned to FSF (GNU EMACS)
 
diff --git a/data/doc/sisu/CHANGELOG_v3 b/data/doc/sisu/CHANGELOG_v3
index 38d08d3d..417a4804 100644
--- a/data/doc/sisu/CHANGELOG_v3
+++ b/data/doc/sisu/CHANGELOG_v3
@@ -20,6 +20,9 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_3.0.9.orig.tar.gz
   sisu_3.0.9-1.dsc
   sisu_3.0.9-1.debian.tar.gz
 
+  * bin/sisu2 introduced (to complement bin/sisu3), currently same as bin/sisu
+    (later switch bin/sisu to bin/sisu3; consider using update-alternatives)
+
   * copyright file, softlink, make more visible in tarball and update
     * sisu-mode.el assigned to FSF (GNU EMACS)