mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/mkmf.rb (create_makefile): accept pure ruby libraries.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3196 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d0527b05d8
commit
a36b7eea8a
2 changed files with 28 additions and 18 deletions
|
@ -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>
|
Sat Dec 21 07:27:24 2002 Nobuyoshi Nakada <nobu.nokada@softhome.net>
|
||||||
|
|
||||||
* misc/ruby-mode.el (ruby-parse-partial): keywords must not be
|
* misc/ruby-mode.el (ruby-parse-partial): keywords must not be
|
||||||
|
|
42
lib/mkmf.rb
42
lib/mkmf.rb
|
@ -365,7 +365,7 @@ def message(*s)
|
||||||
end
|
end
|
||||||
|
|
||||||
def checking_for(m)
|
def checking_for(m)
|
||||||
f = caller[0][/in \`(.*)\'$/, 1] and f << ": "
|
f = caller[0][/in `(.*)'$/, 1] and f << ": " #` for vim
|
||||||
m = "checking for #{m}... "
|
m = "checking for #{m}... "
|
||||||
message m
|
message m
|
||||||
Logging::message "#{f}#{m}\n"
|
Logging::message "#{f}#{m}\n"
|
||||||
|
@ -579,7 +579,7 @@ ruby_version = #{Config::CONFIG['ruby_version']}
|
||||||
RUBY = #{$ruby}
|
RUBY = #{$ruby}
|
||||||
RM = $(RUBY) -rftools -e "File::rm_f(*ARGV.map do|x|Dir[x]end.flatten.uniq)"
|
RM = $(RUBY) -rftools -e "File::rm_f(*ARGV.map do|x|Dir[x]end.flatten.uniq)"
|
||||||
MAKEDIRS = $(RUBY) -r ftools -e 'File::makedirs(*ARGV)'
|
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)'
|
INSTALL_DATA = $(RUBY) -r ftools -e 'File::install(ARGV[0], ARGV[1], 0644, true)'
|
||||||
|
|
||||||
#### End of system configuration section. ####
|
#### End of system configuration section. ####
|
||||||
|
@ -613,9 +613,23 @@ def create_makefile(target, srcprefix = nil)
|
||||||
srcprefix ||= '$(srcdir)'
|
srcprefix ||= '$(srcdir)'
|
||||||
Config::expand(srcdir = srcprefix.dup)
|
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 = []
|
cleanfiles = []
|
||||||
distcleanfiles = []
|
distcleanfiles = []
|
||||||
if EXPORT_PREFIX
|
if target and EXPORT_PREFIX
|
||||||
origdef = target + '.def'
|
origdef = target + '.def'
|
||||||
deffile = EXPORT_PREFIX + origdef
|
deffile = EXPORT_PREFIX + origdef
|
||||||
unless File.exist? deffile
|
unless File.exist? deffile
|
||||||
|
@ -644,18 +658,7 @@ def create_makefile(target, srcprefix = nil)
|
||||||
|
|
||||||
libpath = libpathflag(libpath)
|
libpath = libpathflag(libpath)
|
||||||
|
|
||||||
unless $objs then
|
dllib = target ? "$(TARGET).#{$static ? $LIBEXT : CONFIG['DLEXT']}" : ""
|
||||||
$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(" ")
|
|
||||||
|
|
||||||
mfile = open("Makefile", "wb")
|
mfile = open("Makefile", "wb")
|
||||||
mfile.print configuration(srcdir)
|
mfile.print configuration(srcdir)
|
||||||
mfile.print %{
|
mfile.print %{
|
||||||
|
@ -670,7 +673,7 @@ LOCAL_LIBS = #{$LOCAL_LIBS}
|
||||||
LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
|
LIBS = #{$LIBRUBYARG} #{$libs} #{$LIBS}
|
||||||
OBJS = #{$objs}
|
OBJS = #{$objs}
|
||||||
TARGET = #{target}
|
TARGET = #{target}
|
||||||
DLLIB = $(TARGET).#{$static ? $LIBEXT : CONFIG['DLEXT']}
|
DLLIB = #{dllib}
|
||||||
}
|
}
|
||||||
if $extmk
|
if $extmk
|
||||||
mfile.print %{
|
mfile.print %{
|
||||||
|
@ -689,11 +692,11 @@ RUBYARCHDIR = $(sitearchdir)$(target_prefix)
|
||||||
CLEANLIBS = "$(TARGET).{lib,exp,il?,tds,map}" $(DLLIB)
|
CLEANLIBS = "$(TARGET).{lib,exp,il?,tds,map}" $(DLLIB)
|
||||||
CLEANOBJS = "*.{#{$OBJEXT},#{$LIBEXT},s[ol],pdb,bak}"
|
CLEANOBJS = "*.{#{$OBJEXT},#{$LIBEXT},s[ol],pdb,bak}"
|
||||||
|
|
||||||
all: $(DLLIB)
|
all: #{target ? "$(DLLIB)" : "Makefile"}
|
||||||
}
|
}
|
||||||
mfile.print CLEANINGS
|
mfile.print CLEANINGS
|
||||||
dirs = []
|
dirs = []
|
||||||
unless $static
|
if not $static and target
|
||||||
dirs << (dir = "$(RUBYARCHDIR)")
|
dirs << (dir = "$(RUBYARCHDIR)")
|
||||||
mfile.print("install: #{dir}\n")
|
mfile.print("install: #{dir}\n")
|
||||||
f = "$(DLLIB)"
|
f = "$(DLLIB)"
|
||||||
|
@ -723,6 +726,8 @@ all: $(DLLIB)
|
||||||
|
|
||||||
mfile.print "\nsite-install: install\n\n"
|
mfile.print "\nsite-install: install\n\n"
|
||||||
|
|
||||||
|
return unless target
|
||||||
|
|
||||||
mfile.print ".SUFFIXES: .#{SRC_EXT.join(' .')} .#{$OBJEXT}\n"
|
mfile.print ".SUFFIXES: .#{SRC_EXT.join(' .')} .#{$OBJEXT}\n"
|
||||||
mfile.print "\n"
|
mfile.print "\n"
|
||||||
|
|
||||||
|
@ -763,6 +768,7 @@ all: $(DLLIB)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
ensure
|
||||||
mfile.close
|
mfile.close
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue