kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* instruby.rb: need paren in regexp(make -n install).

Browse source 
* ext/extmk.rb (sysquote): do not need to quote on mswin/bccwin/mingw.

* ext/extm.rb ($mflags): uniq items and remove '-' and '--'.
  move options to the lead.

* lib/fileutils.rb (install): model on the real install
  command(message).


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3292 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eban 2003-01-05 07:04:10 +00:00
parent a287a10df7
commit 15774ab1fb
4 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ChangeLog
View file

@ -1,3 +1,15 @@
Sun Jan 5 14:46:46 2003 WATANABE Hirofumi <eban@ruby-lang.org>
* instruby.rb: need paren in regexp(make -n install).
* ext/extmk.rb (sysquote): do not need to quote on mswin/bccwin/mingw.
* ext/extm.rb ($mflags): uniq items and remove '-' and '--'.
move options to the lead.
* lib/fileutils.rb (install): model on the real install
command(message).
Sun Jan 5 09:36:46 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* ruby.c (ruby_init_loadpath): under Windows, get the module

20
ext/extmk.rb
View file

@ -28,11 +28,9 @@ $topdir = File.expand_path(".")
$top_srcdir = srcdir
$hdrdir = $top_srcdir
$quote =
/mswin|bccwin|mingw|human|os2|macos/ =~ (CROSS_COMPILING || RUBY_PLATFORM)
def sysquote(x)
$quote ? x.quote : x
@quote ||= /human|os2|macos/ =~ (CROSS_COMPILING || RUBY_PLATFORM)
@quote ? x.quote : x
end
def extmake(target)
@ -113,11 +111,13 @@ getopts('', 'extstatic', 'make:', 'make-flags:')
$force_static = $OPT['extstatic'] == 'static'
$make = $OPT['make'] || $make
$mflags = Shellwords.shellwords($OPT['make-flags'] || "")
$mflags = Shellwords.shellwords($OPT['make-flags'] || "").uniq
$mflags[0].sub!(/^\w+$/, '-\&') unless $mflags.empty?
$make, *$mflags[0, 0] = Shellwords.shellwords($make)
mflags = $mflags.grep(/^-([^-].*)/) {$1}.join
$mflags.delete_if{|x| x == '-' || x == '--'}
mflags = $mflags.grep(/^-([^-])/){$1}.join
mflags.downcase! if $nmake == ?m
$continue = mflags.include?(?k)
$dryrun = mflags.include?(?n)
@ -141,6 +141,8 @@ unless $message
end
end
$mflags = $mflags.partition{|x| x[0] == ?-}.flatten!
EXEEXT = CONFIG['EXEEXT']
if CROSS_COMPILING
$ruby = CONFIG['MINIRUBY']
@ -237,11 +239,7 @@ puts "making #{rubies.join(', ')}"
$stdout.flush
$mflags.concat(rubies)
if $quote
system($make, *$mflags.quote) or exit($?.exitstatus)
else
exec($make, *$mflags)
end
system($make, *sysquote($mflags)) or exit($?.exitstatus)
#Local variables:
# mode: ruby

6
instruby.rb
View file

@ -12,10 +12,10 @@ File.umask(0)
getopts("n", "make:", "make-flags:")
$dryrun = $OPT["n"]
mflags = Shellwords.shellwords($OPT["make-flags"] || "")
mflags[0].sub!(/^(?=\w+)$/, "-") unless mflags.empty?
mflags = Shellwords.shellwords($OPT["make-flags"] || "").uniq
mflags[0].sub!(/^\w+$/, '-\&') unless mflags.empty?
make, *mflags[0, 0] = Shellwords.shellwords($OPT['make'] || ENV["MAKE"] || "")
mflags = mflags.grep(/^-[^-]*/) {$1}.join
mflags = mflags.grep(/^-([^-])/){$1}.join
mflags.downcase! if /nmake/i == make
$dryrun = true if mflags.include?(?n)

2
lib/fileutils.rb
View file

@ -590,7 +590,7 @@ module FileUtils
def install( src, dest, mode, *options )
noop, verbose, = fu_parseargs(options, :noop, :verbose)
fu_output_message "install#{mode ? ' %o'%mode : ''} #{[src,dest].flatten.join ' '}" if verbose
fu_output_message "install -c#{mode ? ' -m 0%o'%mode : ''} #{[src,dest].flatten.join ' '}" if verbose
return if noop
fu_each_src_dest(src, dest) do |s,d|