diff options
author | nagachika <nagachika@ruby-lang.org> | 2022-10-21 15:01:57 +0900 |
---|---|---|
committer | nagachika <nagachika@ruby-lang.org> | 2022-10-21 15:01:57 +0900 |
commit | 57d14154a2e85bec2a5589810a4aa250b82ab864 (patch) | |
tree | 40f1b096a58113da3777fd0b1478e3a503d96483 | |
parent | 022ab25878fe9e1edee757510e40ecaec9fb2b69 (diff) | |
download | ruby-57d14154a2e85bec2a5589810a4aa250b82ab864.tar.gz |
merge revision(s) 9de11fe796e8caca2d87650278028eb95c1e09a0:
Quiet if the target is already linked the same source
---
ext/extmk.rb | 2 +-
tool/ln_sr.rb | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
-rwxr-xr-x | ext/extmk.rb | 2 | ||||
-rw-r--r-- | tool/ln_sr.rb | 6 | ||||
-rw-r--r-- | version.h | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/ext/extmk.rb b/ext/extmk.rb index 40fc10ea1c..939eb73565 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -607,7 +607,7 @@ CP_R = #{config_string('CP')} -r gemlib = $(TARGET_TOPDIR)/gems/$(gem)/lib gemlib:#{%{ $(gemlib)\n$(gemlib): $(gem_srcdir)/lib} if $nmake} - $(Q) #{@inplace ? '$(NULLCMD) ' : ''}$(RUBY) $(top_srcdir)/tool/ln_sr.rb -f -T $(gem_srcdir)/lib $(gemlib) + $(Q) #{@inplace ? '$(NULLCMD) ' : ''}$(RUBY) $(top_srcdir)/tool/ln_sr.rb -q -f -T $(gem_srcdir)/lib $(gemlib) clean-gemlib: $(Q) $(#{@inplace ? 'NULLCMD' : 'RM_RF'}) $(gemlib) diff --git a/tool/ln_sr.rb b/tool/ln_sr.rb index 81fd803355..2aa8391e17 100644 --- a/tool/ln_sr.rb +++ b/tool/ln_sr.rb @@ -3,6 +3,7 @@ target_directory = true noop = false force = false +quiet = false until ARGV.empty? case ARGV[0] @@ -12,6 +13,8 @@ until ARGV.empty? force = true when '-T' target_directory = false + when '-q' + quiet = true else break end @@ -114,6 +117,9 @@ unless respond_to?(:ln_sr) end if File.respond_to?(:symlink) + if quiet and File.identical?(src, dest) + exit + end begin ln_sr(src, dest, verbose: true, target_directory: target_directory, force: force, noop: noop) rescue NotImplementedError, Errno::EPERM, Errno::EACCES @@ -11,7 +11,7 @@ # define RUBY_VERSION_MINOR RUBY_API_VERSION_MINOR #define RUBY_VERSION_TEENY 3 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR -#define RUBY_PATCHLEVEL 141 +#define RUBY_PATCHLEVEL 142 #define RUBY_RELEASE_YEAR 2022 #define RUBY_RELEASE_MONTH 10 |