diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-22 03:26:22 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-22 03:26:22 +0000 |
| commit | d9691f6e845034adf927732a2d425338515f0dd7 (patch) | |
| tree | 480b392b45fc4becf97a6ea59b03adb3412ffa6a | |
| parent | 3bad2b6ed996aaf9795b1c0f0fa92124a74226c1 (diff) | |
| download | ruby-d9691f6e845034adf927732a2d425338515f0dd7.tar.gz | |
* cygwin/GNUmakefile.in (rubydll.def), win32/mkexports.rb
(Exports#exports): added VERSION.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20912 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | cygwin/GNUmakefile.in | 2 | ||||
| -rwxr-xr-x | win32/mkexports.rb | 5 |
3 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Dec 22 12:26:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * cygwin/GNUmakefile.in (rubydll.def), win32/mkexports.rb + (Exports#exports): added VERSION. + Mon Dec 22 12:25:09 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * missing/vsnprintf.c (BSD_vfprintf): fix for test_sprintf_comb.rb, by diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index 081c927575..91a5e73c88 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -76,7 +76,7 @@ endif ifeq (@target_os@,cygwin) cygwin-$(RUBY_INSTALL_NAME)$(MAJOR)$(MINOR)$(TEENY).dll: $(LIBRUBY_A) @NM@ --extern --defined $(LIBRUBY_A) | \ - $(MINIRUBY) -ne 'BEGIN{puts "EXPORTS"}; puts $$1+"=$(@F)."+$$1 if / [CDT] _(.*)$$/' >rubydll.def + $(MINIRUBY) -ne 'BEGIN{puts "VERSION $(MAJOR).$(MINOR)","EXPORTS"}; puts $$1+"=$(@F)."+$$1 if / [CDT] _(.*)$$/' >rubydll.def @DLLWRAP@ -s --def=rubydll.def -o $@ @rm -f rubydll.def endif diff --git a/win32/mkexports.rb b/win32/mkexports.rb index adf0c5e336..cd88e968a5 100755 --- a/win32/mkexports.rb +++ b/win32/mkexports.rb @@ -64,6 +64,7 @@ class Exports exports << "Library " + library end exports << "Description " + description.dump if description + exports << "VERSION #{RbConfig::CONFIG['MAJOR']}.#{RbConfig::CONFIG['MINOR']}" exports << "EXPORTS" << symbols() exports end @@ -132,6 +133,10 @@ class Exports::Mingw < Exports @@nm ||= RbConfig::CONFIG["NM"] end + def exports(*) + super() + end + def each_line(objs, &block) IO.foreach("|#{self.class.nm} --extern --defined #{objs.join(' ')}", &block) end |