Make sure we always build the package after the sync the submodules and such.
Also, drop .tar.bz2 and .zip support. No one's downloading those anyway.
This commit is contained in:
parent
1531519886
commit
fe399926c7
24
Rakefile
24
Rakefile
|
@ -39,15 +39,19 @@ END
|
||||||
|
|
||||||
# ----- Packaging -----
|
# ----- Packaging -----
|
||||||
|
|
||||||
require 'rake/gempackagetask'
|
# Don't use Rake::GemPackageTast because we want prerequisites to run
|
||||||
load scope('haml.gemspec')
|
# before we load the gemspec.
|
||||||
|
desc "Build all the packages."
|
||||||
|
task :package => [:revision_file, :submodules] do
|
||||||
|
load scope('haml.gemspec')
|
||||||
|
Gem::Builder.new(HAML_GEMSPEC).build
|
||||||
|
pkg = "haml-#{HAML_GEMSPEC.version}"
|
||||||
|
mkdir_p "pkg"
|
||||||
|
verbose(true) {mv "#{pkg}.gem", "pkg/#{pkg}.gem"}
|
||||||
|
|
||||||
Rake::GemPackageTask.new(HAML_GEMSPEC) do |pkg|
|
sh %{rm -f pkg/#{pkg}.tar.gz}
|
||||||
if Rake.application.top_level_tasks.include?('release')
|
verbose(false) {HAML_GEMSPEC.files.each {|f| sh %{tar rf pkg/#{pkg}.tar #{f}}}}
|
||||||
pkg.need_tar_gz = true
|
sh %{gzip pkg/#{pkg}.tar}
|
||||||
pkg.need_tar_bz2 = true
|
|
||||||
pkg.need_zip = true
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
task :revision_file do
|
task :revision_file do
|
||||||
|
@ -62,8 +66,6 @@ task :revision_file do
|
||||||
File.open(scope('REVISION'), 'w') { |f| f.puts "(unknown)" }
|
File.open(scope('REVISION'), 'w') { |f| f.puts "(unknown)" }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
Rake::Task[:package].prerequisites.insert(0, :revision_file)
|
|
||||||
Rake::Task[:package].prerequisites.insert(0, :submodules)
|
|
||||||
|
|
||||||
# We also need to get rid of this file after packaging.
|
# We also need to get rid of this file after packaging.
|
||||||
at_exit { File.delete(scope('REVISION')) rescue nil }
|
at_exit { File.delete(scope('REVISION')) rescue nil }
|
||||||
|
@ -81,8 +83,6 @@ task :release => [:check_release, :release_elpa, :package] do
|
||||||
version = File.read(scope("VERSION")).strip
|
version = File.read(scope("VERSION")).strip
|
||||||
sh %{rubyforge add_release haml haml "#{name} (v#{version})" pkg/haml-#{version}.gem}
|
sh %{rubyforge add_release haml haml "#{name} (v#{version})" pkg/haml-#{version}.gem}
|
||||||
sh %{rubyforge add_file haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.gz}
|
sh %{rubyforge add_file haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.gz}
|
||||||
sh %{rubyforge add_file haml haml "#{name} (v#{version})" pkg/haml-#{version}.tar.bz2}
|
|
||||||
sh %{rubyforge add_file haml haml "#{name} (v#{version})" pkg/haml-#{version}.zip}
|
|
||||||
sh %{gem push pkg/haml-#{version}.gem}
|
sh %{gem push pkg/haml-#{version}.gem}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue