From 1db1a6e8411bed7ce63e2e717f55ee07f08b6157 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Thu, 13 Nov 2014 10:24:45 -0500 Subject: qi, (quick install) header update (also rbuild) --- setup/rbuild_libs.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup/rbuild_libs.rb') diff --git a/setup/rbuild_libs.rb b/setup/rbuild_libs.rb index 8389c836..9dc55bf7 100644 --- a/setup/rbuild_libs.rb +++ b/setup/rbuild_libs.rb @@ -284,7 +284,7 @@ proceed? } end def self.changelog_header(vi) <<-WOK -%% #{vi[:version]}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')}) +** #{vi[:version]}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')}) http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vi[:version]} http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_#{vi[:version]}-1 http://www.jus.uio.no/sisu/pkg/src/sisu_#{vi[:version]}.orig.tar.xz -- cgit v1.2.3 From 4db4dcc886b85bf9db43d66025452fb33c94a9dd Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Wed, 26 Nov 2014 09:12:11 -0500 Subject: c&d: project dir structure, libs moved under new branch names * libs & version files under new branch names: current & develop * previously under branch version numbers (v5|v6) * version .yml files moved * associated adjustments made as required, notably to: bin/sisu se* qi* (file headers); breakage potential, testing required * [on dir names, want release to (alphabetically) precede next/development, considered (cur|dev) (current|(dev|development|progress|next)) (stable|unstable), alpha sorting fail (release|(next|develop))] --- setup/rbuild_libs.rb | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) (limited to 'setup/rbuild_libs.rb') diff --git a/setup/rbuild_libs.rb b/setup/rbuild_libs.rb index 9dc55bf7..b999704b 100644 --- a/setup/rbuild_libs.rb +++ b/setup/rbuild_libs.rb @@ -192,7 +192,7 @@ module Version_info end module Current def self.yml_file_path(version) - "data/sisu/#{version}/v/version.yml" + "data/sisu/version/#{version}.yml" end def self.settings(file) v="#{Dir.pwd}/#{file}" @@ -208,10 +208,16 @@ module Version_info yml_file_path(SiSU_version_dir_unstable) end def self.setting_stable - settings(file_stable) + hsh=settings(file_stable) + hsh[:version_number]=/([0-9]+\.[0-9]+\.[0-9]+)/. + match(hsh[:version])[1] + hsh end def self.setting_unstable - settings(file_unstable) + hsh=settings(file_unstable) + hsh[:version_number]=/([0-9]+\.[0-9]+\.[0-9]+)/. + match(hsh[:version])[1] + hsh end def self.content_stable Version_info.contents(setting_stable) @@ -373,7 +379,7 @@ module Gemspecs puts <<-WOK -- name: #{vi[:project].downcase} -version: #{vi[:version]} +version: #{vi[:version_number]} date: #{vi[:date]} summary: #{vi[:project]} WOK @@ -382,14 +388,14 @@ summary: #{vi[:project]} <<-WOK Gem::Specification.new do |s| s.name = '#{vi[:project].downcase}' - s.version = '#{vi[:version]}' + s.version = '#{vi[:version_number]}' s.date = '#{vi[:date]}' s.summary = '#{vi[:project]}' s.description = '#{Project_details.name} gem' s.authors = ["Ralph Amissah"] s.email = 'ralph.amissah@gmail.com' s.files = Dir['lib/#{Project_details.name.downcase}/#{version}/*.rb'] + - Dir['data/#{Project_details.name.downcase}/#{version}/v/version.yml'] + + Dir['data/#{Project_details.name.downcase}/#{version}/version.yml'] + Dir['data/#{Project_details.name.downcase}/image/*'] + Dir['bin/#{Project_details.name.downcase}gem'] + Dir['bin/#{Project_details.name.downcase}'] @@ -420,12 +426,12 @@ end def self.filename_stable Project_details.name.downcase \ + '-' \ - + Version_info::Current.setting_stable[:version] + + Version_info::Current.setting_stable[:version_number] end def self.filename_unstable Project_details.name.downcase \ + '-' \ - + Version_info::Current.setting_unstable[:version] + + Version_info::Current.setting_unstable[:version_number] end def self.info_stable Gemspecs.info(Version_info::Current.setting_stable) @@ -476,12 +482,12 @@ end def self.filename_stable Project_details.name.downcase \ + '-' \ - + Version_info::Next.setting_stable[:version] + + Version_info::Next.setting_stable[:version_number] end def self.filename_unstable Project_details.name.downcase \ + '-' \ - + Version_info::Next.setting_unstable[:version] + + Version_info::Next.setting_unstable[:version_number] end def self.setting_stable Gemspecs.contents( @@ -515,4 +521,3 @@ end end end end - -- cgit v1.2.3 From 490b37178dc413e8a3280dd2619be51d9280ce52 Mon Sep 17 00:00:00 2001 From: Ralph Amissah Date: Fri, 10 Apr 2015 17:46:22 -0400 Subject: install related, qi (quick install) & rake --- setup/rbuild_libs.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'setup/rbuild_libs.rb') diff --git a/setup/rbuild_libs.rb b/setup/rbuild_libs.rb index b999704b..5345631b 100644 --- a/setup/rbuild_libs.rb +++ b/setup/rbuild_libs.rb @@ -137,14 +137,14 @@ module Utils end module Install #%% using a directory and its mapping - def self.setup_find_create(dir_get,dir_put,exclude_files=['']) #primary, + def self.setup_find_create(dir_get,dir_put,exclude_files=['\*'],act) #primary, begin Find.find("#{Project_details.dir.pwd}/#{dir_get}") do |f| stub=f.scan(/#{Project_details.dir.pwd}\/#{dir_get}\/(\S+)/).join place="#{dir_put}/#{stub}" action=case when File.file?(f) - unless f =~/#{exclude_files.inspect}/ + unless f =~/#{exclude_files.join("|")}/ cp(f,place) Utils.chmod_file(place) "-> #{dir_put}/" -- cgit v1.2.3