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

common.mk: UNICODE_FILES

Browse source 
* common.mk (UNICODE_FILES): revert the rule that Unicode data
  files depend on downloader target, and add missing dependency of
  lib/unicode_normalize/tables.rb

* common.mk (after-configure): removed as srcdir should be
  read-only after update.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-10-21 13:48:16 +00:00
parent 696141dab4
commit 42ca978656
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
common.mk
View file

@ -913,14 +913,19 @@ INSNS2VMOPT = --srcdir="$(srcdir)"
{$(VPATH)}vm.inc: $(srcdir)/template/vm.inc.tmpl
srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c {$(VPATH)}id.c srcs-ext srcs-enc
srcs: {$(VPATH)}parse.c {$(VPATH)}lex.c {$(VPATH)}newline.c {$(VPATH)}id.c \
srcs-lib srcs-ext srcs-enc
EXT_SRCS = $(srcdir)/ext/ripper/ripper.c $(srcdir)/ext/json/parser/parser.c \
$(srcdir)/ext/dl/callback/callback.c $(srcdir)/ext/rbconfig/sizeof/sizes.c
srcs-ext: $(EXT_SRCS)
srcs-enc: $(ENC_MK) lib/unicode_normalize/tables.rb
LIB_SRCS = $(srcdir)/lib/unicode_normalize/tables.rb
srcs-lib: $(LIB_SRCS)
srcs-enc: $(ENC_MK)
$(ECHO) making srcs under enc
$(Q) $(MAKE) -f $(ENC_MK) RUBY="$(MINIRUBY)" MINIRUBY="$(MINIRUBY)" $(MFLAGS) srcs
@ -1075,9 +1080,7 @@ dist:
up::
-$(Q)$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(REVISION_H)"
after-update:: after-configure update-gems
after-configure:: update-unicode
after-update:: update-unicode update-gems
update-config_files: PHONY
$(Q) $(BASERUBY) -C "$(srcdir)/tool" \
@ -1095,16 +1098,21 @@ update-gems: PHONY
# ALWAYS_UPDATE_UNICODE = yes
update-unicode: PHONY
UNICODE_FILES = $(srcdir)/enc/unicode/data/UnicodeData.txt \
$(srcdir)/enc/unicode/data/CompositionExclusions.txt \
$(srcdir)/enc/unicode/data/NormalizationTest.txt
update-unicode: $(UNICODE_FILES) PHONY
$(UNICODE_FILES):
$(ECHO) Downloading Unicode data files...
$(Q) $(MAKEDIRS) "$(srcdir)/enc/unicode/data"
$(Q) $(BASERUBY) -C "$(srcdir)/enc/unicode/data" \
../../../tool/downloader.rb -e $(ALWAYS_UPDATE_UNICODE:yes=-a) unicode \
UnicodeData.txt CompositionExclusions.txt NormalizationTest.txt
lib/unicode_normalize/tables.rb: $(srcdir)/tool/unicode_norm_gen.rb \
$(srcdir)/enc/unicode/data/UnicodeData.txt \
$(srcdir)/enc/unicode/data/CompositionExclusions.txt
$(srcdir)/lib/unicode_normalize/tables.rb: \
$(srcdir)/tool/unicode_norm_gen.rb $(UNICODE_FILES)
$(BASERUBY) -s -C "$(srcdir)" tool/unicode_norm_gen.rb \
-input=enc/unicode/data -ouput=lib/unicode_normalize

1
configure.in
View file

@ -4231,5 +4231,4 @@ AC_CONFIG_FILES($ruby_pc:template/ruby.pc.in,
AC_OUTPUT
}
${MAKE-make} after-configure
}

1
win32/setup.mak
View file

@ -218,5 +218,4 @@ $(CPU) = $(PROCESSOR_LEVEL)
$(BANG)include $$(srcdir)/win32/Makefile.sub
<<
@$(COMSPEC) /C $(srcdir:/=\)\win32\rm.bat config.h config.status
@$(MAKE) -l after-configure
@echo "type `nmake' to make ruby."