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

eban

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@817 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eban 2000-07-06 07:37:50 +00:00
parent d1375688cd
commit d381c13410
3 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/extmk.rb.in
View File

@ -422,11 +422,7 @@ TARGET = #{target}
DLLIB = $(TARGET).#{$static ? $LIBEXT : "@DLEXT@"} DLLIB = $(TARGET).#{$static ? $LIBEXT : "@DLEXT@"}
RUBY = #{ruby_interpreter} -I$(topdir) -I$(hdrdir)/lib RUBY = #{ruby_interpreter} -I$(topdir) -I$(hdrdir)/lib
<<<<<<< extmk.rb.in RM = $(RUBY) -r ftools -e "File::rm_f(*Dir[ARGV.join(' ')])"
RM = $(RUBY) -r ftools -e "File::rm_f *Dir[ARGV.join(' ')]"
=======
RM = $(RUBY) -r ftools -e 'File::rm_f(*Dir[ARGV.join(" ")])'
>>>>>>> 1.20
EXEEXT = @EXEEXT@ EXEEXT = @EXEEXT@

4
lib/mkmf.rb
View File

@ -406,11 +406,7 @@ TARGET = #{target}
DLLIB = $(TARGET).#{CONFIG["DLEXT"]} DLLIB = $(TARGET).#{CONFIG["DLEXT"]}
RUBY = #{CONFIG["ruby_install_name"]} RUBY = #{CONFIG["ruby_install_name"]}
<<<<<<< mkmf.rb
RM = $(RUBY) -r ftools -e 'File::rm_f *Dir[ARGV.join(" ")]'
=======
RM = $(RUBY) -r ftools -e 'File::rm_f(*Dir[ARGV.join(" ")])' RM = $(RUBY) -r ftools -e 'File::rm_f(*Dir[ARGV.join(" ")])'
>>>>>>> 1.22
EXEEXT = #{CONFIG["EXEEXT"]} EXEEXT = #{CONFIG["EXEEXT"]}

4
version.h
View File

@ -1,4 +1,4 @@
#define RUBY_VERSION "1.5.4" #define RUBY_VERSION "1.5.4"
#define RUBY_RELEASE_DATE "2000-07-04" #define RUBY_RELEASE_DATE "2000-07-06"
#define RUBY_VERSION_CODE 154 #define RUBY_VERSION_CODE 154
#define RUBY_RELEASE_CODE 20000704 #define RUBY_RELEASE_CODE 20000706