Merge tag 'sisu_7.0.0' into debian/sid

SiSU 7.0.0

1 files changed, 3 insertions, 77 deletions

diff --git a/setup/rbuild b/setup/rbuild
index bd34dea2..32017d4f 100644
--- a/setup/rbuild
+++ b/setup/rbuild
@@ -91,22 +91,13 @@ 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 :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 =>
+task :gem_create =>
   [:gemspecs_create_default_version]
 task :gemc =>
   [:gemspecs_create_default_version]
-task :gemspecscreate =>
-  [:gemspecs_create_default_version]
 #---
 desc "build gem"
 task :gem_build =>
@@ -122,25 +113,13 @@ task :gem5b =>
   [:gem_build_stable]
 task :gem5build =>
   [:gem_build_stable]
-desc "build sisu v_unstable gem"
-task :gem_build_unstable =>
-  [:gem_unstable_build]
-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 :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 :gem6cbi =>
-  [:gem_create_build_install_unstable]
-desc "create, build & install sisu v_stable & v_unstable gem"
+desc "create, build & install sisu gem"
 task :gem_create_build_install =>
   [:gemspecs_create_default_version,:gem_build_,:gem_install_]
 task :gemcbi =>
@@ -158,11 +137,6 @@ task :gem_build_install_stable =>
   [:gem_stable_build,:gem_install_]
 task :gem5bi =>
   [:gem_build_install_stable]
-desc "build & install sisu v_unstable gem"
-task :gem_build_install_unstable =>
-  [:gem_unstable_build,:gem_install_]
-task :gem6bi =>
-  [:gem_build_install_unstable]
 desc "build & install gem"
 task :gem_build_install =>
   [:gem_build,:gem_install_]
@@ -172,9 +146,6 @@ task :gembi =>
 #desc "create sisu v_stable gemspec, manually set next version"
 task :gem5csn =>
   [:gemspecs_stable_create_next_version]
-#desc "create sisu v_unstable gemspec, manually set next version"
-task :gem6csn =>
-  [:gemspecs_unstable_create_next_version]
 #desc "create gemspec, manually set next version"
 task :gemcsn =>
   [:gemspecs_create_next_version]
@@ -186,28 +157,19 @@ task :gembn =>
 #desc "build sisu v_stable gem, manually set next version"
 task :gem5bn =>
   [:gem_stable_build_next_version]
-#desc "build sisu v_unstable gem, manually set 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 :gem5bin =>
   [:gem_stable_build_next_version,:gem_install_next_version]
-#desc "build & install sisu v_unstable gem, manually set 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 :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 :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"
+#desc "create, build & install sisu gem, manually set next version"
 task :gemcbin =>
   [:gemspecs_create_next_version,:gem_build_next_version,:gem_install_next_version]
 #---
@@ -458,91 +420,57 @@ task :setup_vim_ do
 end
 task :gemspec_info do
   Gemspecs.info_stable
-  Gemspecs.info_unstable
 end
 task :gemspecs_stable_create_default_version do
   Gemspecs::Current.create_stable
 end
-task :gemspecs_unstable_create_default_version do
-  Gemspecs::Current.create_unstable
-end
 task :gemspecs_create_default_version do
   Gemspecs::Current.create_stable
-  Gemspecs::Current.create_unstable
 end
 task :gemspecs_stable_create_next_version do
   Gemspecs::Next.create_stable
 end
-task :gemspecs_unstable_create_next_version do
-  Gemspecs::Next.create_unstable
-end
 task :gemspecs_create_next_version do
   Gemspecs::Next.create_stable
-  Gemspecs::Next.create_unstable
 end
 task :gem_stable_build do
   Gemspecs::Current.build_stable
 end
-task :gem_unstable_build do
-  Gemspecs::Current.build_unstable
-end
 task :gem_build_ do
   Gemspecs::Current.build_stable
-  Gemspecs::Current.build_unstable
 end
 task :gem_stable_build_next_version do
   Gemspecs::Next.build_stable
 end
-task :gem_unstable_build_next_version do
-  Gemspecs::Next.build_unstable
-end
 task :gem_build_next_version do
   Gemspecs::Next.build_stable
-  Gemspecs::Next.build_unstable
 end
 task :gem_stable_install do
   Gemspecs::Current.install_stable
 end
-task :gem_unstable_install do
-  Gemspecs::Current.install_unstable
-end
 task :gem_install_ do
   Gemspecs::Current.install_stable
-  Gemspecs::Current.install_unstable
 end
 task :gem_stable_install_next_version do
   Gemspecs::Next.install_stable
 end
-task :gem_unstable_install_next_version do
-  Gemspecs::Next.install_unstable
-end
 task :gem_install_next_version do
   Gemspecs::Next.install_stable
-  Gemspecs::Next.install_unstable
 end
 task :changelog_headers do
   puts '---'
   puts Version_info::Update.changelog_header_stable
-  puts '---'
-  puts Version_info::Update.changelog_header_unstable
 end
 task :sisu_version do
   puts Version_info::Next.setting_stable
-  puts Version_info::Next.setting_unstable
   puts '---'
   puts Version_info::Current.setting_stable[:project]
   puts Version_info::Current.setting_stable[:version]
   puts Version_info::Current.setting_stable[:date]
   puts Version_info::Current.setting_stable[:date_stamp]
-  puts '---'
-  puts Version_info::Current.setting_unstable[:project]
-  puts Version_info::Current.setting_unstable[:version]
-  puts Version_info::Current.setting_unstable[:date]
-  puts Version_info::Current.setting_unstable[:date_stamp]
 end
 task :sisu_version_set do
   Version_info::Update.update_stable
-  Version_info::Update.update_unstable
 end
                                                            #%% post install
                                                            #%% clobber/remove tasks
@@ -604,11 +532,9 @@ task :note_installation do
     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
-    sisu _#{Version_info::Current.setting_unstable[:version]}_ --version
   to uninstall sisu installed via gem
     sudo gem uninstall --verbose sisu
   WOK