diff options
Diffstat (limited to 'setup')
| -rw-r--r-- | setup/qi_libs.rb | 27 | ||||
| -rw-r--r-- | setup/qi_libs_base.rb | 2 |
2 files changed, 6 insertions, 23 deletions
diff --git a/setup/qi_libs.rb b/setup/qi_libs.rb index 9d11cecd..cad5e68a 100644 --- a/setup/qi_libs.rb +++ b/setup/qi_libs.rb @@ -64,7 +64,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] @@ -199,9 +199,9 @@ module Install end module Version_info def self.contents(vi,rel=:release) - release=if rel ==:pre_release then '_pre_rel' - else '' - end + release=rel ==:pre_release \ + ? '_pre_rel' + : '' <<-WOK --- :project: #{vi[:project]} @@ -361,10 +361,8 @@ proceed? } <<-WOK ** #{vn}.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_#{vn} -http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_#{vn}-1 http://www.jus.uio.no/sisu/pkg/src/sisu_#{vn}.orig.tar.xz sisu_#{vn}.orig.tar.xz - sisu_#{vn}-1.dsc WOK end def self.changelog_header_release(filename,ch,vi) @@ -424,10 +422,8 @@ proceed? } <<-WOK ** #{vn}.orig.tar.xz (Open commit window: #{vi[:date]}; Pre-Release)) http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/sisu_#{vn} -http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=log;h=refs/tags/debian/sisu_#{vn}-1 http://www.jus.uio.no/sisu/pkg/src/sisu_#{vn}.orig.tar.xz sisu_#{vn}.orig.tar.xz - sisu_#{vn}-1.dsc WOK end def self.changelog_header_pre_release_write(filename,ch) @@ -441,7 +437,7 @@ proceed? } if File.writable?(fn) changelog_arr_current = IO.readlines(fn) changelog_arr_next=changelog_arr_current.each.map do |line| - changelog_arr_next <<=if line =~/^--- HEAD ---$/ + if line =~/^--- HEAD ---$/ line << ("\n" + ch) else line end @@ -533,18 +529,7 @@ module GitExtractTaggedVersionBuild puts commands begin system(commands) - rescue # shell error not caught by ruby, using rake - #install_branches=[] - #install_branches << 'gem_create_build_stable' \ - # if options[:stable] - #install_branches << 'gem_create_build_unstable' \ - # if options[:unstable] - #commands =%{git checkout #{ver} && } - #install_branches.each do |install_branch| - # commands += %{rake #{install_branch};} - #end - #puts commands - #system(commands) + rescue end rescue ensure diff --git a/setup/qi_libs_base.rb b/setup/qi_libs_base.rb index 126811c8..4126fa3f 100644 --- a/setup/qi_libs_base.rb +++ b/setup/qi_libs_base.rb @@ -236,10 +236,8 @@ proceed? } <<-WOK ** #{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 sisu_#{vi[:version]}.orig.tar.xz - sisu_#{vi[:version]}-1.dsc WOK end def self.changelog_header_stable |