diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | lib/mkmf.rb | 18 | ||||
-rw-r--r-- | version.h | 6 |
3 files changed, 27 insertions, 7 deletions
@@ -1,3 +1,13 @@ +Tue Feb 5 11:14:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/mkmf.rb (INSTALL_DIRS, install_dirs): added BINDIR. + + * lib/mkmf.rb (install_files): rejects files matching to + $NONINSTALLFILES. + + * lib/mkmf.rb (init_mkmf): defaults $NONINSTALLFILES to backup and + temporary filse. + Mon Feb 4 16:44:24 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * configure.in (darwin): NSIG is not defined if _XOPEN_SOURCE > 500L. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index aea6d9986f..9e461b42ad 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -73,16 +73,18 @@ end INSTALL_DIRS = [ [dir_re('commondir'), "$(RUBYCOMMONDIR)"], - [dir_re("sitedir"), "$(RUBYCOMMONDIR)"], + [dir_re('sitedir'), "$(RUBYCOMMONDIR)"], [dir_re('rubylibdir'), "$(RUBYLIBDIR)"], [dir_re('archdir'), "$(RUBYARCHDIR)"], [dir_re('sitelibdir'), "$(RUBYLIBDIR)"], - [dir_re('sitearchdir'), "$(RUBYARCHDIR)"] + [dir_re('sitearchdir'), "$(RUBYARCHDIR)"], + [dir_re('bindir'), "$(BINDIR)"], ] def install_dirs(target_prefix = nil) if $extout dirs = [ + ['BINDIR', '$(extout)/bin'], ['RUBYCOMMONDIR', '$(extout)/common'], ['RUBYLIBDIR', '$(RUBYCOMMONDIR)$(target_prefix)'], ['RUBYARCHDIR', '$(extout)/$(arch)$(target_prefix)'], @@ -91,12 +93,14 @@ def install_dirs(target_prefix = nil) ] elsif $extmk dirs = [ + ['BINDIR', '$(bindir)'], ['RUBYCOMMONDIR', '$(rubylibdir)'], ['RUBYLIBDIR', '$(rubylibdir)$(target_prefix)'], ['RUBYARCHDIR', '$(archdir)$(target_prefix)'], ] else dirs = [ + ['BINDIR', '$(bindir)'], ['RUBYCOMMONDIR', '$(sitedir)$(target_prefix)'], ['RUBYLIBDIR', '$(sitelibdir)$(target_prefix)'], ['RUBYARCHDIR', '$(sitearchdir)$(target_prefix)'], @@ -498,13 +502,14 @@ end def install_files(mfile, ifiles, map = nil, srcprefix = nil) ifiles or return + ifiles.empty? and return srcprefix ||= '$(srcdir)' Config::expand(srcdir = srcprefix.dup) dirs = [] path = Hash.new {|h, i| h[i] = dirs.push([i])[-1]} ifiles.each do |files, dir, prefix| dir = map_dir(dir, map) - prefix = %r|\A#{Regexp.quote(prefix)}/?| if prefix + prefix &&= %r|\A#{Regexp.quote(prefix)}/?| if /\A\.\// =~ files # install files which are in current working directory. files = files[2..-1] @@ -517,6 +522,10 @@ def install_files(mfile, ifiles, map = nil, srcprefix = nil) f = nil Dir.glob(files) do |f| f[0..len] = "" if len + case File.basename(f) + when *$NONINSTALLFILES + next + end d = File.dirname(f) d.sub!(prefix, "") if prefix d = (d.empty? || d == ".") ? dir : File.join(dir, d) @@ -1548,7 +1557,8 @@ def init_mkmf(config = CONFIG) $DEFLIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"] $DEFLIBPATH.unshift(".") $LIBPATH = [] - $INSTALLFILES = nil + $INSTALLFILES = [] + $NONINSTALLFILES = [/~\z/, /\A#.*#\z/, /\A\.#/, /\.bak\z/i, /\.orig\z/, /\.rej\z/, /\.l[ao]\z/, /\.o\z/] $objs = nil $srcs = nil @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.6" -#define RUBY_RELEASE_DATE "2008-02-04" +#define RUBY_RELEASE_DATE "2008-02-05" #define RUBY_VERSION_CODE 186 -#define RUBY_RELEASE_CODE 20080204 +#define RUBY_RELEASE_CODE 20080205 #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 4 +#define RUBY_RELEASE_DAY 5 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |