summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-19 05:44:47 +0000
committerknu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-05-19 05:44:47 +0000
commit6f84d49552fa56a2451d4ee500912475494641ef (patch)
tree1fb4061163718e382057e97526f75bd734d872cc /win32
parent8713948801f19dd03d2db5b3872da70ce7636df4 (diff)
Merge from ruby_1_8.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16475 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile.sub26
1 files changed, 16 insertions, 10 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub
index ab83ace2c5..85b58ac586 100644
--- a/win32/Makefile.sub
+++ b/win32/Makefile.sub
@@ -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
+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 not exist $(srcdir:/=\)\rubyspec\nul echo No rubyspec here. put rubyspec to srcdir first. && exit 1
+!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$(<:\=/)