summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRalph Amissah <ralph@amissah.com>2014-01-26 07:14:38 +0000
committerRalph Amissah <ralph@amissah.com>2014-01-26 07:14:40 +0000
commit447e260f46d0e6f45dda336649c64487553bb028 (patch)
tree470f2ead81b71ae35d1ec8a790239ec6f5d13e5f
parentbin/sisu changes to simplify switching to new stable & development branches (diff)
downloadsisu-447e260f46d0e6f45dda336649c64487553bb028.zip
sisu-447e260f46d0e6f45dda336649c64487553bb028.tar.xz
v5 v6: version & changelog (& rakefile), make true on next commit
* next commit: * v4 branch closed * v5 stable branch * v6 development branch opened (copy v5)
l---------CHANGELOGS/CHANGELOG_v61
-rw-r--r--data/doc/sisu/CHANGELOG_v416
-rw-r--r--data/doc/sisu/CHANGELOG_v511
-rw-r--r--data/doc/sisu/CHANGELOG_v630
-rw-r--r--data/sisu/v5/v/version.yml2
-rw-r--r--data/sisu/v6/v/version.yml (renamed from data/sisu/v4/v/version.yml)2
-rw-r--r--rbuild70
7 files changed, 86 insertions, 46 deletions
diff --git a/CHANGELOGS/CHANGELOG_v6 b/CHANGELOGS/CHANGELOG_v6
new file mode 120000
index 0000000..25ababf
--- /dev/null
+++ b/CHANGELOGS/CHANGELOG_v6
@@ -0,0 +1 @@
+../data/doc/sisu/CHANGELOG_v6 \ No newline at end of file
diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4
index cebc237..d9e3c36 100644
--- a/data/doc/sisu/CHANGELOG_v4
+++ b/data/doc/sisu/CHANGELOG_v4
@@ -3,15 +3,9 @@
<http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/doc/sisu/CHANGELOG_v4;hb=HEAD>
* debian/changelog
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=debian/changelog;hb=refs/heads/debian/sid>
+
v5 development branch
-v4 stable branch supersedes & replaces v3 branch
- [v4 branch closure imminent, v5 to become stable, posted with 4.2.20,
- 2014-01-20]
- initial goals:
- * remove/retire "skins"; replace some functionality with headers and/or yml
- file (consider header like syntax for document and site appearance info)
- * bin/sisu $0 make possible to run sisu command on/within project dir tree
- * bin/sisu $*, hub, make possible to specify dir path for markup files
+v4 branch is removed; it is available in sisu < 5.3.0
v3 branch is removed; it is available in sisu < 4.1.0
v2 branch is removed; it is available in sisu =< 3.3.2
@@ -23,6 +17,12 @@ v2 branch is removed; it is available in sisu =< 3.3.2
* data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
* CHANGELOG CHANGELOG_v2 CHANGELOG_v3 README data/doc/sisu/
+ initial goals:
+ * remove/retire "skins"; replace some functionality with headers and/or yml
+ file (consider header like syntax for document and site appearance info)
+ * bin/sisu $0 make possible to run sisu command on/within project dir tree
+ * bin/sisu $*, hub, make possible to specify dir path for markup files
+
%% Reverse Chronological:
%% 4.2.21.orig.tar.xz (2014-01-26:03/7)
diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5
index 5501559..2e835cf 100644
--- a/data/doc/sisu/CHANGELOG_v5
+++ b/data/doc/sisu/CHANGELOG_v5
@@ -3,7 +3,9 @@
<http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/doc/sisu/CHANGELOG_v5;hb=HEAD>
* debian/changelog
<http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=debian/changelog;hb=refs/heads/debian/sid>
-v5 markup rule change, document structure rule introduced:
+
+v5 stable branch (v6 development branch)
+ markup rule change, document structure rule introduced:
[v5 branch to become stable shortly, posted with 5.2.3, 2014-01-20]
* single document root == document title == heading level A~
* adds possible level D~
@@ -29,6 +31,13 @@ v2 branch is removed; it is available in sisu =< 3.3.2
%% Reverse Chronological:
+%% 5.3.0.orig.tar.xz (2014-01-26:03/7)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.3.0
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.3.0-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_5.3.0.orig.tar.xz
+ sisu_5.3.0.orig.tar.xz
+ sisu_5.3.0-1.dsc
+
%% 5.2.4.orig.tar.xz (2014-01-26:03/7)
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.2.4
http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.2.4-1
diff --git a/data/doc/sisu/CHANGELOG_v6 b/data/doc/sisu/CHANGELOG_v6
new file mode 100644
index 0000000..739d251
--- /dev/null
+++ b/data/doc/sisu/CHANGELOG_v6
@@ -0,0 +1,30 @@
+%% SiSU version 6
+ <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=summary>
+ <http://sources.sisudoc.org/?p=code/sisu.git;a=blob;f=data/doc/sisu/CHANGELOG_v6;hb=HEAD>
+* debian/changelog
+ <http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=debian/changelog;hb=refs/heads/debian/sid>
+
+v6 branch for development and testing prior to roll-into v5, to provide v5 with
+ some insulation
+v5 stable branch
+v4 branch is removed; it is available in sisu < 4.2.20
+v3 branch is removed; it is available in sisu < 4.1.0
+v2 branch is removed; it is available in sisu =< 3.3.2
+
+* homepage at: <http://www.jus.uio.no/sisu>
+* <http://www.jus.uio.no/sisu/SiSU/download>
+* <http://www.jus.uio.no/sisu/SiSU/changelog>
+* <http://sisudoc.org/sisu/sisu_manual>
+* data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_manual.ssm
+* data/doc/sisu/sisu_markup_samples/sisu_manual/sisu_download.ssi
+* CHANGELOG CHANGELOG_v2 CHANGELOG_v3 README data/doc/sisu/
+
+%% Reverse Chronological:
+
+%% 6.0.0.orig.tar.xz (2014-01-26:03/7)
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_6.0.0
+http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_6.0.0-1
+http://www.jus.uio.no/sisu/pkg/src/sisu_6.0.0.orig.tar.xz
+ sisu_6.0.0.orig.tar.xz
+ sisu_6.0.0-1.dsc
+
diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml
index 6155e97..61977c1 100644
--- a/data/sisu/v5/v/version.yml
+++ b/data/sisu/v5/v/version.yml
@@ -1,5 +1,5 @@
---
:project: SiSU
-:version: 5.2.4
+:version: 5.3.0
:date_stamp: 2014w03/7
:date: "2014-01-26"
diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v6/v/version.yml
index 961c340..fef9625 100644
--- a/data/sisu/v4/v/version.yml
+++ b/data/sisu/v6/v/version.yml
@@ -1,5 +1,5 @@
---
:project: SiSU
-:version: 4.2.21
+:version: 6.0.0
:date_stamp: 2014w03/7
:date: "2014-01-26"
diff --git a/rbuild b/rbuild
index 9187050..fab9770 100644
--- a/rbuild
+++ b/rbuild
@@ -37,13 +37,13 @@
#require 'mkmf'
#create_makefile("sisu")
#% manual settings, edit/update as required (note current default settings are obtained from sisu version yml file)
-SiSU_version_next_stable = '4.2.21'
-SiSU_version_next_unstable = '5.2.4'
+SiSU_version_next_stable = '5.3.0'
+SiSU_version_next_unstable = '6.0.0'
#% rake file
-SiSU_version_generic_next_stable = '4.2.x'
-SiSU_version_generic_next_unstable = '5.2.x'
-SiSU_version_dir_stable = 'v4'
-SiSU_version_dir_unstable = 'v5'
+SiSU_version_generic_next_stable = '5.3.x'
+SiSU_version_generic_next_unstable = '6.0.x'
+SiSU_version_dir_stable = 'v5'
+SiSU_version_dir_unstable = 'v6'
require 'find'
require 'fileutils'
#require 'ftools'
@@ -509,12 +509,12 @@ desc "check gemspec info"
task :gem_spec => [:gemspec_info]
desc "create sisu v_stable gemspec"
task :gem_create_spec_stable => [:gemspecs_stable_create_default_version]
- task :gem4cs => [:gem_create_spec_stable]
- task :gem4createspecs => [:gemspecs_stable_create_default_version]
+ task :gem5cs => [:gem_create_spec_stable]
+ task :gem5createspecs => [:gemspecs_stable_create_default_version]
desc "create sisu v_unstable gemspec"
task :gem_create_spec_unstable => [:gemspecs_unstable_create_default_version]
- task :gem5cs => [:gem_create_spec_unstable]
- task :gem5createspecs => [:gemspecs_unstable_create_default_version]
+ task :gem6cs => [:gem_create_spec_unstable]
+ task :gem6createspecs => [:gemspecs_unstable_create_default_version]
desc "create gemspec"
task :gem_create_spec => [:gemspecs_create_default_version]
task :gemcs => [:gemspecs_create_default_version]
@@ -527,19 +527,19 @@ desc "build gem"
task :gembuild => [:gem_build]
desc "build sisu v_stable gem"
task :gem_build_stable => [:gem_stable_build]
- task :gem4b => [:gem_build_stable]
- task :gem4build => [:gem_build_stable]
+ task :gem5b => [:gem_build_stable]
+ task :gem5build => [:gem_build_stable]
desc "build sisu v_unstable gem"
task :gem_build_unstable => [:gem_unstable_build]
- task :gem5b => [:gem_build_unstable]
- task :gem5build => [:gem_build_unstable]
+ task :gem6b => [:gem_build_unstable]
+ task :gem6build => [:gem_build_unstable]
#---
desc "create, build & install sisu v_stable gem"
task :gem_create_build_install_stable => [:gemspecs_stable_create_default_version,:gem_stable_build,:gem_stable_install]
- task :gem4cbi => [:gem_create_build_install_stable]
+ task :gem5cbi => [:gem_create_build_install_stable]
desc "create, build & install sisu v_unstable gem"
task :gem_create_build_install_unstable => [:gemspecs_unstable_create_default_version,:gem_unstable_build,:gem_unstable_install]
- task :gem5cbi => [:gem_create_build_install_unstable]
+ task :gem6cbi => [:gem_create_build_install_unstable]
desc "create, build & install sisu v_stable & v_unstable gem"
task :gem_create_build_install => [:gemspecs_create_default_version,:gem_build_,:gem_install_]
task :gemcbi => [:gem_create_build_install]
@@ -550,39 +550,39 @@ desc "install gem"
task :geminstall => [:gem_install]
desc "build & install sisu v_stable gem"
task :gem_build_install_stable => [:gem_stable_build,:gem_install_]
- task :gem4bi => [:gem_build_install_stable]
+ task :gem5bi => [:gem_build_install_stable]
desc "build & install sisu v_unstable gem"
task :gem_build_install_unstable => [:gem_unstable_build,:gem_install_]
- task :gem5bi => [:gem_build_install_unstable]
+ task :gem6bi => [:gem_build_install_unstable]
desc "build & install gem"
task :gem_build_install => [:gem_build,:gem_install_]
task :gembi => [:gem_build_install]
#-- manually set next version
#desc "create sisu v_stable gemspec, manually set next version"
- task :gem4csn => [:gemspecs_stable_create_next_version]
+ task :gem5csn => [:gemspecs_stable_create_next_version]
#desc "create sisu v_unstable gemspec, manually set next version"
- task :gem5csn => [:gemspecs_unstable_create_next_version]
+ task :gem6csn => [:gemspecs_unstable_create_next_version]
#desc "create gemspec, manually set next version"
task :gemcsn => [:gemspecs_create_next_version]
task :gemcn => [:gemspecs_create_next_version]
#desc "build gem, manually set next version"
task :gembn => [:gem_build_next_version]
#desc "build sisu v_stable gem, manually set next version"
- task :gem4bn => [:gem_stable_build_next_version]
+ task :gem5bn => [:gem_stable_build_next_version]
#desc "build sisu v_unstable gem, manually set next version"
- task :gem5bn => [:gem_unstable_build_next_version]
+ task :gem6bn => [:gem_unstable_build_next_version]
#desc "install gem, manually set next version"
task :gemin => [:gem_install_next_version]
#desc "build & install sisu v_stable gem, manually set next version"
- task :gem4bin => [:gem_stable_build_next_version,:gem_install_next_version]
+ task :gem5bin => [:gem_stable_build_next_version,:gem_install_next_version]
#desc "build & install sisu v_unstable gem, manually set next version"
- task :gem5bin => [:gem_unstable_build_next_version,:gem_install_next_version]
+ task :gem6bin => [:gem_unstable_build_next_version,:gem_install_next_version]
#desc "build & install gem, manually set next version"
task :gembin => [:gem_build_next_version,:gem_install_next_version]
#desc "create, build & install sisu v_stable gem, manually set next version"
- task :gem4cbin => [:gemspecs_stable_create_next_version,:gem_stable_build_next_version,:gem_stable_install_next_version]
+ task :gem5cbin => [:gemspecs_stable_create_next_version,:gem_stable_build_next_version,:gem_stable_install_next_version]
#desc "create, build & install sisu v_unstable gem, manually set next version"
- task :gem5cbin => [:gemspecs_unstable_create_next_version,:gem_unstable_build_next_version,:gem_unstable_install_next_version]
+ task :gem6cbin => [:gemspecs_unstable_create_next_version,:gem_unstable_build_next_version,:gem_unstable_install_next_version]
#desc "create, build & install sisu v_stable & v_unstable gem, manually set next version"
task :gemcbin => [:gemspecs_create_next_version,:gem_build_next_version,:gem_install_next_version]
#---
@@ -880,10 +880,10 @@ task :note_installation do
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)
- separate gems are made/installed for sisu v4 & sisu v5 contained in source:
- 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)
+ rake gem_create_build_install # (to build and install sisu v5 & sisu v6, alias gemcbi)
+ separate gems are made/installed for sisu v5 & sisu v6 contained in source:
+ rake gem_create_build_install_stable # (to build and install sisu v5, alias gem5cbi)
+ rake gem_create_build_install_unstable # (to build and install sisu v6, alias gem6cbi)
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
@@ -900,11 +900,11 @@ task :note_developer do
sisuversion
sisuversionset
- gemcsn gem4csn gem5csn
- gembn gem4bn gem5bn
- gemin gem4in gem5in
- gembin gem4bin gem5bin
- gemcbin gem4cbin gem5cbin
+ gemcsn gem5csn gem6csn
+ gembn gem5bn gem6bn
+ gemin gem5in gem6in
+ gembin gem5bin gem6bin
+ gemcbin gem5cbin gem6cbin
WOK
end
#%% help & system info