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

* ext/extmk.rb: keep srcdir unexpanded.

Browse source 
* lib/mkmf.rb (create_makefile): quote topdir and hdrdir if necessary.
  fixed: [ruby-core:04932]

* lib/mkmf.rb (configuration), {bcc32,win32,wince}/Makefile.sub: make
  also INSTALL_PROG and INSTALL_DATA system dependent.
  fixed: [ruby-core:04931]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@8451 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-05-13 14:44:59 +00:00
parent 8726077bc1
commit 2c716f2b47
6 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
Fri May 13 23:44:22 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/extmk.rb: keep srcdir unexpanded.
* lib/mkmf.rb (create_makefile): quote topdir and hdrdir if necessary.
fixed: [ruby-core:04932]
* lib/mkmf.rb (configuration), {bcc32,win32,wince}/Makefile.sub: make
also INSTALL_PROG and INSTALL_DATA system dependent.
fixed: [ruby-core:04931]
Fri May 13 23:32:55 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri May 13 23:32:55 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (unknown_node): add volatile directive to prototype. * eval.c (unknown_node): add volatile directive to prototype.

2
bcc32/Makefile.sub
View file

@ -339,6 +339,8 @@ s,@LN_S@,$(LN_S),;t t
s,@SET_MAKE@,$(SET_MAKE),;t t s,@SET_MAKE@,$(SET_MAKE),;t t
s,@CP@,copy > nul,;t t s,@CP@,copy > nul,;t t
s,@INSTALL@,copy > nul,;t t s,@INSTALL@,copy > nul,;t t
s,@INSTALL_PROG@,$$(INSTALL),;t t
s,@INSTALL_DATA@,$$(INSTALL),;t t
s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
s,@ALLOCA@,$(ALLOCA),;t t s,@ALLOCA@,$(ALLOCA),;t t
s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t

4
ext/extmk.rb
View file

@ -22,9 +22,9 @@ $compiled = {}
$:.replace([Dir.pwd]) $:.replace([Dir.pwd])
require 'rbconfig' require 'rbconfig'
srcdir = File.expand_path("../..", __FILE__) srcdir = File.dirname(File.dirname(__FILE__))
$:.unshift(srcdir, srcdir+"/lib") $:.unshift(srcdir, File.expand_path("lib", srcdir))
$topdir = "." $topdir = "."
$top_srcdir = srcdir $top_srcdir = srcdir

8
lib/mkmf.rb
View file

@ -846,8 +846,8 @@ SHELL = /bin/sh
#### Start of system configuration section. #### #### Start of system configuration section. ####
srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {CONFIG[$1||$2]}} srcdir = #{srcdir.gsub(/\$\((srcdir)\)|\$\{(srcdir)\}/) {CONFIG[$1||$2]}}
topdir = #{$extmk ? CONFIG["topdir"] : $topdir} topdir = #{($extmk ? CONFIG["topdir"] : $topdir).quote}
hdrdir = #{$extmk ? CONFIG["hdrdir"] : '$(topdir)'} hdrdir = #{$extmk ? CONFIG["hdrdir"].quote : '$(topdir)'}
VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])} VPATH = #{vpath.join(CONFIG['PATH_SEPARATOR'])}
} }
drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/ drive = File::PATH_SEPARATOR == ';' ? /\A\w:/ : /\A/
@ -890,8 +890,8 @@ RUBY = #{($nmake && !$extmk && !$configure_args.has_key?('--ruby')) ? '$(ruby:/=
RM = #{config_string('RM') || '$(RUBY) -run -e rm -- -f'} RM = #{config_string('RM') || '$(RUBY) -run -e rm -- -f'}
MAKEDIRS = #{config_string('MAKEDIRS') || '@$(RUBY) -run -e mkdir -- -p'} MAKEDIRS = #{config_string('MAKEDIRS') || '@$(RUBY) -run -e mkdir -- -p'}
INSTALL = #{config_string('INSTALL') || '@$(RUBY) -run -e install -- -vp'} INSTALL = #{config_string('INSTALL') || '@$(RUBY) -run -e install -- -vp'}
INSTALL_PROG = $(INSTALL) -m 0755 INSTALL_PROG = #{config_string('INSTALL_PROG') || '$(INSTALL) -m 0755'}
INSTALL_DATA = $(INSTALL) -m 0644 INSTALL_DATA = #{config_string('INSTALL_DATA') || '$(INSTALL) -m 0644'}
COPY = #{config_string('CP') || '@$(RUBY) -run -e cp -- -v'} COPY = #{config_string('CP') || '@$(RUBY) -run -e cp -- -v'}
#### End of system configuration section. #### #### End of system configuration section. ####

2
win32/Makefile.sub
View file

@ -361,6 +361,8 @@ s,@LN_S@,$(LN_S),;t t
s,@SET_MAKE@,$(SET_MAKE),;t t s,@SET_MAKE@,$(SET_MAKE),;t t
s,@CP@,copy > nul,;t t s,@CP@,copy > nul,;t t
s,@INSTALL@,copy > nul,;t t s,@INSTALL@,copy > nul,;t t
s,@INSTALL_PROG@,$$(INSTALL),;t t
s,@INSTALL_DATA@,$$(INSTALL),;t t
s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj,;t t
s,@ALLOCA@,$(ALLOCA),;t t s,@ALLOCA@,$(ALLOCA),;t t
s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t

2
wince/Makefile.sub
View file

@ -366,6 +366,8 @@ s,@LN_S@,$(LN_S),;t t
s,@SET_MAKE@,$(SET_MAKE),;t t s,@SET_MAKE@,$(SET_MAKE),;t t
s,@CP@,copy > nul,;t t s,@CP@,copy > nul,;t t
s,@INSTALL@,copy > nul,;t t s,@INSTALL@,copy > nul,;t t
s,@INSTALL_PROG@,$$(INSTALL),;t t
s,@INSTALL_DATA@,$$(INSTALL),;t t
s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj isinf.obj isnan.obj,;t t s,@LIBOBJS@, acosh.obj crypt.obj erf.obj win32.obj isinf.obj isnan.obj,;t t
s,@ALLOCA@,$(ALLOCA),;t t s,@ALLOCA@,$(ALLOCA),;t t
s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t s,@DEFAULT_KCODE@,$(DEFAULT_KCODE),;t t