diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-03 11:40:11 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-03 11:40:11 +0000 |
| commit | c2109f71a6ffde319d845558c07e6eac803aa21f (patch) | |
| tree | f327cbc644bb97a0992fd9299c5662eb72bb73e7 /win32 | |
| parent | 5002cf082f9f621c055cb77ff90658f74f5ff3b5 (diff) | |
merges r22592 from trunk into ruby_1_9_1.
--
* common.mk (main): split from exts and makes main program after
building exts with miniruby, to get rid of overwriting running
program. [ruby-core:22339]
* Makefile.in, win32/Makefile.sub (RUNCMD, MKMAIN_CMD): macros to
run script file.
* ext/extmk.rb (parse_args): added --command-output option which
creates script file to make main program.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@22737 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile.sub | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index c8bb336f4d..3d4f13024d 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -1,6 +1,7 @@ # -*- makefile -*- SHELL = $(COMSPEC) +RUNCMD = $(COMSPEC) /c MKFILES = Makefile NULL = nul @@ -258,6 +259,8 @@ ASMEXT = asm INSTALLED_LIST= .installed.list +MKMAIN_CMD = mkmain.bat + !if !defined(WINMAINOBJ) WINMAINOBJ = winmain.$(OBJEXT) !endif @@ -803,20 +806,15 @@ ext/extinit.obj: ext/extinit.c $(SETUP) $(INSNS): @$(RM) $(PROGRAM) -$(BASERUBY) -Ks $(srcdir)/tool/insns2vm.rb $(INSNS2VMOPT) $@ - if not exist $@ copy $(srcdir:/=\)\$(@F) $@ node_name.inc: -$(BASERUBY) -n $(srcdir)/tool/node_name.rb $? > $@ - if not exist $@ copy $(srcdir:/=\)\$(@F) $@ known_errors.inc: -$(BASERUBY) $(srcdir)/tool/generic_erb.rb -c -o $@ $(srcdir)/template/known_errors.inc.tmpl $(srcdir)/defs/known_errors.def - if not exist $@ copy $(srcdir:/=\)\$(@F) $@ miniprelude.c: -$(BASERUBY) -I$(srcdir) $(srcdir)/tool/compile_prelude.rb $(srcdir)/prelude.rb $@ - if not exist $@ copy $(srcdir:/=\)\$(@F) $@ newline.c: -$(BASERUBY) "$(srcdir)/tool/transcode-tblgen.rb" -vo newline.c $(srcdir)/enc/trans/newline.trans - if not exist $@ copy $(srcdir:/=\)\$(@F) $@ |