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: update unicode data only if BASERUBY is available

Browse source 
* common.mk (lib/unicode_normalize/tables.rb): do nothing unless
  BASERUBY is available.  MINIRUBY cannot load extension libraries,
  so cannot update Unicode data.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48278 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2014-11-05 05:11:33 +00:00
parent 62ede28373
commit ef8139db13
5 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Wed Nov 5 14:11:30 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (lib/unicode_normalize/tables.rb): do nothing unless
BASERUBY is available. MINIRUBY cannot load extension libraries,
so cannot update Unicode data.
Wed Nov 5 12:13:54 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Nov 5 12:13:54 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (rb_str_lstrip, rb_str_strip): reduce memory copy by * string.c (rb_str_lstrip, rb_str_strip): reduce memory copy by

1
Makefile.in
View file

@ -25,6 +25,7 @@ AUTOCONF = autoconf
@SET_MAKE@ @SET_MAKE@
MKFILES = @MAKEFILES@ MKFILES = @MAKEFILES@
BASERUBY = @BASERUBY@ BASERUBY = @BASERUBY@
HAVE_BASERUBY = @HAVE_BASERUBY@
TEST_RUNNABLE = @TEST_RUNNABLE@ TEST_RUNNABLE = @TEST_RUNNABLE@
CROSS_COMPILING = @CROSS_COMPILING@ CROSS_COMPILING = @CROSS_COMPILING@
DOXYGEN = @DOXYGEN@ DOXYGEN = @DOXYGEN@

2
common.mk
View file

@ -1124,7 +1124,7 @@ download-unicode-data: ./.unicode-$(UNICODE_VERSION).time
$(UNICODE_VERSION)/ucd/NormalizationTest.txt $(UNICODE_VERSION)/ucd/NormalizationTest.txt
@exit > $@ @exit > $@
$(srcdir)/lib/unicode_normalize/tables.rb: ./.unicode-tables.time $(srcdir)/$(HAVE_BASERUBY:yes=lib/unicode_normalize/tables.rb): ./.unicode-tables.time
./.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \ ./.unicode-tables.time: $(srcdir)/tool/generic_erb.rb \
$(UNICODE_FILES) $(UNICODE_FILES_DEPS) \ $(UNICODE_FILES) $(UNICODE_FILES_DEPS) \

3
configure.in
View file

@ -46,10 +46,13 @@ if test "`RUBYOPT=- $BASERUBY -e 'p 42' 2>/dev/null`" = 42; then
BASERUBY="$BASERUBY --disable=gems" BASERUBY="$BASERUBY --disable=gems"
fi fi
$BASERUBY -C "$srcdir/tool" downloader.rb -e gnu config.guess config.sub $BASERUBY -C "$srcdir/tool" downloader.rb -e gnu config.guess config.sub
HAVE_BASERUBY=yes
else else
BASERUBY="echo executable host ruby is required. use --with-baseruby option.; false" BASERUBY="echo executable host ruby is required. use --with-baseruby option.; false"
HAVE_BASERUBY=no
fi fi
AC_SUBST(BASERUBY) AC_SUBST(BASERUBY)
AC_SUBST(HAVE_BASERUBY)
AC_DEFUN([RUBY_MINGW32], AC_DEFUN([RUBY_MINGW32],
[AS_CASE(["$host_os"], [AS_CASE(["$host_os"],

7
win32/setup.mak
View file

@ -66,7 +66,14 @@ USE_RUBYGEMS = $(USE_RUBYGEMS)
@for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I>> $(MAKEFILE) @for %I in (ruby.exe) do @echo BASERUBY = %~s$$PATH:I>> $(MAKEFILE)
@echo !if "$$(BASERUBY)" == "">> $(MAKEFILE) @echo !if "$$(BASERUBY)" == "">> $(MAKEFILE)
@echo BASERUBY = echo executable host ruby is required. use --with-baseruby option.^& exit 1 >> $(MAKEFILE) @echo BASERUBY = echo executable host ruby is required. use --with-baseruby option.^& exit 1 >> $(MAKEFILE)
@echo HAVE_BASERUBY = no>> $(MAKEFILE)
@echo !else>> $(MAKEFILE)
@echo HAVE_BASERUBY = yes>> $(MAKEFILE)
@echo !endif>> $(MAKEFILE) @echo !endif>> $(MAKEFILE)
!elseif [$(BASERUBY) -eexit 2> nul] == 0
@echo HAVE_BASERUBY = yes>> $(MAKEFILE)
!else
@echo HAVE_BASERUBY = no>> $(MAKEFILE)
!endif !endif
-system-vars-: -osname- -runtime- -headers- -system-vars-: -osname- -runtime- -headers-