Skip to content

Commit 52abc45

Browse files
committed
fix :release task to do chdir to work well
1 parent e199a1b commit 52abc45

File tree

2 files changed

+50
-46
lines changed

2 files changed

+50
-46
lines changed

Rakefile

+25-23
Original file line numberDiff line numberDiff line change
@@ -91,31 +91,33 @@ desc "generate a release tarball"
9191
task :release => :compile do
9292
require 'tmpdir'
9393

94-
# since we're in the mruby/
95-
release_dir = "releases/v#{APP_VERSION}"
96-
release_path = Dir.pwd + "/../#{release_dir}"
97-
app_name = "#{APP_NAME}-#{APP_VERSION}"
98-
FileUtils.mkdir_p(release_path)
99-
100-
Dir.mktmpdir do |tmp_dir|
101-
Dir.chdir(tmp_dir) do
102-
MRuby.each_target do |target|
103-
next if name == "host"
104-
105-
arch = name
106-
bin = "#{build_dir}/bin/#{exefile(APP_NAME)}"
107-
FileUtils.mkdir_p(name)
108-
FileUtils.cp(bin, name)
109-
110-
Dir.chdir(arch) do
111-
arch_release = "#{app_name}-#{arch}"
112-
puts "Writing #{release_dir}/#{arch_release}.tgz"
113-
`tar czf #{release_path}/#{arch_release}.tgz *`
94+
Dir.chdir(mruby_root) do
95+
# since we're in the mruby/
96+
release_dir = "releases/v#{APP_VERSION}"
97+
release_path = Dir.pwd + "/../#{release_dir}"
98+
app_name = "#{APP_NAME}-#{APP_VERSION}"
99+
FileUtils.mkdir_p(release_path)
100+
101+
Dir.mktmpdir do |tmp_dir|
102+
Dir.chdir(tmp_dir) do
103+
MRuby.each_target do |target|
104+
next if name == "host"
105+
106+
arch = name
107+
bin = "#{build_dir}/bin/#{exefile(APP_NAME)}"
108+
FileUtils.mkdir_p(name)
109+
FileUtils.cp(bin, name)
110+
111+
Dir.chdir(arch) do
112+
arch_release = "#{app_name}-#{arch}"
113+
puts "Writing #{release_dir}/#{arch_release}.tgz"
114+
`tar czf #{release_path}/#{arch_release}.tgz *`
115+
end
114116
end
115-
end
116117

117-
puts "Writing #{release_dir}/#{app_name}.tgz"
118-
`tar czf #{release_path}/#{app_name}.tgz *`
118+
puts "Writing #{release_dir}/#{app_name}.tgz"
119+
`tar czf #{release_path}/#{app_name}.tgz *`
120+
end
119121
end
120122
end
121123
end

mrblib/mruby-cli/setup.rb

+25-23
Original file line numberDiff line numberDiff line change
@@ -405,31 +405,33 @@ def clean_env(envs)
405405
task :release => :compile do
406406
require 'tmpdir'
407407
408-
# since we're in the mruby/
409-
release_dir = "releases/v\#{APP_VERSION}"
410-
release_path = Dir.pwd + "/../\#{release_dir}"
411-
app_name = "\#{APP_NAME}-\#{APP_VERSION}"
412-
FileUtils.mkdir_p(release_path)
413-
414-
Dir.mktmpdir do |tmp_dir|
415-
Dir.chdir(tmp_dir) do
416-
MRuby.each_target do |target|
417-
next if name == "host"
418-
419-
arch = name
420-
bin = "\#{build_dir}/bin/\#{exefile(APP_NAME)}"
421-
FileUtils.mkdir_p(name)
422-
FileUtils.cp(bin, name)
423-
424-
Dir.chdir(arch) do
425-
arch_release = "\#{app_name}-\#{arch}"
426-
puts "Writing \#{release_dir}/\#{arch_release}.tgz"
427-
`tar czf \#{release_path}/\#{arch_release}.tgz *`
408+
Dir.chdir(mruby_root) do
409+
# since we're in the mruby/
410+
release_dir = "releases/v\#{APP_VERSION}"
411+
release_path = Dir.pwd + "/../\#{release_dir}"
412+
app_name = "\#{APP_NAME}-\#{APP_VERSION}"
413+
FileUtils.mkdir_p(release_path)
414+
415+
Dir.mktmpdir do |tmp_dir|
416+
Dir.chdir(tmp_dir) do
417+
MRuby.each_target do |target|
418+
next if name == "host"
419+
420+
arch = name
421+
bin = "\#{build_dir}/bin/\#{exefile(APP_NAME)}"
422+
FileUtils.mkdir_p(name)
423+
FileUtils.cp(bin, name)
424+
425+
Dir.chdir(arch) do
426+
arch_release = "\#{app_name}-\#{arch}"
427+
puts "Writing \#{release_dir}/\#{arch_release}.tgz"
428+
`tar czf \#{release_path}/\#{arch_release}.tgz *`
429+
end
428430
end
429-
end
430431
431-
puts "Writing \#{release_dir}/\#{app_name}.tgz"
432-
`tar czf \#{release_path}/\#{app_name}.tgz *`
432+
puts "Writing \#{release_dir}/\#{app_name}.tgz"
433+
`tar czf \#{release_path}/\#{app_name}.tgz *`
434+
end
433435
end
434436
end
435437
end

0 commit comments

Comments
 (0)