diff options
Diffstat (limited to 'setup/qi_libs_base.rb')
-rw-r--r-- | setup/qi_libs_base.rb | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/setup/qi_libs_base.rb b/setup/qi_libs_base.rb index 4126fa3f..63a26548 100644 --- a/setup/qi_libs_base.rb +++ b/setup/qi_libs_base.rb @@ -58,7 +58,7 @@ module Project_details end def self.version stamp={} - v="#{dir.pwd}/conf/sisu/version.yml" + v="#{dir.pwd}/data/sisu/version.yml" if File.exist?(v) stamp=YAML::load(File::open(v)) stamp[:version] @@ -142,7 +142,7 @@ module Version_info end module Current def self.yml_file_path(version) - "data/sisu/version/#{version}.yml" + 'data/sisu/version.yml' end def self.settings(file) v="#{Dir.pwd}/#{file}" @@ -154,21 +154,12 @@ module Version_info def self.file_stable yml_file_path(SiSU_version_dir_stable) end - def self.file_unstable - yml_file_path(SiSU_version_dir_unstable) - end def self.setting_stable settings(file_stable) end - def self.setting_unstable - settings(file_unstable) - end def self.content_stable Version_info.contents(setting_stable) end - def self.content_unstable - Version_info.contents(setting_unstable) - end end module Next def self.settings(v) @@ -182,15 +173,9 @@ module Version_info def self.setting_stable settings(SiSU_version_next_stable) end - def self.setting_unstable - settings(SiSU_version_next_unstable) - end def self.content_stable Version_info.contents(setting_stable) end - def self.content_unstable - Version_info.contents(setting_unstable) - end end module Update def self.version_info_update_commit(filename,vi_hash_current,vi_content_current,vi_hash_next,vi_content_next) @@ -223,15 +208,6 @@ proceed? } Version_info::Next.content_stable ) end - def self.update_unstable - version_info_update_commit( - Version_info::Current.file_unstable, - Version_info::Current.setting_unstable, - Version_info::Current.content_unstable, - Version_info::Next.setting_unstable, - Version_info::Next.content_unstable - ) - end def self.changelog_header(vi) <<-WOK ** #{vi[:version]}.orig.tar.xz (#{vi[:date]}:#{vi[:date_stamp].gsub(/20\d\dw/,'')}) @@ -243,9 +219,6 @@ http://www.jus.uio.no/sisu/pkg/src/sisu_#{vi[:version]}.orig.tar.xz def self.changelog_header_stable changelog_header(Version_info::Current.setting_stable) end - def self.changelog_header_unstable - changelog_header(Version_info::Current.setting_unstable) - end end self end |