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

* lib/mkmf.rb (create_makefile): accept pure ruby libraries.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
eban 2002-12-21 15:42:10 +00:00
parent d0527b05d8
commit a36b7eea8a
2 changed files with 28 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sun Dec 22 00:36:43 2002 WATANABE Hirofumi <eban@ruby-lang.org>
* lib/mkmf.rb (create_makefile): accept pure ruby libraries.
Sat Dec 21 07:27:24 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
* misc/ruby-mode.el (ruby-parse-partial): keywords must not be

42
lib/mkmf.rb
View file

@ -365,7 +365,7 @@ def message(*s)
end
def checking_for(m)
f = caller[0][/in \`(.*)\'$/, 1] and f << ": "
f = caller[0][/in `(.*)'$/, 1] and f << ": " #` for vim
m = "checking for #{m}... "
message m
Logging::message "#{f}#{m}\n"
@ -579,7 +579,7 @@ ruby_version = #{Config::CONFIG['ruby_version']}
RUBY = #{$ruby}
RM = $(RUBY) -rftools -e "File::rm_f(*ARGV.map do|x|Dir[x]end.flatten.uniq)"
MAKEDIRS = $(RUBY) -r ftools -e 'File::makedirs(*ARGV)'
INSTALL_PROG = $(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0555, true)'
INSTALL_PROG = $(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0755, true)'
INSTALL_DATA = $(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true)'
#### End of system configuration section. ####
@ -613,9 +613,23 @@ def create_makefile(target, srcprefix = nil)
srcprefix ||= '$(srcdir)'
Config::expand(srcdir = srcprefix.dup)
unless $objs then
$objs = []
for f in Dir[File.join(srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
$objs.push(File.basename(f, ".*") << "." << $OBJEXT)
end
else
for i in $objs
i.sub!(/\.o\z/, ".#{$OBJEXT}")
end
end
$objs = $objs.join(" ")
target = nil if $objs == ""
cleanfiles = []
distcleanfiles = []
if EXPORT_PREFIX
if target and EXPORT_PREFIX
origdef = target + '.def'
deffile = EXPORT_PREFIX + origdef
unless File.exist? deffile
@ -644,18 +658,7 @@ def create_makefile(target, srcprefix = nil)
libpath = libpathflag(libpath)
unless $objs then
$objs = []
for f in Dir[File.join(srcdir, "*.{#{SRC_EXT.join(%q{,})}}")]
$objs.push(File.basename(f, ".*") << "." << $OBJEXT)
end
else
for i in $objs
i.sub!(/\.o\z/, ".#{$OBJEXT}")
end
end
$objs = $objs.join(" ")
dllib = target ? "$(TARGET).#{$static ? $LIBEXT : CONFIG['DLEXT']}" : ""
mfile = open("Makefile", "wb")
mfile.print configuration(srcdir)
mfile.print %{
@ -670,7 +673,7 @@ LOCAL_LIBS = #{$LOCAL_LIBS}
LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
OBJS = #{$objs}
TARGET = #{target}
DLLIB = $(TARGET).#{$static ? $LIBEXT : CONFIG['DLEXT']}
DLLIB = #{dllib}
}
if $extmk
mfile.print %{
@ -689,11 +692,11 @@ RUBYARCHDIR = $(sitearchdir)$(target_prefix)
CLEANLIBS = "$(TARGET).{lib,exp,il?,tds,map}" $(DLLIB)
CLEANOBJS = "*.{#{$OBJEXT},#{$LIBEXT},s[ol],pdb,bak}"
all: $(DLLIB)
all: #{target ? "$(DLLIB)" : "Makefile"}
}
mfile.print CLEANINGS
dirs = []
unless $static
if not $static and target
dirs << (dir = "$(RUBYARCHDIR)")
mfile.print("install: #{dir}\n")
f = "$(DLLIB)"
@ -723,6 +726,8 @@ all: $(DLLIB)
mfile.print "\nsite-install: install\n\n"
return unless target
mfile.print ".SUFFIXES: .#{SRC_EXT.join(' .')} .#{$OBJEXT}\n"
mfile.print "\n"
@ -763,6 +768,7 @@ all: $(DLLIB)
end
end
end
ensure
mfile.close
end