BENCHRUBY more controllable from Makefile

`make benchmark` stuff moved from common.mk to Makefile.in to separate windows specific configurations.
Since cmd.exe does not support command-line substitution, utilize ruby.exe's argv wildcard expansion.
Since nmake holds command name macros using backslash path separators, properly convert them to avoid confusing the benchmark driver.

Author: YO4

common.mk

@@ -1385,18 +1385,11 @@ bisect: PHONY
 bisect-ruby: PHONY
 	$(tooldir)/bisect.sh ruby $(srcdir)
 
-COMPARE_RUBY = $(BASERUBY)
-BENCH_RUBY = $(RUNRUBY)
-BENCH_OPTS = --output=markdown --output-compare -v
-ITEM =
-ARGS = $$(find $(srcdir)/benchmark -maxdepth 1 -name '$(ITEM)' -o -name '*$(ITEM)*.yml' -o -name '*$(ITEM)*.rb' | sort)
-OPTS =
-
 # See benchmark/README.md for details.
 benchmark: miniruby$(EXEEXT) update-benchmark-driver PHONY
 	$(BASERUBY) -rrubygems -I$(srcdir)/benchmark/lib $(srcdir)/benchmark/benchmark-driver/exe/benchmark-driver \
-	            --executables="compare-ruby::$(COMPARE_RUBY) -I$(EXTOUT)/common --disable-gem" \
-	            --executables="built-ruby::$(BENCH_RUBY) --disable-gem" \
+	            --executables="compare-ruby::$(compare_ruby) -I$(EXTOUT)/common --disable-gem" \
+	            --executables="built-ruby::$(bench_ruby) --disable-gem" \
 	            $(BENCH_OPTS) $(ARGS) $(OPTS)
 
 run.gdb:

cygwin/GNUmakefile.in

@@ -43,6 +43,10 @@ endif
 
 WPROGRAM = $(RUBYW_INSTALL_NAME)$(EXEEXT)
 
+ifeq ($(target_os),mingw32)
+compare_ruby := $$(shell cygpath -ma $(firstword $(compare_ruby))) $(wordlist 2, $(words $(compare_ruby)), $(compare_ruby))
+endif
+
 include $(srcdir)/template/GNUmakefile.in
 
 SOLIBS := $(DLL_BASE_NAME).res.$(OBJEXT) $(SOLIBS)

template/Makefile.in

@@ -182,6 +182,16 @@ COROUTINE_H = @X_COROUTINE_H@
 COROUTINE_OBJ = $(COROUTINE_H:.h=.$(OBJEXT))
 COROUTINE_SRC = @X_COROUTINE_SRC@
 
+COMPARE_RUBY = $(BASERUBY)
+BENCH_RUBY = $(RUNRUBY)
+BENCH_OPTS = --output=markdown --output-compare -v
+ITEM =
+ARGS = $$(find $(srcdir)/benchmark -maxdepth 1 -name '$(ITEM)' -o -name '*$(ITEM)*.yml' -o -name '*$(ITEM)*.rb' | sort)
+OPTS =
+
+compare_ruby = $(COMPARE_RUBY)
+bench_ruby = $(BENCH_RUBY)
+
 #### End of system configuration section. ####
 
 MAJOR=	@MAJOR@

win32/Makefile.sub

@@ -409,6 +409,28 @@ STACK = $(STACK),$(STACK_COMMIT)
 !endif
 ORGLIBPATH = $(LIB)
 
+# benchmark related
+COMPARE_RUBY = $(BASERUBY)
+BENCH_RUBY = $(RUNRUBY)
+BENCH_OPTS = --output=markdown --output-compare -v
+!ifdef ITEM
+!if exist("$(srcdir)/benchmark/$(ITEM)")
+ARGS = $(ARGS) "$(srcdir)/benchmark/$(ITEM)"
+!endif
+!if [dir /B "$(srcdir:/=\)\benchmark\*$(ITEM:/=\)*.yml" >NUL 2>&1] == 0
+ARGS = $(ARGS) "$(srcdir)/benchmark/*$(ITEM)*.yml"
+!endif
+!if [dir /B "$(srcdir:/=\)\benchmark\*$(ITEM:/=\)*.rb" >NUL 2>&1] == 0
+ARGS = $(ARGS) "$(srcdir)/benchmark/*$(ITEM)*.rb"
+!endif
+!else
+ARGS = "$(srcdir)/benchmark/*.yml" "$(srcdir)/benchmark/*.rb"
+!endif
+OPTS =
+
+compare_ruby = $(COMPARE_RUBY:\=/)
+bench_ruby = $(BENCH_RUBY:\=/)
+
 #### End of system configuration section. ####
 
 LIBRUBY_A     = $(RUBY_SO_NAME)-static.lib