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

* common.mk, Makefile.in, {bcc32,win32,wince}/Makefile.sub: integrated

Browse source 
macro definitions.

* bcc32/Makefile.sub: LIBRUBY_SO should use DLDOBJS, not EXTOBJS.

* {win32,wince}/Makefile.sub: separate config.h for compiler versions.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@8902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2005-08-03 15:27:13 +00:00
parent a0d58fef04
commit e869ff20a3
7 changed files with 22 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,12 @@
Thu Aug 4 00:25:48 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk, Makefile.in, {bcc32,win32,wince}/Makefile.sub: integrated
macro definitions.
* bcc32/Makefile.sub: LIBRUBY_SO should use DLDOBJS, not EXTOBJS.
* {win32,wince}/Makefile.sub: separate config.h for compiler versions.
Wed Aug 3 21:59:16 2005 Hidetoshi NAGAI <nagai@ai.kyutech.ac.jp>
* ext/tk/lib/tk/variable.rb: TkVariable#trace didn't work on
@ -50,7 +59,7 @@ Mon Aug 1 01:17:40 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp>
Mon Aug 1 00:07:32 2005 Keiju Ishitsuka <keiju@ruby-lang.org>
* lib/irb/context.rb: fix `irb --readline` option. [ruby-list:40955]
Fri Jul 29 09:59:38 2005 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (rb_yield_0): push yielded node instead of yielding.

6
Makefile.in
View file

@ -78,12 +78,6 @@ ARFLAGS = rcu
RANLIB = @RANLIB@
OBJEXT = @OBJEXT@
EXTOBJS =
DLDOBJS = $(DMYEXT)
MAINOBJ = main.$(OBJEXT)
MANTYPE = @MANTYPE@
#### End of variables

11
bcc32/Makefile.sub
View file

@ -164,7 +164,6 @@ LIBRUBYARG = $(LIBRUBY)
PREP = miniruby$(EXEEXT)
DMYOBJS = dmyext.obj
OBJEXT = obj
WINMAINOBJ = winmain.$(OBJEXT)
@ -408,16 +407,16 @@ $(PROGRAM): $(MAINOBJ) $(LIBRUBY_SO) $(RUBY_INSTALL_NAME).res
$(WPROGRAM): $(MAINOBJ) $(WINMAINOBJ) $(LIBRUBY_SO) $(RUBYW_INSTALL_NAME).res
$(LD) $(LDFLAGS) $(WLDFLAGS) $(MAINOBJ) $(WINMAINOBJ),$@,nul,$(LIBRUBYARG) $(LIBS),,$(RUBYW_INSTALL_NAME).res
$(LIBRUBY_A): $(OBJS) dmyext.obj
$(LIBRUBY_A): $(OBJS) $(DMYEXT)
@-if exist $@ del $@
$(AR) $(ARFLAGS) "$@" $(OBJS) dmyext.obj
$(AR) $(ARFLAGS) "$@" $(OBJS) $(DMYEXT)
# $(LIBRUBY): $(LIBRUBY_SO)
# implib $@ $(LIBRUBY_SO)
$(LIBRUBY_SO): $(LIBRUBY_A) $(EXTOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
@echo $(EXTOBJS)
$(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(EXTOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res
$(LIBRUBY_SO): $(LIBRUBY_A) $(DLDOBJS) $(RUBYDEF) $(RUBY_SO_NAME).res
@echo $(DLDOBJS)
$(LIBRUBY_LDSHARED) $(LIBRUBY_DLDFLAGS) $(DLDOBJS:/=\),$(LIBRUBY_SO),nul,$(LIBRUBY_A) $(LIBS),$(RUBYDEF),$(RUBY_SO_NAME).res
$(LIBRUBY): $(LIBRUBY_SO)

2
common.mk
View file

@ -9,6 +9,8 @@ RBCONFIG = ./.rbconfig.time
DMYEXT = dmyext.$(OBJEXT)
MAINOBJ = main.$(OBJEXT)
EXTOBJS =
DLDOBJS = $(DMYEXT)
OBJS = array.$(OBJEXT) \
bignum.$(OBJEXT) \

7
win32/Makefile.sub
View file

@ -168,9 +168,6 @@ EXTSTATIC =
OBJEXT = obj
EXTOBJS =
DLDOBJS =
WINMAINOBJ = winmain.$(OBJEXT)
MINIOBJS = dmydln.$(OBJEXT)
@ -210,9 +207,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/win32/Makefile.sub
#define HAVE_PROTOTYPES 1
#define TOKEN_PASTE(x,y) x##y
#define HAVE_STDARG_PROTOTYPES 1
#if _MSC_VER > 1100
!if $(MSC_VER) > 1100
#define NORETURN(x) __declspec(noreturn) x
#endif
!endif
#define HAVE_DECL_SYS_NERR 1
#define HAVE_LIMITS_H 1
#define HAVE_FCNTL_H 1

7
wince/Makefile.sub
View file

@ -172,9 +172,6 @@ EXTSTATIC =
OBJEXT = obj
EXTOBJS =
DLDOBJS =
WINMAINOBJ = wincemain.$(OBJEXT)
all: $(srcdir)/wince/Makefile.sub $(srcdir)/common.mk
@ -215,9 +212,9 @@ $(CONFIG_H): $(MKFILES) $(srcdir)/wince/Makefile.sub
#define HAVE_PROTOTYPES 1
#define TOKEN_PASTE(x,y) x##y
#define HAVE_STDARG_PROTOTYPES 1
#if _MSC_VER > 1100
!if $(MSC_VER) > 1100
#define NORETURN(x) __declspec(noreturn) x
#endif
!endif
#define HAVE_DECL_SYS_NERR 1
#define HAVE_FCNTL_H 1
#define HAVE_SYS_UTIME_H 1

1
wince/setup.mak
View file

@ -64,6 +64,7 @@ EXTOUT = $(EXTOUT)
MAJOR = RUBY_VERSION_MAJOR
MINOR = RUBY_VERSION_MINOR
TEENY = RUBY_VERSION_TEENY
MSC_VER = _MSC_VER
<<
-generic-: nul