1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* instruby.rb (parse_args), ext/extmk.rb (parse_args): Detect -n

Browse Source 
and emulate a dry run.  Use 'make' in case no --make argument is
  given.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3412 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2003-01-26 08:56:01 +00:00
parent 171df94c27
commit 91758efa95
3 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Sun Jan 26 17:53:04 2003 Akinori MUSHA <knu@iDaemons.org>
* instruby.rb (parse_args), ext/extmk.rb (parse_args): Detect -n
and emulate a dry run. Use 'make' in case no --make argument is
given.
Sun Jan 26 07:18:42 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net> Sun Jan 26 07:18:42 2003 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* instruby.rb: re-define individual methods verbosely rather than * instruby.rb: re-define individual methods verbosely rather than

23
ext/extmk.rb
View File

@ -121,7 +121,7 @@ def parse_args()
$dryrun = $OPT['n'] $dryrun = $OPT['n']
$force_static = $OPT['extstatic'] == 'static' $force_static = $OPT['extstatic'] == 'static'
$destdir = $OPT['dest-dir'] || '' $destdir = $OPT['dest-dir'] || ''
$make = $OPT['make'] || $make $make = $OPT['make'] || $make || 'make'
make_flags = ($OPT['make-flags'] || '').strip make_flags = ($OPT['make-flags'] || '').strip
mflags = ($OPT['mflags'] || '').strip mflags = ($OPT['mflags'] || '').strip
@ -136,15 +136,24 @@ def parse_args()
$make, *rest = Shellwords.shellwords($make) $make, *rest = Shellwords.shellwords($make)
$mflags.unshift(*rest) unless rest.empty? $mflags.unshift(*rest) unless rest.empty?
$mflags << '-n' if $dryrun def $mflags.set?(flag)
# Only nmake puts flags together
if $nmake == ?m
grep(/^-(?!-).*#{'%c' % flag}/i) { return true }
else
include?('-%c' % flag)
end
end
if $mflags.set?(?n)
$dryrun = true
else
$mflags << '-n' if $dryrun
end
$mflags << "DESTDIR=#{$destdir}" $mflags << "DESTDIR=#{$destdir}"
# Most make implementations put each flag separated in MAKEFLAGS, so $continue = $mflags.set?(?k)
# we can just search for an option with exact match. Only nmake
# puts flags together, but nmake does not propagate -k via MAKEFLAGS
# anyway.
$continue = $mflags.include?('-k')
end end
parse_args() parse_args()

22
instruby.rb
View File

@ -18,7 +18,7 @@ def parse_args()
$dryrun = $OPT['n'] $dryrun = $OPT['n']
$destdir = $OPT['dest-dir'] || '' $destdir = $OPT['dest-dir'] || ''
$make = $OPT['make'] || $make $make = $OPT['make'] || $make || 'make'
make_flags = ($OPT['make-flags'] || '').strip make_flags = ($OPT['make-flags'] || '').strip
mflags = ($OPT['mflags'] || '').strip mflags = ($OPT['mflags'] || '').strip
$mantype = $OPT["mantype"] $mantype = $OPT["mantype"]
@ -34,14 +34,24 @@ def parse_args()
$make, *rest = Shellwords.shellwords($make) $make, *rest = Shellwords.shellwords($make)
$mflags.unshift(*rest) unless rest.empty? $mflags.unshift(*rest) unless rest.empty?
$mflags << '-n' if $dryrun def $mflags.set?(flag)
# Only nmake puts flags together
if $nmake == ?m
grep(/^-(?!-).*#{'%c' % flag}/i) { return true }
else
include?('-%c' % flag)
end
end
if $mflags.set?(?n)
$dryrun = true
else
$mflags << '-n' if $dryrun
end
$mflags << "DESTDIR=#{$destdir}" $mflags << "DESTDIR=#{$destdir}"
# Most make implementations put each flag separated in MAKEFLAGS, so $continue = $mflags.set?(?k)
# we can just search with exact match. Only nmake puts flags
# together, but nmake does not propagate -k via MAKEFLAGS anyway.
$continue = $mflags.include?('-k')
end end
parse_args() parse_args()