Merge tag 'sisu_5.3.0' into debian/sid

SiSU 5.3.0

1 files changed, 35 insertions, 35 deletions

diff --git a/rbuild b/rbuild
index 91870500..fab9770b 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