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

Make file names and variable names consistent

Browse source
This commit is contained in:
Takashi Kokubun 2020-03-23 22:31:38 -07:00
parent 6ab3664635
commit 5b3157a511
No known key found for this signature in database
GPG key ID: 6FFC433B12EE23DD
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common.mk
View file

@ -224,9 +224,9 @@ mjit_config.h: Makefile
# Other `-Dxxx`s preceding `-DMJIT_HEADER` will be removed in transform_mjit_header.rb.
# So `-DMJIT_HEADER` should be passed first when rb_mjit_header.h is generated.
$(TIMESTAMPDIR)/$(MJIT_HEADER:.h=)$(MJIT_HEADER_SUFFIX).time: probes.h vm.$(OBJEXT) \
$(TIMESTAMPDIR)/$(arch)/.time $(srcdir)/tool/mjit_without_tabs.rb
$(TIMESTAMPDIR)/$(arch)/.time $(srcdir)/tool/mjit_tabs.rb
$(ECHO) building $(@F:.time=.h)
$(Q) $(BASERUBY) $(srcdir)/tool/mjit_without_tabs.rb "$(MJIT_WITHOUT_TABS)" \
$(Q) $(BASERUBY) $(srcdir)/tool/mjit_tabs.rb "$(MJIT_TABS)" \
$(CPP) -DMJIT_HEADER $(MJIT_HEADER_FLAGS) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) $(srcdir)/vm.c $(CPPOUTFLAG)$(@F:.time=.h).new
$(Q) $(IFCHANGE) "--timestamp=$@" $(@F:.time=.h) $(@F:.time=.h).new

6
configure.ac
View file

@ -2616,9 +2616,9 @@ AS_CASE(["$target_os"],
LIBEXT=a
AC_ARG_WITH(mjit-tabs,
AS_HELP_STRING([--without-tabs-mjit], [expand tabs in mjit header]),
[AS_IF([test $withval = no], [MJIT_WITHOUT_TABS=true])])
AC_SUBST(MJIT_WITHOUT_TABS)dnl
AS_HELP_STRING([--without-mjit-tabs], [expand tabs in mjit header]),
[AS_IF([test $withval = no], [MJIT_TABS=false])])
AC_SUBST(MJIT_TABS)dnl
AC_SUBST(DLDFLAGS)dnl
AC_SUBST(ARCH_FLAG)dnl
AC_SUBST(MJIT_HEADER_FLAGS)dnl

2
template/Makefile.in
View file

@ -102,7 +102,7 @@ MJIT_HEADER = rb_mjit_header.h
MJIT_MIN_HEADER_NAME = rb_mjit_min_header-$(RUBY_PROGRAM_VERSION).h
MJIT_MIN_HEADER = $(MJIT_HEADER_BUILD_DIR)/$(MJIT_MIN_HEADER_NAME)
MJIT_HEADER_BUILD_DIR = $(EXTOUT)/include/$(arch)
MJIT_WITHOUT_TABS=@MJIT_WITHOUT_TABS@
MJIT_TABS=@MJIT_TABS@
LDFLAGS = @STATIC@ $(CFLAGS) @LDFLAGS@
EXTLDFLAGS = @EXTLDFLAGS@
XLDFLAGS = @XLDFLAGS@ $(EXTLDFLAGS)

8
tool/mjit_without_tabs.rb → tool/mjit_tabs.rb
View file

@ -1,7 +1,7 @@
# frozen_string_literal: true
# This is a script to run a command in ARGV, expanding tabs in some files
# included by vm.c to normalize indentation of MJIT header. You can disable
# this feature by setting MJIT_WITHOUT_TABS=false make variable.
# included by vm.c to normalize indentation of MJIT header. You can enable
# this feature by passing `--without-mjit-tabs` in configure.
#
# Note that preprocessor of GCC converts a hard tab to one spaces, where
# we expect it to be shown as 8 spaces. To obviate this script, we need
@ -27,10 +27,10 @@ targets = EXPAND_TARGETS.flat_map { |t| Dir.glob(File.join(srcdir, t)) } - SKIPP
sources = {}
mtimes = {}
flag, *command = ARGV
mjit_tabs, *command = ARGV
targets.each do |target|
next if flag != 'true'
next if mjit_tabs != 'false'
unless File.writable?(target)
puts "tool/mjit_without_tabs.rb: Skipping #{target.dump} as it's not writable."
next