From 40d792e18c680971209a8ba196d4015e82e9e41e Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 12 Dec 2012 15:46:57 -0500 Subject: debian/bin/sisu update sisu & clean/remove extra files --- debian/bin/sisu | 118 +++++++++++++++++++++++++++++----- debian/bin/sisu2 | 137 --------------------------------------- debian/bin/sisu3 | 137 --------------------------------------- debian/bin/sisu_termsheet | 159 ---------------------------------------------- debian/bin/sisu_webrick | 146 ------------------------------------------ 5 files changed, 101 insertions(+), 596 deletions(-) delete mode 100644 debian/bin/sisu2 delete mode 100644 debian/bin/sisu3 delete mode 100644 debian/bin/sisu_termsheet delete mode 100644 debian/bin/sisu_webrick diff --git a/debian/bin/sisu b/debian/bin/sisu index 3b31da19..fcf866a8 100644 --- a/debian/bin/sisu +++ b/debian/bin/sisu @@ -41,25 +41,113 @@ WOK rbv_sisu_dev='1.9.2' ruby_version_ok?(rbv_sisu_dev) end + def require_hub_path(sisu_path_specified_lib_) + sisu_path_lib=if sisu_path_specified_lib_ \ + && FileTest.file?("#{sisu_path_specified_lib_}/#{SiSU_lib}/hub.rb") + "#{sisu_path_specified_lib_}/#{SiSU_lib}" + else + SiSU_lib + end + end +#% sisu branch $VERBOSE=nil $KCODE='u' if RUBY_VERSION < '1.9' argv=$* - SiSU_version_dir=case argv.inspect - when /--v2/ - check_sisu_legacy_ruby_version? - 'v2' - when /--v3/ - check_sisu_stable_ruby_version? - 'v3' - when /--dev/ - check_sisu_dev_ruby_version? - 'v3' #'v3dv' + SiSU_called_from_directory=Dir.pwd + if $0 !~/\bsisu[34]$/ + SiSU_version_dir=case argv.inspect + when /"(?:--v3)"/ + check_sisu_stable_ruby_version? + 'v3' + when /"(?:--v4)"/ + check_sisu_stable_ruby_version? + 'v4' + when /"(?:--dev)"/ + check_sisu_dev_ruby_version? + 'v4' + else + check_sisu_stable_ruby_version? + 'v4' + end else - check_sisu_stable_ruby_version? - 'v3' + SiSU_version_dir=case $0 + when /\bsisu3$/ + check_sisu_stable_ruby_version? + 'v3' + when /\bsisu4$/ + check_sisu_stable_ruby_version? + 'v4' + else + check_sisu_stable_ruby_version? + 'v4' + end end +#% $0 + e=Config::CONFIG SiSU_lib="sisu/#{SiSU_version_dir}" - require "#{SiSU_lib}/hub" + sisu_path_specified_lib_=if $0 =~ /^#{e['bindir']}\/sisu[34]?$/ + nil + elsif $0 !~ /^#{e['bindir']}\/sisu[34]?$/ \ + && $0 =~/bin\/sisu[34]?$/ \ + && FileTest.file?($0) + $0.sub(/bin\/sisu[34]?$/,'lib'). + sub(/^lib$/,"#{Dir.pwd}/lib") + elsif $0 !~ /^#{e['bindir']}\/sisu[34]?$/ \ + && $0 =~/^sisu[34]?$/ \ + && FileTest.file?($0) + $0.sub(/sisu[34]?$/,'../lib') + #bug, relative path does not work for sisu version information + else + nil + end + SiSU_path_specified_Version_=if sisu_path_specified_lib_ + sisu_path_specified_lib_.sub(/\/lib/, + "/data/sisu/#{SiSU_version_dir}/v/version.yml") + else + nil + end + SiSU_path_lib="#{require_hub_path(sisu_path_specified_lib_)}" +#% $* + require "#{SiSU_path_lib}/hub" + lng_lst = %w[am bg bn br ca cs cy da de el en eo es et eu fi fr ga gl he hi hr hy ia is it la lo lt lv ml mr nl nn no oc pl pt pt_BR ro ru sa se sk sl sq sr sv ta te th tk tr uk ur us vi] + lng_lst_rgx=lng_lst.join('|') + argv_sub_files={} + argv_sub_mods=[] + argv.each do |x| + if x =~/^-+/ + argv_sub_mods << x + elsif x =~/\.ss[tm]/ + if x =~/\// + markup_path,markup_file =(/(\S+\/)((?:#{lng_lst_rgx})?[^\/]+)/).match(x)[1,2] + if not argv_sub_files[markup_path] + argv_sub_files[markup_path]=[] + end + argv_sub_files[markup_path] << markup_file + else + if not argv_sub_files['./'] + argv_sub_files['./']=[] + end + argv_sub_files['./'] << x + end + end + end + if argv_sub_files.length > 0 + argv_sub_files.each_pair do |markup_dir,markup_file| + $sisu_document_markup_directory=markup_dir.gsub(/\/$/,'') + argv_sub=argv_sub_mods + markup_file + if FileTest.directory?(markup_dir) + system("cd #{markup_dir}") + Dir.chdir(markup_dir) + SiSU::HubMaster.new(argv_sub) + Dir.chdir(SiSU_called_from_directory) + system("cd #{SiSU_called_from_directory}") + else p "Error directory specified #{markup_dir} not found" + end + end + else + $sisu_document_markup_directory=Dir.pwd.gsub(/\/$/,'') + SiSU::HubMaster.new(argv) + end rescue STDERR.puts 'ERROR' STDERR.puts $! @@ -78,10 +166,6 @@ rescue system RUBYPATH: ${RUBYPATH} system RUBYLIB: ${RUBYLIB} "}) - puts %{ - On a Debian system to switch the version of ruby to >=1.9.2 see: - http://wiki.debian.org/Ruby - } end __END__ diff --git a/debian/bin/sisu2 b/debian/bin/sisu2 deleted file mode 100644 index 9c52163c..00000000 --- a/debian/bin/sisu2 +++ /dev/null @@ -1,137 +0,0 @@ -#! /usr/bin/ruby1.9.1 -# 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 <=1.9.2 see: - http://wiki.debian.org/Ruby - } -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, 2012 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 . - - If you have Internet connection, the latest version of the GPL should be - available at these locations: - - - - - - * SiSU uses: - * Standard SiSU markup syntax, - * Standard SiSU meta-markup syntax, and the - * Standard SiSU object citation numbering and system - - * Hompages: - - - - * Download: - - - * Ralph Amissah - - diff --git a/debian/bin/sisu3 b/debian/bin/sisu3 deleted file mode 100644 index 3b31da19..00000000 --- a/debian/bin/sisu3 +++ /dev/null @@ -1,137 +0,0 @@ -#! /usr/bin/ruby1.9.1 -# encoding: utf-8 -#SiSU: copyright (C) 1997 - 2012 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 <=1.9.2 see: - http://wiki.debian.org/Ruby - } -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, 2012 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 . - - If you have Internet connection, the latest version of the GPL should be - available at these locations: - - - - - - * SiSU uses: - * Standard SiSU markup syntax, - * Standard SiSU meta-markup syntax, and the - * Standard SiSU object citation numbering and system - - * Hompages: - - - - * Download: - - - * Ralph Amissah - - diff --git a/debian/bin/sisu_termsheet b/debian/bin/sisu_termsheet deleted file mode 100644 index 7a3b0425..00000000 --- a/debian/bin/sisu_termsheet +++ /dev/null @@ -1,159 +0,0 @@ -#! /usr/bin/ruby1.9.1 -# encoding: utf-8 -#SiSU: copyright (C) 1997 - 2012 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 <. - - If you have Internet connection, the latest version of the GPL should be - available at these locations: - - - - - - * SiSU uses: - * Standard SiSU markup syntax, - * Standard SiSU meta-markup syntax, and the - * Standard SiSU object citation numbering and system - - * Hompages: - - - - * Download: - - - * Ralph Amissah - - - - ** Description: SiSU information Structuring Universe, specialised - pre-processing wrapper - - sisu -t x_bank.and.* - e.g. sisu -t x_bank.and.*.termsheet.rb - e.g. sisu_termsheet.rb -t x_bank.and.c*.termsheet.rb - program calls upon termsheet file with extension termsheet.rb - termsheet.rb calls upon relevant standard form files (to be used) with extension .sForm.rb - there is also a standard_terms.rb file - with terms/details that are constant - the file produced is named after the termsheet.rb with that extension replaced with .er30 - from there scribbler.rb is called upon its usual metaVerse html and pdf creation - ! :-) - to test run - termsheet.rb -f dev.export.import.trade.facility.termsheet.rb - the term sheet calls the standard form or template that is to be run against it. diff --git a/debian/bin/sisu_webrick b/debian/bin/sisu_webrick deleted file mode 100644 index b678d029..00000000 --- a/debian/bin/sisu_webrick +++ /dev/null @@ -1,146 +0,0 @@ -#! /usr/bin/ruby1.9.1 -# encoding: utf-8 -#SiSU: copyright (C) 1997 - 2012 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 <. - - If you have Internet connection, the latest version of the GPL should be - available at these locations: - - - - - - * SiSU uses: - * Standard SiSU markup syntax, - * Standard SiSU meta-markup syntax, and the - * Standard SiSU object citation numbering and system - - * Hompages: - - - - * Download: - - - * Ralph Amissah - - - - ** Description: webrick share - note sisu by default does not link with file - suffixes, see man pages for options -- cgit v1.2.3