From 67ff4a2c5fe9f8521c4b408f02327d023d1c64c3 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 15 Dec 2013 20:52:24 -0500 Subject: v4 v5: version & changelog * along with date correction for occurrence of disk crash, which happened a week later than recorded, and in between previous releases. --- data/doc/sisu/CHANGELOG_v4 | 7 +++++++ data/doc/sisu/CHANGELOG_v5 | 9 ++++++++- data/sisu/v4/v/version.yml | 6 +++--- data/sisu/v5/v/version.yml | 6 +++--- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index d06784f2..52e1dd4d 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.16.orig.tar.xz (2013-12-15:49/7) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.16 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.16-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.16.orig.tar.xz + sisu_4.2.16.orig.tar.xz + sisu_4.2.16-1.dsc + %% 4.2.15.orig.tar.xz (2013-12-09:49/1) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.15 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.15-1 diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index fe1be01a..563ac0d3 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -23,6 +23,13 @@ v2 branch is removed; it is available in sisu =< 3.3.2 %% Reverse Chronological: +%% 5.1.3.orig.tar.xz (2013-12-15:49/7) +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.1.3 +http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.1.3-1 +http://www.jus.uio.no/sisu/pkg/src/sisu_5.1.3.orig.tar.xz + sisu_5.1.3.orig.tar.xz + sisu_5.1.3-1.dsc + %% 5.1.2.orig.tar.xz (2013-12-09:49/1) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.1.2 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.1.2-1 @@ -35,7 +42,7 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.1.2.orig.tar.xz * docbook, structure, a fix (construction zone: structure okish; docbook generated not usable) -[NOTE disk crash (2013-11-28), fairly good but incomplete backup affecting work] +[NOTE disk crash (2013-12-05), fairly good but incomplete backup affecting work] %% 5.1.1.orig.tar.xz (2013-12-03:48/2) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.1.1 diff --git a/data/sisu/v4/v/version.yml b/data/sisu/v4/v/version.yml index e44ccbc6..86ef1a8e 100644 --- a/data/sisu/v4/v/version.yml +++ b/data/sisu/v4/v/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 4.2.15 -:date_stamp: 2013w49/1 -:date: "2013-12-09" +:version: 4.2.16 +:date_stamp: 2013w49/7 +:date: "2013-12-15" diff --git a/data/sisu/v5/v/version.yml b/data/sisu/v5/v/version.yml index 9ccb687f..be3c9651 100644 --- a/data/sisu/v5/v/version.yml +++ b/data/sisu/v5/v/version.yml @@ -1,5 +1,5 @@ --- :project: SiSU -:version: 5.1.2 -:date_stamp: 2013w49/1 -:date: "2013-12-09" +:version: 5.1.3 +:date_stamp: 2013w49/7 +:date: "2013-12-15" -- cgit v1.2.3 From 30e03850e641483e371846900d962dbf474d5bc4 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Sun, 15 Dec 2013 20:58:03 -0500 Subject: v4 v5: Rakefile, (installer), reduce actions --- data/doc/sisu/CHANGELOG_v4 | 2 + data/doc/sisu/CHANGELOG_v5 | 2 + rbuild | 415 +++++++++++++++++++++++++-------------------- 3 files changed, 238 insertions(+), 181 deletions(-) diff --git a/data/doc/sisu/CHANGELOG_v4 b/data/doc/sisu/CHANGELOG_v4 index 52e1dd4d..49519d02 100644 --- a/data/doc/sisu/CHANGELOG_v4 +++ b/data/doc/sisu/CHANGELOG_v4 @@ -30,6 +30,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_4.2.16.orig.tar.xz sisu_4.2.16.orig.tar.xz sisu_4.2.16-1.dsc +* Rakefile, (installer), reduce actions + %% 4.2.15.orig.tar.xz (2013-12-09:49/1) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_4.2.15 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_4.2.15-1 diff --git a/data/doc/sisu/CHANGELOG_v5 b/data/doc/sisu/CHANGELOG_v5 index 563ac0d3..119d9194 100644 --- a/data/doc/sisu/CHANGELOG_v5 +++ b/data/doc/sisu/CHANGELOG_v5 @@ -30,6 +30,8 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_5.1.3.orig.tar.xz sisu_5.1.3.orig.tar.xz sisu_5.1.3-1.dsc +* Rakefile, (installer), reduce actions + %% 5.1.2.orig.tar.xz (2013-12-09:49/1) http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/sisu_5.1.2 http://sources.sisudoc.org/gitweb/?p=code/sisu.git;a=shortlog;h=refs/tags/debian/sisu_5.1.2-1 diff --git a/rbuild b/rbuild index a4db2d0b..517fea33 100644 --- a/rbuild +++ b/rbuild @@ -38,8 +38,8 @@ raise 'Please, use ruby1.9.3 or later.' if RUBY_VERSION < '1.9.3' #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.15' -SiSU_version_next_unstable = '5.1.2' +SiSU_version_next_stable = '4.2.16' +SiSU_version_next_unstable = '5.1.3' #% rake file SiSU_version_generic_next_stable = '4.2.x' SiSU_version_generic_next_unstable = '5.1.x' @@ -59,17 +59,17 @@ module Project_details "Rakefile/Rantfile for the installation/setup of #{name}" end def self.platform_notice - "[#{name} is for the Linux/Unix Platforms]" + "[#{name} is for Linux/Unix Platforms]" end def self.env - Config::CONFIG + RbConfig::CONFIG end def self.host env['host'] end def self.dir def self.proj - 'sisu' + Project_details.name.downcase end def self.arch env['archdir'] @@ -119,14 +119,12 @@ module Project_details end end def self.system_info + ##{Project_details.platform_notice} puts <<-WOK - #{Project_details.platform_notice} - Host host: #{Project_details.host} arch: #{Project_details.dir.arch} sitearch: #{Project_details.dir.sitearch} - Directories for installation bin: #{Project_details.dir.bin} lib (site-ruby): #{Project_details.dir.lib}/#{Project_details.dir.proj}/v* @@ -138,11 +136,13 @@ module Project_details output: #{Project_details.dir.out} processing: #{Project_details.dir.out}/processing www: #{Project_details.dir.out}/www - - rubylib: #{Project_details.dir.rubylib} + rubylib: #{Project_details.dir.rubylib} WOK end + def self.gem_env + system("gem env") + end end module Utils def self.answer?(ask) @@ -268,7 +268,7 @@ module Version_info module Next def self.settings(v) { - project: 'SiSU', + project: "#{Project_details.name}", version: "#{v}", date: "#{Utils.system_date}", date_stamp: "#{Utils.system_date_stamp}", @@ -289,7 +289,7 @@ module Version_info end module Update def self.version_info_update_commit(filename,vi_hash_current,vi_content_current,vi_hash_next,vi_content_next) - ans=%{update sisu version info replacing: + ans=%{update #{Project_details.name.downcase} version info replacing: #{vi_hash_current.sort} with: #{vi_hash_next.sort} @@ -350,15 +350,15 @@ Gem::Specification.new do |s| s.version = '#{vi[:version]}' s.date = '#{vi[:date]}' s.summary = '#{vi[:project]}' - s.description = 'SiSU gem' + s.description = '#{Project_details.name} gem' s.authors = ["Ralph Amissah"] s.email = 'ralph.amissah@gmail.com' - s.files = Dir['lib/sisu/#{version}/*.rb'] + - Dir['data/sisu/#{version}sv/version.yml'] + - Dir['bin/sisugem'] + - Dir['bin/sisu'] + s.files = Dir['lib/#{Project_details.name.downcase}/#{version}/*.rb'] + + Dir['data/#{Project_details.name.downcase}/#{version}sv/version.yml'] + + Dir['bin/#{Project_details.name.downcase}gem'] + + Dir['bin/#{Project_details.name.downcase}'] s.license = 'GPL3' - s.executables << 'sisugem' << 'sisu' + s.executables << '#{Project_details.name.downcase}gem' << '#{Project_details.name.downcase}' end WOK end @@ -382,10 +382,10 @@ end end module Current def self.filename_stable - "sisu-#{Version_info::Current.setting_stable[:version]}" + "#{Project_details.name.downcase}-#{Version_info::Current.setting_stable[:version]}" end def self.filename_unstable - "sisu-#{Version_info::Current.setting_unstable[:version]}" + "#{Project_details.name.downcase}-#{Version_info::Current.setting_unstable[:version]}" end def self.info_stable Gemspecs.info(Version_info::Current.setting_stable) @@ -401,11 +401,11 @@ end end def self.create_stable Gemspecs.create(filename_stable,current_stable) - Gemspecs.create('sisu-stable',current_stable) + Gemspecs.create("#{Project_details.name.downcase}-stable",current_stable) end def self.create_unstable Gemspecs.create(filename_unstable,current_unstable) - Gemspecs.create('sisu-unstable',current_unstable) + Gemspecs.create("#{Project_details.name.downcase}-unstable",current_unstable) end def self.build_stable Gemspecs.build(filename_stable) @@ -413,7 +413,6 @@ end def self.build_unstable Gemspecs.build(filename_unstable) end - def self.install_stable Gemspecs.install(filename_stable) end @@ -423,10 +422,10 @@ end end module Next def self.filename_stable - "sisu-#{Version_info::Next.setting_stable[:version]}" + "#{Project_details.name.downcase}-#{Version_info::Next.setting_stable[:version]}" end def self.filename_unstable - "sisu-#{Version_info::Next.setting_unstable[:version]}" + "#{Project_details.name.downcase}-#{Version_info::Next.setting_unstable[:version]}" end def self.setting_stable Gemspecs.contents(Version_info::Next.setting_stable,SiSU_version_dir_stable) @@ -463,26 +462,21 @@ module Help #{Project_details.platform_notice} Commands quick start list - #{Project_details.name} Rake/Rant Help: (Rakefile or Rantfile) - rake -T or rant -T # a task list, (generated by Rake or Rant) for more complete and up to date help - rake system or rant system # system info used - - Quick start install and remove project #{Project_details.name} - as root: - rake or rant # install #{Project_details.name} - rake base + rake (rake -T or rant -T) # a task list, (generated by Rake or Rant) for more complete and up to date help - rake setup # install #{Project_details.name} (larger install) - - rake install # reinstall #{Project_details.name} - - rake remove # clobber/remove #{Project_details.name}, stable version: #{Project_details.version} + Quick start install and remove project #{Project_details.name}, as root: + rake setup # install #{Project_details.name} + rake resetup # reinstall #{Project_details.name} rake remove_package # clobber/remove #{Project_details.name}, all versions + alternatively to install as a gem: + rake gem_create_build_install # create gemspec; build gem, &; install gem, for #{Project_details.name} -For a more detailed and up to date list of command options use: - rake -T - rant -T + NOTE: these install options DO NOT setup #{Project_details.name} dependencies for: + LaTeX(XeTeX) pdf output; or + databases (postgresql or sqlite3) for #{Project_details.name} search + should you wish to produce outputs that depend on them + (on Debian for example this is the work of the debian installer) WOK end @@ -496,181 +490,205 @@ WOK end #% tasks desc "rake/rant tasks for sisu install, and create gem)" -task :default => [:tasks] #[:default_notice,:setup_base] -desc "Setup/Install #{Project_details.name} and try generate a file" -task :project=> [:setup_bin,:setup_lib,:setup_conf,:setup_share,:setup_data,:setup_man,:setup_vim,:post_install_note] + task :default => [:note_sources,:tasks,:note_installation] #[:default_notice,:setup_base] desc "Setup/Install #{Project_details.name}" -task :setup=> [:setup_bin, :setup_lib,:setup_conf,:setup_share,:setup_data] #, :help] + task :setup_project=> [:setup_bin_,:setup_lib_,:setup_conf_,:setup_share_,:setup_data_,:setup_man_,:setup_vim_,:src_note] + task :project=> [:setup_project] +desc "Setup/Install #{Project_details.name}" + task :setup=> [:setup_bin_, :setup_lib_,:setup_conf_,:setup_share_,:setup_data_] #, :help] desc "Setup/Install #{Project_details.name}: bin, lib and conf (no data)" -task :setup_base=> [:setup_bin,:setup_lib,:setup_conf,:setup_share,:setup_man,:setup_vim] -desc "Setup/Install #{Project_details.name} bin, lib and conf (no data and no attempt to do postinstall setup)" -task :base=> [:setup_base] + task :setup_base=> [:setup_bin_,:setup_lib_,:setup_conf_,:setup_share_,:setup_man_,:setup_vim_,:note_sources] + task :base=> [:setup_base] +desc "Setup/Install #{Project_details.name}: bin, lib, conf & data" + task :setup_with_data=> [:setup_base,:setup_data] desc "check package version" -task :sisuversion => [:sisu_version] -desc "set package version" -task :sisuversionset => [:sisu_version_set,:changelog_headers] + task :sisuversion => [:sisu_version] +#desc "set package version" + task :sisuversionset => [:sisu_version_set,:changelog_headers] desc "check gemspec info" -task :gemspec => [:gemspec_info] + task :gem_spec => [:gemspec_info] desc "create sisu v_stable gemspec" -task :gem4cs => [:gemspecs_stable_create_default_version] -task :gem4createspecs => [:gemspecs_stable_create_default_version] + task :gem_create_spec_stable => [:gemspecs_stable_create_default_version] + task :gem4cs => [:gem_create_spec_stable] + task :gem4createspecs => [:gemspecs_stable_create_default_version] desc "create sisu v_unstable gemspec" -task :gem5cs => [:gemspecs_unstable_create_default_version] -task :gem5createspecs => [:gemspecs_unstable_create_default_version] + task :gem_create_spec_unstable => [:gemspecs_unstable_create_default_version] + task :gem5cs => [:gem_create_spec_unstable] + task :gem5createspecs => [:gemspecs_unstable_create_default_version] desc "create gemspec" -task :gemcs => [:gemspecs_create_default_version] -task :gemc => [:gemspecs_create_default_version] -task :gemspecscreate => [:gemspecs_create_default_version] + task :gem_create_spec => [:gemspecs_create_default_version] + task :gemcs => [:gemspecs_create_default_version] + task :gemc => [:gemspecs_create_default_version] + task :gemspecscreate => [:gemspecs_create_default_version] #--- desc "build gem" -task :gemb => [:gem_build] -task :gembuild => [:gem_build] + task :gem_build => [:gem_build_] + task :gemb => [:gem_build] + task :gembuild => [:gem_build] desc "build sisu v_stable gem" -task :gem4b => [:gem_stable_build] -task :gem4build => [:gem_stable_build] + task :gem_build_stable => [:gem_stable_build] + task :gem4b => [:gem_build_stable] + task :gem4build => [:gem_build_stable] desc "build sisu v_unstable gem" -task :gem5b => [:gem_unstable_build] -task :gem5build => [:gem_unstable_build] -desc "install gem" -task :gemi => [:gem_install] -task :geminstall => [:gem_install] -desc "build & install sisu v_stable gem" -task :gem4bi => [:gem_stable_build,:gem_install] -desc "build & install sisu v_unstable gem" -task :gem5bi => [:gem_unstable_build,:gem_install] -desc "build & install gem" -task :gembi => [:gem_build,:gem_install] + task :gem_build_unstable => [:gem_unstable_build] + task :gem5b => [:gem_build_unstable] + task :gem5build => [:gem_build_unstable] +#--- desc "create, build & install sisu v_stable gem" -task :gem4cbi => [:gemspecs_stable_create_default_version,:gem_stable_build,:gem_stable_install] + task :gem_create_build_install_stable => [:gemspecs_stable_create_default_version,:gem_stable_build,:gem_stable_install] + task :gem4cbi => [:gem_create_build_install_stable] desc "create, build & install sisu v_unstable gem" -task :gem5cbi => [:gemspecs_unstable_create_default_version,:gem_unstable_build,:gem_unstable_install] + task :gem_create_build_install_unstable => [:gemspecs_unstable_create_default_version,:gem_unstable_build,:gem_unstable_install] + task :gem5cbi => [:gem_create_build_install_unstable] desc "create, build & install sisu v_stable & v_unstable gem" -task :gemcbi => [:gemspecs_create_default_version,:gem_build,:gem_install] -#--- -desc "create sisu v_stable gemspec, manually set version" -task :gem4csm => [:gemspecs_stable_create_manual_version] -desc "create sisu v_unstable gemspec, manually set version" -task :gem5csm => [:gemspecs_unstable_create_manual_version] -desc "create gemspec, manually set version" -task :gemcsm => [:gemspecs_create_manual_version] -task :gemcm => [:gemspecs_create_manual_version] + task :gem_create_build_install => [:gemspecs_create_default_version,:gem_build_,:gem_install_] + task :gemcbi => [:gem_create_build_install] #--- -desc "build gem" -task :gembm => [:gem_build_manual_version] -desc "build sisu v_stable gem" -task :gem4bm => [:gem_stable_build_manual_version] -desc "build sisu v_unstable gem" -task :gem5bm => [:gem_unstable_build_manual_version] desc "install gem" -task :gemim => [:gem_install_manual_version] + task :gem_install => [:gem_install_] + task :gemi => [:gem_install] + task :geminstall => [:gem_install] desc "build & install sisu v_stable gem" -task :gem4bim => [:gem_stable_build_manual_version,:gem_install_manual_version] + task :gem_build_install_stable => [:gem_stable_build,:gem_install_] + task :gem4bi => [:gem_build_install_stable] desc "build & install sisu v_unstable gem" -task :gem5bim => [:gem_unstable_build_manual_version,:gem_install_manual_version] + task :gem_build_install_unstable => [:gem_unstable_build,:gem_install_] + task :gem5bi => [:gem_build_install_unstable] desc "build & install gem" -task :gembim => [:gem_build_manual_version,:gem_install_manual_version] -desc "create, build & install sisu v_stable gem" -task :gem4cbim => [:gemspecs_stable_create_manual_version,:gem_stable_build_manual_version,:gem_stable_install_manual_version] -desc "create, build & install sisu v_unstable gem" -task :gem5cbim => [:gemspecs_unstable_create_manual_version,:gem_unstable_build_manual_version,:gem_unstable_install_manual_version] -desc "create, build & install sisu v_stable & v_unstable gem" -task :gemcbim => [:gemspecs_create_manual_version,:gem_build_manual_version,:gem_install_manual_version] + 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] +#desc "create sisu v_unstable gemspec, manually set next version" + task :gem5csn => [: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] +#desc "build sisu v_unstable gem, manually set next version" + task :gem5bn => [: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] +#desc "build & install sisu v_unstable gem, manually set next version" + task :gem5bin => [: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] +#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] +#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] #--- -desc "check changelog headers" -task :changelogheaders => [:changelog_headers] +#desc "check changelog headers" + task :changelogheaders => [:changelog_headers] + task :dev => [:note_developer] + task :developer_note => [:note_developer] if File.directory?('bin') desc "Setup #{Project_details.name} bin only, synonym :bin" - task :bin => [:setup_bin] + task :setup_bin => [:setup_bin_] + task :bin => [:setup_bin] end if File.directory?('lib') desc "Setup #{Project_details.name} lib only, synonym :lib" - task :lib => [:setup_lib] + task :setup_lib => [:setup_lib_] + task :lib => [:setup_lib] end if File.directory?('conf') desc "Setup #{Project_details.name} conf only, synonyms :conf & :etc" - task :conf => [:setup_conf] - task :setup_etc => [:setup_conf] - task :etc => [:setup_conf] + task :setup_conf => [:setup_conf_] + task :conf => [:setup_conf] + task :setup_etc => [:setup_conf] + task :etc => [:setup_conf] end if File.directory?('data') desc "Setup #{Project_details.name} data only, synonyms :data & :examples" - task :data => [:setup_data] - task :setup_examples => [:setup_data] - task :examples => [:setup_data] + task :setup_data => [:setup_data_] + task :data => [:setup_data] + task :setup_examples => [:setup_data] + task :examples => [:setup_data] end if File.directory?('data/sisu') - desc "Setup #{Project_details.name} shared data only (odf & shared images)" - task :share => [:setup_share] + #desc "Setup #{Project_details.name} shared data only (odf & shared images)" + task :setup_share => [:setup_share_] + task :share => [:setup_share] end if File.directory?('man') desc "Setup #{Project_details.name} man pages only, synonyms :man" - task :man => [:setup_man] + task :setup_man => [:setup_man_] + task :man => [:setup_man] end if File.directory?('data/vim') desc "Setup #{Project_details.name} vim config files only, synonyms :vim" - task :setup_vim => [:setup_vim] - task :vim => [:setup_vim] + task :setup_vim => [:setup_vim_] + task :vim => [:setup_vim] end -desc "Setup/Install #{Project_details.name}: bin, lib, conf and data (no attempt to do postinstall setup)" -task :setup_only=> [:setup_bin,:setup_lib,:setup_conf,:setup_share,:setup_data,:help] desc "Remove #{Project_details.name} (all versions)" -task :remove_package => [:remove_bin, :remove_lib, :remove_conf] + task :remove_package => [:remove_bin, :remove_lib, :remove_conf] if File.directory?('bin') - desc "Remove #{Project_details.name} bin only" - task :remove_bin => [:remove_bin] + #desc "Remove #{Project_details.name} bin only" + task :remove_bin => [:remove_bin] end if File.directory?('lib') - desc "Remove #{Project_details.name} lib only" - task :remove_lib => [:remove_lib] + #desc "Remove #{Project_details.name} lib only" + task :remove_lib => [:remove_lib] end if File.directory?('conf') - desc "Remove #{Project_details.name} conf only" - task :remove_conf => [:remove_conf] + #desc "Remove #{Project_details.name} conf only" + task :remove_conf => [:remove_conf] end desc "Re-setup #{Project_details.name}, synonym :reinstall" -task :resetup => [:remove, :setup] -task :reinstall => [:remove, :setup] -desc "Re-setup #{Project_details.name}: bin, lib, conf (ignore data), synonym :reinstall" -task :resetup_base => [:remove, :setup_base] -task :reinstall_base => [:remove, :setup_base] + task :resetup => [:remove, :setup] + task :reinstall => [:remove, :setup] +#desc "Re-setup #{Project_details.name}: bin, lib, conf (ignore data), synonym :reinstall" + task :resetup_base => [:remove, :setup_base_] + task :reinstall_base => [:remove, :setup_base_] if File.directory?('bin') - desc "Re-setup #{Project_details.name} bin, synonym :reinstall" - task :resetup_bin => [:remove_bin, :setup_bin] - task :reinstall_bin => [:remove_bin, :setup_bin] + #desc "Re-setup #{Project_details.name} bin, synonym :reinstall" + task :resetup_bin => [:remove_bin, :setup_bin_] + task :reinstall_bin => [:remove_bin, :setup_bin_] end if File.directory?('lib') - desc "Re-setup #{Project_details.name} lib, synonym :reinstall_lib" - task :resetup_lib => [:remove_lib, :setup_lib] - task :reinstall_lib => [:remove_lib, :setup_lib] + #desc "Re-setup #{Project_details.name} lib, synonym :reinstall_lib" + task :resetup_lib => [:remove_lib, :setup_lib_] + task :reinstall_lib => [:remove_lib, :setup_lib_] end if File.directory?('conf') - desc "Re-setup #{Project_details.name} conf, synonyms :reinstall_conf & :resetup_etc" - task :resetup_conf => [:remove_conf, :setup_conf] - task :reinstall_conf => [:remove_conf, :setup_conf] - task :resetup_etc => [:remove_conf, :setup_conf] - task :reinstall_etc => [:remove_conf, :setup_conf] + #desc "Re-setup #{Project_details.name} conf, synonyms :reinstall_conf & :resetup_etc" + task :resetup_conf => [:remove_conf, :setup_conf_] + task :reinstall_conf => [:remove_conf, :setup_conf_] + task :resetup_etc => [:remove_conf, :setup_conf_] + task :reinstall_etc => [:remove_conf, :setup_conf_] end if File.directory?('data/sisu') - desc "Re-setup #{Project_details.name} shared data, (odf & images)" - task :resetup_share => [:remove_share, :setup_share] - task :reinstall_share => [:remove_share, :setup_share] + #desc "Re-setup #{Project_details.name} shared data, (odf & images)" + task :resetup_share => [:remove_share, :setup_share_] + task :reinstall_share => [:remove_share, :setup_share_] end if File.directory?('man') - desc "Re-setup #{Project_details.name} man, synonym :reinstall_man" - task :resetup_man => [:remove_man, :setup_man] - task :reinstall_man => [:remove_man, :setup_man] + #desc "Re-setup #{Project_details.name} man, synonym :reinstall_man" + task :resetup_man => [:remove_man, :setup_man_] + task :reinstall_man => [:remove_man, :setup_man_] end desc 'Setup Note' -task :setup_note => [:help] + task :setup_note => [:help] desc "System information used by #{Project_details.name}" -task :system => [:system_info,:project_help,:post_install_note] + task :system => [:system_info,:project_help,:note_sources] desc "show all system info available - parameters found" -task :system_param => [:system_param] + task :system_param => [:system_param_] +desc "Gem environment information used ruby gems for #{Project_details.name}" + task :gem_env => [:gem_env_] desc 'Help' -task :help => [:project_help,:system_info,:tasks] + task :help => [:project_help,:system_info,:tasks] #desc "Setup/Install #{Project_details.name} (uses filelist)" -task :install => [:default_notice,:project] -task :install_bin => [:setup_bin] + task :install => [:default_notice,:project] + task :install_bin => [:setup_bin_] #%% setup/install tasks task :rant_independence do #notice resp='' @@ -704,27 +722,27 @@ task :default2 do #secondary setup_find_cp_r('data/vim',"#{Project_details.dir.data}/vim") if File.directory?('data/vim') setup_find_cp_r('man',Project_details.dir.man) if File.directory?('man') end -task :setup_bin do +task :setup_bin_ do exclude_files=['sisugem'] Install.setup_find_create('bin',Project_details.dir.bin,exclude_files) if File.directory?('bin') end -task :setup_lib do +task :setup_lib_ do Install.setup_find_create('lib',Project_details.dir.lib) if File.directory?('lib') end -task :setup_conf do +task :setup_conf_ do Install.setup_find_create('conf',Project_details.dir.conf) if File.directory?('conf') end -task :setup_share do +task :setup_share_ do Install.setup_find_create('data/sisu',Project_details.dir.share) if File.directory?('data/sisu') end -task :setup_data do +task :setup_data_ do Install.setup_find_create('data',Project_details.dir.data) if File.directory?('data') end -task :setup_man do +task :setup_man_ do Install.setup_find_create('man',Project_details.dir.man) if File.directory?('man') Install.setup_find_create('man.deb/man',Project_details.dir.man) if File.directory?('man.deb/man') end -task :setup_vim do +task :setup_vim_ do Install.setup_find_create('data/vim',Project_details.dir.vim) if File.directory?('data/vim') end task :gemspec_info do @@ -741,13 +759,13 @@ task :gemspecs_create_default_version do Gemspecs::Current.create_stable Gemspecs::Current.create_unstable end -task :gemspecs_stable_create_manual_version do +task :gemspecs_stable_create_next_version do Gemspecs::Next.create_stable end -task :gemspecs_unstable_create_manual_version do +task :gemspecs_unstable_create_next_version do Gemspecs::Next.create_unstable end -task :gemspecs_create_manual_version do +task :gemspecs_create_next_version do Gemspecs::Next.create_stable Gemspecs::Next.create_unstable end @@ -757,17 +775,17 @@ end task :gem_unstable_build do Gemspecs::Current.build_unstable end -task :gem_build do +task :gem_build_ do Gemspecs::Current.build_stable Gemspecs::Current.build_unstable end -task :gem_stable_build_manual_version do +task :gem_stable_build_next_version do Gemspecs::Next.build_stable end -task :gem_unstable_build_manual_version do +task :gem_unstable_build_next_version do Gemspecs::Next.build_unstable end -task :gem_build_manual_version do +task :gem_build_next_version do Gemspecs::Next.build_stable Gemspecs::Next.build_unstable end @@ -777,17 +795,17 @@ end task :gem_unstable_install do Gemspecs::Current.install_unstable end -task :gem_install do +task :gem_install_ do Gemspecs::Current.install_stable Gemspecs::Current.install_unstable end -task :gem_stable_install_manual_version do +task :gem_stable_install_next_version do Gemspecs::Next.install_stable end -task :gem_unstable_install_manual_version do +task :gem_unstable_install_next_version do Gemspecs::Next.install_unstable end -task :gem_install_manual_version do +task :gem_install_next_version do Gemspecs::Next.install_stable Gemspecs::Next.install_unstable end @@ -839,24 +857,59 @@ task :remove_package do rm_r "#{Project_details.dir.lib}/#{Project_details.dir.proj}" if FileTest.directory?("#{Project_details.dir.lib}/#{Project_details.dir.proj}") rm_r "#{Project_details.dir.conf}/#{Project_details.dir.proj}" if FileTest.directory?("#{Project_details.dir.conf}/#{Project_details.dir.proj}") end -task :post_install_note do - puts < - - and: - + sisu source code is available at: + + + sisu markup samples are provided/packaged separately as sisu-markup-samples: + + WOK +end +task :note_installation do + puts <<-WOK -WOK + alternative 1: basic sisu install, as root: + rake setup + + alternative 2: 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) + for individual steps (create, build, install) see rake options, rake -T + WOK +end +task :note_developer do + puts <<-WOK + + changelogheaders + + sisuversion + sisuversionset + + gemcsn gem4csn gem5csn + gembn gem4bn gem5bn + gemin gem4in gem5in + gembin gem4bin gem5bin + gemcbin gem4cbin gem5cbin + WOK end #%% help & system info task :system_info do Project_details.system_info end -task :system_param do - @env.each {|c| puts c.inspect } +task :system_param_ do + Project_details.env.each {|c| puts c.inspect } +end +task :gem_env_ do + Project_details.gem_env end task :project_help do Help.project_help -- cgit v1.2.3