1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* common.mk ({MSPEC,RUBYSPEC}_GIT_URL): moved from Makefine.in.

* {win32,bcc32}/Makefile.sub (update-rubyspec): added.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@16469 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-05-19 04:01:17 +00:00
parent c0687936b2
commit a96b6c282b
5 changed files with 59 additions and 14 deletions

View file

@ -1,3 +1,9 @@
Mon May 19 13:01:05 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk ({MSPEC,RUBYSPEC}_GIT_URL): moved from Makefine.in.
* {win32,bcc32}/Makefile.sub (update-rubyspec): added.
Mon May 19 11:53:45 2008 Akinori MUSHA <knu@iDaemons.org>
* ext/openssl/openssl_missing.c (HMAC_CTX_copy): adopted

View file

@ -182,9 +182,6 @@ distclean-local::
ext/extinit.$(OBJEXT): ext/extinit.c $(SETUP)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(OUTFLAG)$@ -c ext/extinit.c
MSPEC_GIT_URL=git://github.com/brixen/mspec.git
RUBYSPEC_GIT_URL=git://github.com/brixen/rubyspec.git
update-rubyspec:
if [ -d $(srcdir)/rubyspec ]; then \
cd $(srcdir)/rubyspec/mspec; \

View file

@ -471,6 +471,38 @@ distclean-local::
@$(RM) ext\config.cache $(RBCONFIG:/=\)
@$(RM) $(RUBY_INSTALL_NAME).rc $(RUBYW_INSTALL_NAME).rc $(RUBY_SO_NAME).rc
update-rubyspec:
@echo SPEC_EXISTS=0 > $@.mk
@if exist $(srcdir:/=\)\rubyspec\nul echo SPEC_EXISTS=1 >> $@.mk
@type >> $@.mk &&|
$()update-rubyspec:
$() @del $@.mk
$()!if $$(SPEC_EXISTS)
$() cd $(srcdir:/=\)\rubyspec\mspec
$() git pull
$() cd ..\spec\rubyspec
$() git pull
$()!else
$() git clone $(MSPEC_GIT_URL) $(srcdir)/rubyspec/mspec
$() git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec/rubyspec
$()!endif
|
@$(MAKE) -$(MAKEFLAGS)$(MFLAGS) -f $@.mk
test-rubyspec:
@echo SPEC_EXISTS=0 > $@.mk
@if exist $(srcdir:/=\)\rubyspec\nul echo SPEC_EXISTS=1 >> $@.mk
@type >> $@.mk &&|
$()test-rubyspec:
$()!if $$(SPEC_EXISTS)
$() $(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec -r$(srcdir)/ext/purelib.rb $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)
$()!else
$() @echo No rubyspec here. put rubyspec to srcdir first.
$() @cd $(srcdir:/=\)\rubyspec
$()!endif
|
@$(MAKE) -$(MAKEFLAGS) -f $@.mk
ext/extinit.obj: ext/extinit.c $(SETUP)
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -o$@ -c ext/extinit.c

View file

@ -5,6 +5,10 @@ dll: $(LIBRUBY_SO)
RUBYLIB = -
RUBYOPT = -
SPEC_GIT_BASE = git://github.com/brixen
MSPEC_GIT_URL = $(SPEC_GIT_BASE)/mspec.git
RUBYSPEC_GIT_URL = $(SPEC_GIT_BASE)/rubyspec.git
STATIC_RUBY = static-ruby
EXTCONF = extconf.rb

View file

@ -233,14 +233,6 @@ ASMEXT = asm
INSTALLED_LIST= .installed.list
!if [find "revision.h" $(srcdir:/=\)\version.h > nul 2> nul] == 0
REVISION_H = revision.h
REVISION_UP = revision-up
!else
REVISION_H = version.h
REVISION_UP =
!endif
!if !defined(WINMAINOBJ)
WINMAINOBJ = winmain.$(OBJEXT)
!endif
@ -639,10 +631,24 @@ class File
end
<<KEEP
test-rubyspec:
@if not exist $(srcdir:/=\)\rubyspec\nul echo No rubyspec here. put rubyspec to srcdir first. && exit 1
$(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec -r$(srcdir)/ext/purelib.rb $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)
update-rubyspec:
!if exist($(srcdir:/=\)\rubyspec)
cd $(srcdir:/=\)\rubyspec\mspec
git pull
cd ..\spec\rubyspec
git pull
!else
git clone $(MSPEC_GIT_URL) $(srcdir)/rubyspec/mspec
git clone $(RUBYSPEC_GIT_URL) $(srcdir)/rubyspec/spec/rubyspec
!endif
test-rubyspec:
!if exist($(srcdir:/=\)\rubyspec)
$(RUNRUBY) $(srcdir)/rubyspec/mspec/bin/mspec -r$(srcdir)/ext/purelib.rb $(srcdir)/rubyspec/spec/rubyspec/$(MAJOR).$(MINOR)
!else
@echo No rubyspec here. put rubyspec to srcdir first.
@cd $(srcdir:/=\)\rubyspec
!endif
{$(srcdir)/missing}.c.obj:
$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -c -Tc$(<:\=/)