From 0e969552429301f29a1d736c1a388b5f79347694 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 17 Jan 2014 21:24:21 -0500 Subject: v4 v5: version & changelog (& rakefile) --- data/doc/sisu/CHANGELOG_v4 | 7 +++++++ data/doc/sisu/CHANGELOG_v5 | 7 +++++++ data/sisu/v4/v/version.yml | 6 +++--- data/sisu/v5/v/version.yml | 6 +++--- rbuild | 14 ++++++++++---- 5 files changed, 30 insertions(+), 10 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 6a96d259..4843b82b 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -23,6 +23,13 @@ v2 branch is removed; it is available in sisu =< 3.3.2 %% Reverse Chronological: +%% 4.2.19.orig.tar.xz (2014-01-17:02/5) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.19 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.19-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.19.orig.tar.xz + sisu_4.2.19.orig.tar.xz + sisu_4.2.19-1.dsc + %% 4.2.18.orig.tar.xz (2014-01-12:01/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.18 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.18-1 diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 782fae6a..1815f5ce 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -26,6 +26,13 @@ v2 branch is removed; it is available in sisu =< 3.3.2 %% Reverse Chronological: +%% 5.2.2.orig.tar.xz (2014-01-17:02/5) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.2.2 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.2.2-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_5.2.2.orig.tar.xz + sisu_5.2.2.orig.tar.xz + sisu_5.2.2-1.dsc + %% 5.2.1.orig.tar.xz (2014-01-12:01/7) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.2.1 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.2.1-1 diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml index d2917af6..faa3d64c 100644 --- a/data/sisu/v4/v/version.yml +++ b/data/sisu/v4/v/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 4.2.18 -:date_stamp: 2014w01/7 -:date: "2014-01-12" +:version: 4.2.19 +:date_stamp: 2014w02/5 +:date: "2014-01-17" diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml index 4133707d..073b83d3 100644 --- a/data/sisu/v5/v/version.yml +++ b/data/sisu/v5/v/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 5.2.1 -:date_stamp: 2014w01/7 -:date: "2014-01-12" +:version: 5.2.2 +:date_stamp: 2014w02/5 +:date: "2014-01-17" diff --git a/rbuild b/rbuild index 4f113953..6b8e82c5 100644 --- a/rbuild +++ b/rbuild @@ -872,11 +872,12 @@ task :note_sources do end task :note_installation do puts <<-WOK + alternative 0: distribution install, rather than this Rakefile + a distribution install pulls in the many dependencies used by sisu after + initial processing to generate and store output, significant amongst these are + XeTeX & databases (sqlite3 and postgresql) - alternative 1: basic sisu install, as root: - rake setup - - alternative 2: gem install, you need to: + alternative 1: gem install, you need to: create the gemspec; build the gem (from the gemspec); install the gem which can be done with the single command: rake gem_create_build_install # (to build and install sisu v4 & sisu v5, alias gemcbi) @@ -884,6 +885,11 @@ task :note_installation do rake gem_create_build_install_stable # (to build and install sisu v4, alias gem4cbi) rake gem_create_build_install_unstable # (to build and install sisu v5, alias gem5cbi) for individual steps (create, build, install) see rake options, rake -T + to specify sisu version for sisu installed via gem + sisu _#{Version_info::Current.setting_stable[:version]}_ --version + sisu _#{Version_info::Current.setting_unstable[:version]}_ --version + to uninstall sisu installed via gem + sudo gem uninstall --verbose sisu WOK end task :note_developer do -- cgit v1.2.3 From 2dff4382b8c7a62be7387c9438b69df4066fee95 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 17 Jan 2014 21:31:25 -0500 Subject: README clean info related to unsupported --help option --- README | 42 ------------------------------------------ 1 file changed, 42 deletions(-) diff --git a/README b/README index 4fd0f772..624f370c 100644 --- a/README +++ b/README @@ -284,10 +284,6 @@ such as tetex-extra are not taken care of for you. -For a list of alternative actions you may type: - ruby ./sisu-install help - ruby ./sisu-install -T - Dependencies -------------- Once installed see 'man 8 sisu' for some information on additional programs @@ -371,15 +367,6 @@ additional markup samples in For help man sisu -or - sisu --help - -e.g. -sisu --help env -for the way sisu "sees/maps" your system -sisu --help commands -for list of commands and so on - %% Configuration files --------------- @@ -421,10 +408,6 @@ file, named with the suffix .sst, or .ssm Marked up SiSU documents are usually kept in a sub-directory of your choosing -use the interactive help and man pages - sisu --help - man sisu - %% Help --------------- @@ -435,29 +418,9 @@ interactive help described below, or man page: man 8 sisu 'man sisu_markup-samples' [if the sisu-markup-samples package is also installed] -Once installed an interactive help is available typing 'sisu' (without) any -flags, and select an option: - - sisu - -alternatively, you could type e.g. - sisu --help commands - sisu --help env - sisu --help headers - sisu --help markup - sisu --help headings - etc. - -for questions about mappings, output paths etc. - sisu --help env - sisu --help path - sisu --help directory - %% Directory Structure --------------- Once installed, type: - sisu --help env -or sisu -V %% Configuration File @@ -475,11 +438,6 @@ See man pages. man 8 sisu -Once installed there is some information on SiSU Markup in its help: - sisu --help markup -and - sisu --help headers - Sample marked up document are provided with the download tarball in the directory: ./data/doc/sisu/v2/sisu_markup_samples/dfsg -- cgit v1.2.3 From c00345b2e7cf7041a01a84e51e77ce88dceaa6e1 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 17 Jan 2014 21:35:12 -0500 Subject: bin/sisu experimentation * start preparing for ruby changes * work on fix for bug related to gem path & system installed sisu --- bin/sisu | 70 ++++++++++++---------------------------------- data/doc/sisu/CHANGELOG_v4 | 4 +++ data/doc/sisu/CHANGELOG_v5 | 4 +++ lib/sisu/v4/sysenv.rb | 21 ++++++++------ lib/sisu/v5/sysenv.rb | 23 +++++++++------ 5 files changed, 53 insertions(+), 69 deletions(-) diff --git a/bin/sisu b/bin/sisu index 102d10d1..ad98138b 100644 --- a/bin/sisu +++ b/bin/sisu @@ -2,45 +2,6 @@ # encoding: utf-8 #SiSU: copyright (C) 1997 - 2014 Ralph Amissah; License GPL 3, 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 <