summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNAKAMURA Usaku <usa@ruby-lang.org>2019-10-02 13:00:17 +0900
committerNAKAMURA Usaku <usa@ruby-lang.org>2019-10-02 13:00:17 +0900
commita61ae414b6f8310c9dff9a6f18b6064499167513 (patch)
tree2cbb0eaeb04e3694de468573c2c93ff571fa5f91
parent5af2c8735a22e6b54acf4164b1f1f7bac98e7111 (diff)
Fix the order of executing `after-update` task
-rwxr-xr-xtool/make-snapshot10
1 files changed, 7 insertions, 3 deletions
diff --git a/tool/make-snapshot b/tool/make-snapshot
index 95d5befea3..6efd827187 100755
--- a/tool/make-snapshot
+++ b/tool/make-snapshot
@@ -437,8 +437,8 @@ def package(vcs, rev, destdir, tmp = nil)
mk << commonmk.gsub(/\{\$([^(){}]*)[^{}]*\}/, "").sub(/^revision\.tmp::$/, '\& Makefile')
mk << <<-'APPEND'
-update-download:: touch-unicode-files after-update
-prepare-package: prereq
+update-download:: touch-unicode-files
+prepare-package: prereq after-update
clean-cache: $(CLEAN_CACHE)
after-update:: extract-gems
extract-gems: update-gems
@@ -473,7 +473,11 @@ touch-unicode-files:
end
modified = new_time
end
- unless system(make, "prepare-package", "clean-cache", *args)
+ unless system(make, "prepare-package", *args)
+ puts $colorize.fail("prepare-package failed")
+ return
+ end
+ unless system(make, "clean-cache", *args)
puts $colorize.fail("prepare-package failed")
return
end