ruby-changes:3973
From: ko1@a...
Date: Thu, 14 Feb 2008 00:50:26 +0900 (JST)
Subject: [ruby-changes:3973] nobu - Ruby:r15463 (ruby_1_8, trunk): * common.mk (INSTRUBY_ARGS): pass mode to install.
nobu 2008-02-14 00:49:56 +0900 (Thu, 14 Feb 2008) New Revision: 15463 Modified files: branches/ruby_1_8/ChangeLog branches/ruby_1_8/common.mk branches/ruby_1_8/instruby.rb branches/ruby_1_8/version.h trunk/ChangeLog trunk/common.mk trunk/instruby.rb trunk/version.h Log: * common.mk (INSTRUBY_ARGS): pass mode to install. [ruby-dev:33766] * instruby.rb (parse_args): added --data-mode and --prog-mode options. http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/common.mk?r1=15463&r2=15462&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/version.h?r1=15463&r2=15462&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=15463&r2=15462&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15463&r2=15462&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/instruby.rb?r1=15463&r2=15462&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/version.h?r1=15463&r2=15462&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/instruby.rb?r1=15463&r2=15462&diff_format=u http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/common.mk?r1=15463&r2=15462&diff_format=u Index: ChangeLog =================================================================== --- ChangeLog (revision 15462) +++ ChangeLog (revision 15463) @@ -1,3 +1,9 @@ +Thu Feb 14 00:49:53 2008 Nobuyoshi Nakada <nobu@r...> + + * common.mk (INSTRUBY_ARGS): pass mode to install. [ruby-dev:33766] + + * instruby.rb (parse_args): added --data-mode and --prog-mode options. + Thu Feb 14 00:02:19 2008 Yusuke Endoh <mame@t...> * eval.c (eval): allow to eval in a binding that has a singleton method. Index: common.mk =================================================================== --- common.mk (revision 15462) +++ common.mk (revision 15463) @@ -84,11 +84,15 @@ SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \ --extout="$(EXTOUT)" \ - --make="$(MAKE)" \ --mflags="$(MFLAGS)" \ --make-flags="$(MAKEFLAGS)" EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) -- -INSTRUBY_ARGS = $(SCRIPT_ARGS) --installed-list $(INSTALLED_LIST) +INSTRUBY_ARGS = $(SCRIPT_ARGS) \ + --data-mode=$(INSTALL_DATA_MODE) \ + --prog-mode=$(INSTALL_PROG_MODE) \ + --installed-list $(INSTALLED_LIST) +INSTALL_PROG_MODE = 0755 +INSTALL_DATA_MODE = 0644 PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil' -- \ $(LIBRUBY_EXTS) $(LIBRUBY_SO_UPDATE) Index: version.h =================================================================== --- version.h (revision 15462) +++ version.h (revision 15463) @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2008-02-13" +#define RUBY_RELEASE_DATE "2008-02-14" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20080213 +#define RUBY_RELEASE_CODE 20080214 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 13 +#define RUBY_RELEASE_DAY 14 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; Index: instruby.rb =================================================================== --- instruby.rb (revision 15462) +++ instruby.rb (revision 15463) @@ -24,6 +24,8 @@ $installed_list = nil $dryrun = false $rdocdir = nil + $data_mode = 0644 + $prog_mode = 0755 opt = OptionParser.new opt.on('-n') {$dryrun = true} opt.on('--dest-dir=DIR') {|dir| $destdir = dir} @@ -40,6 +42,12 @@ [:local, :bin, :lib, :man, :ext, :"ext-arch", :"ext-comm", :rdoc]) do |ins| $install << ins end + opt.on('--data-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode| + $data_mode = mode + end + opt.on('--prog-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode| + $prog_mode = mode + end opt.on('--installed-list [FILENAME]') {|name| $installed_list = name} opt.on('--rdoc-output [DIR]') {|dir| $rdocdir = dir} @@ -119,7 +127,7 @@ File.directory?(realdir) end end.compact! - super(dirs, :mode => 0755) unless dirs.empty? + super(dirs, :mode => $prog_mode) unless dirs.empty? end def install_recursive(srcdir, dest, options = {}) @@ -191,22 +199,22 @@ makedirs [bindir, libdir, archlibdir] - install ruby_install_name+exeext, bindir, :mode => 0755 + install ruby_install_name+exeext, bindir, :mode => $prog_mode if rubyw_install_name and !rubyw_install_name.empty? - install rubyw_install_name+exeext, bindir, :mode => 0755 + install rubyw_install_name+exeext, bindir, :mode => $prog_mode end if File.exist? goruby_install_name+exeext - install goruby_install_name+exeext, bindir, :mode => 0755 + install goruby_install_name+exeext, bindir, :mode => $prog_mode end if enable_shared and dll != lib - install dll, bindir, :mode => 0755 + install dll, bindir, :mode => $prog_mode end - install lib, libdir, :mode => 0755 unless lib == arc - install arc, libdir, :mode => 0644 - install "rbconfig.rb", archlibdir, :mode => 0644 + install lib, libdir, :mode => $prog_mode unless lib == arc + install arc, libdir, :mode => $data_mode + install "rbconfig.rb", archlibdir, :mode => $data_mode if CONFIG["ARCHFILE"] for file in CONFIG["ARCHFILE"].split - install file, archlibdir, :mode => 0644 + install file, archlibdir, :mode => $data_mode end end @@ -225,15 +233,15 @@ if noinst = CONFIG["no_install_files"] and noinst.empty? noinst = nil end - install_recursive("#{extout}/#{CONFIG['arch']}", archlibdir, :no_install => noinst, :mode => 0755) - install_recursive("#{extout}/include/#{CONFIG['arch']}", archhdrdir, :glob => "*.h", :mode => 0644) + install_recursive("#{extout}/#{CONFIG['arch']}", archlibdir, :no_install => noinst, :mode => $prog_mode) + install_recursive("#{extout}/include/#{CONFIG['arch']}", archhdrdir, :glob => "*.h", :mode => $data_mode) end install?(:ext, :comm, :'ext-comm') do puts "installing extension scripts" hdrdir = rubyhdrdir + "/ruby" makedirs [rubylibdir, sitelibdir, vendorlibdir, hdrdir] - install_recursive("#{extout}/common", rubylibdir, :mode => 0644) - install_recursive("#{extout}/include/ruby", hdrdir, :glob => "*.h", :mode => 0644) + install_recursive("#{extout}/common", rubylibdir, :mode => $data_mode) + install_recursive("#{extout}/include/ruby", hdrdir, :glob => "*.h", :mode => $data_mode) end end @@ -244,7 +252,7 @@ ridatadir = File.join(CONFIG['datadir'], 'ri/$(MAJOR).$(MINOR).$(TEENY)/system') Config.expand(ridatadir) makedirs [ridatadir] - install_recursive($rdocdir, ridatadir, :mode => 0644) + install_recursive($rdocdir, ridatadir, :mode => $data_mode) end end @@ -265,7 +273,7 @@ name = ruby_install_name.sub(/ruby/, File.basename(src)) dest = File.join(bindir, name) - install src, dest, :mode => 0755 + install src, dest, :mode => $prog_mode next if $dryrun @@ -311,7 +319,7 @@ for f in Dir["lib/**/*{.rb,help-message}"] dir = File.dirname(f).sub!(/\Alib/, rubylibdir) || rubylibdir makedirs dir - install f, dir, :mode => 0644 + install f, dir, :mode => $data_mode end end @@ -325,7 +333,7 @@ noinst << "win32.h" end noinst = nil if noinst.empty? - install_recursive("include", rubyhdrdir, :no_install => noinst, :glob => "*.h", :mode => 0644) + install_recursive("include", rubyhdrdir, :no_install => noinst, :glob => "*.h", :mode => $data_mode) end install?(:local, :comm, :man) do @@ -341,7 +349,7 @@ makedirs destdir if $mantype == "doc" - install mdoc, destfile, :mode => 0644 + install mdoc, destfile, :mode => $data_mode else require 'mdoc2man.rb' @@ -353,7 +361,7 @@ w.close - install w.path, destfile, :mode => 0644 + install w.path, destfile, :mode => $data_mode end end end Index: ruby_1_8/ChangeLog =================================================================== --- ruby_1_8/ChangeLog (revision 15462) +++ ruby_1_8/ChangeLog (revision 15463) @@ -1,3 +1,9 @@ +Thu Feb 14 00:49:53 2008 Nobuyoshi Nakada <nobu@r...> + + * common.mk (INSTRUBY_ARGS): pass mode to install. [ruby-dev:33766] + + * instruby.rb (parse_args): added --data-mode and --prog-mode options. + Tue Feb 12 11:33:26 2008 Masatoshi SEKI <m_seki@m...> * test/erb/test_erb.rb(TestERBCore): import from erb-2.0.4. Index: ruby_1_8/version.h =================================================================== --- ruby_1_8/version.h (revision 15462) +++ ruby_1_8/version.h (revision 15463) @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2008-02-12" +#define RUBY_RELEASE_DATE "2008-02-14" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20080212 +#define RUBY_RELEASE_CODE 20080214 #define RUBY_PATCHLEVEL 5000 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 6 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 2 -#define RUBY_RELEASE_DAY 12 +#define RUBY_RELEASE_DAY 14 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; Index: ruby_1_8/instruby.rb =================================================================== --- ruby_1_8/instruby.rb (revision 15462) +++ ruby_1_8/instruby.rb (revision 15463) @@ -24,6 +24,8 @@ $installed_list = nil $dryrun = false $rdocdir = nil + $data_mode = 0644 + $prog_mode = 0755 opt = OptionParser.new opt.on('-n') {$dryrun = true} opt.on('--dest-dir=DIR') {|dir| $destdir = dir} @@ -40,6 +42,12 @@ [:local, :bin, :lib, :man, :ext, :"ext-arch", :"ext-comm", :rdoc]) do |ins| $install << ins end + opt.on('--data-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode| + $data_mode = mode + end + opt.on('--prog-mode=OCTAL-MODE', OptionParser::OctalInteger) do |mode| + $prog_mode = mode + end opt.on('--installed-list [FILENAME]') {|name| $installed_list = name} opt.on('--rdoc-output [DIR]') {|dir| $rdocdir = dir} @@ -119,7 +127,7 @@ File.directory?(realdir) end end.compact! - super(dirs, :mode => 0755) unless dirs.empty? + super(dirs, :mode => $prog_mode) unless dirs.empty? end def install_recursive(src, dest, options = {}) @@ -174,20 +182,20 @@ makedirs [bindir, libdir, archlibdir] - install ruby_install_name+exeext, bindir, :mode => 0755 + install ruby_install_name+exeext, bindir, :mode => $prog_mode if rubyw_install_name and !rubyw_install_name.empty? - install rubyw_install_name+exeext, bindir, :mode => 0755 + install rubyw_install_name+exeext, bindir, :mode => $prog_mode end if enable_shared and dll != lib - install dll, bindir, :mode => 0755 + install dll, bindir, :mode => $prog_mode end - install lib, libdir, :mode => 0755 unless lib == arc - install arc, libdir, :mode => 0644 - install "config.h", archlibdir, :mode => 0644 - install "rbconfig.rb", archlibdir, :mode => 0644 + install lib, libdir, :mode => $prog_mode unless lib == arc + install arc, libdir, :mode => $data_mode + install "config.h", archlibdir, :mode => $data_mode + install "rbconfig.rb", archlibdir, :mode => $data_mode if CONFIG["ARCHFILE"] for file in CONFIG["ARCHFILE"].split - install file, archlibdir, :mode => 0644 + install file, archlibdir, :mode => $data_mode end end @@ -243,7 +251,7 @@ name = ruby_install_name.sub(/ruby/, File.basename(src)) dest = File.join(bindir, name) - install src, dest, :mode => 0755 + install src, dest, :mode => $prog_mode next if $dryrun @@ -289,7 +297,7 @@ for f in Dir["lib/**/*{.rb,help-message}"] dir = File.dirname(f).sub!(/\Alib/, rubylibdir) || rubylibdir makedirs dir - install f, dir, :mode => 0644 + install f, dir, :mode => $data_mode end end @@ -299,13 +307,13 @@ Dir.chdir(srcdir) makedirs [archlibdir] for f in Dir["*.h"] - install f, archlibdir, :mode => 0644 + install f, archlibdir, :mode => $data_mode end if RUBY_PLATFORM =~ /mswin32|mingw|bccwin32/ win32libdir = File.join(archlibdir, "win32") makedirs win32libdir - install "win32/win32.h", win32libdir, :mode => 0644 + install "win32/win32.h", win32libdir, :mode => $data_mode end end @@ -322,7 +330,7 @@ makedirs destdir if $mantype == "doc" - install mdoc, destfile, :mode => 0644 + install mdoc, destfile, :mode => $data_mode else require 'mdoc2man.rb' @@ -334,7 +342,7 @@ w.close - install w.path, destfile, :mode => 0644 + install w.path, destfile, :mode => $data_mode end end end Index: ruby_1_8/common.mk =================================================================== --- ruby_1_8/common.mk (revision 15462) +++ ruby_1_8/common.mk (revision 15463) @@ -56,11 +56,15 @@ SCRIPT_ARGS = --dest-dir="$(DESTDIR)" \ --extout="$(EXTOUT)" \ - --make="$(MAKE)" \ --mflags="$(MFLAGS)" \ --make-flags="$(MAKEFLAGS)" EXTMK_ARGS = $(SCRIPT_ARGS) --extension $(EXTS) --extstatic $(EXTSTATIC) -- -INSTRUBY_ARGS = $(SCRIPT_ARGS) --installed-list $(INSTALLED_LIST) +INSTRUBY_ARGS = $(SCRIPT_ARGS) \ + --data-mode=$(INSTALL_DATA_MODE) \ + --prog-mode=$(INSTALL_PROG_MODE) \ + --installed-list $(INSTALLED_LIST) +INSTALL_PROG_MODE = 0755 +INSTALL_DATA_MODE = 0644 PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil' -- \ $(LIBRUBY_EXTS) $(LIBRUBY_SO_UPDATE) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/