[前][次][番号順一覧][スレッド一覧]

ruby-changes:35988

From: nobu <ko1@a...>
Date: Tue, 21 Oct 2014 14:22:59 +0900 (JST)
Subject: [ruby-changes:35988] nobu:r48069 (trunk): common.mk: after-configure

nobu	2014-10-21 14:17:32 +0900 (Tue, 21 Oct 2014)

  New Revision: 48069

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=48069

  Log:
    common.mk: after-configure
    
    * common.mk (after-configure): update Unicode files after
      configure run.

  Modified files:
    trunk/common.mk
    trunk/configure.in
    trunk/win32/setup.mak
Index: configure.in
===================================================================
--- configure.in	(revision 48068)
+++ configure.in	(revision 48069)
@@ -46,9 +46,6 @@ if test "`RUBYOPT=- $BASERUBY -e 'p 42' https://github.com/ruby/ruby/blob/trunk/configure.in#L46
 	BASERUBY="$BASERUBY --disable=gems"
     fi
     $BASERUBY -C "$srcdir/tool" downloader.rb -e gnu config.guess config.sub
-    $BASERUBY -C "$srcdir/enc/unicode/data" \
-	    ../../../tool/downloader.rb -e ${ALWAYS_UPDATE_UNICODE+-a} unicode \
-	    UnicodeData.txt CompositionExclusions.txt NormalizationTest.txt
 else
     BASERUBY="echo executable host ruby is required.  use --with-baseruby option.; false"
 fi
@@ -4234,4 +4231,5 @@ AC_CONFIG_FILES($ruby_pc:template/ruby.p https://github.com/ruby/ruby/blob/trunk/configure.in#L4231
 
 AC_OUTPUT
 }
+${MAKE-make} after-configure
 }
Index: common.mk
===================================================================
--- common.mk	(revision 48068)
+++ common.mk	(revision 48069)
@@ -1075,7 +1075,9 @@ dist: https://github.com/ruby/ruby/blob/trunk/common.mk#L1075
 up::
 	-$(Q)$(MAKE) $(MFLAGS) REVISION_FORCE=PHONY "$(REVISION_H)"
 
-after-update:: update-unicode update-gems
+after-update:: after-configure update-gems
+
+after-configure:: update-unicode
 
 update-config_files: PHONY
 	$(Q) $(BASERUBY) -C "$(srcdir)/tool" \
Index: win32/setup.mak
===================================================================
--- win32/setup.mak	(revision 48068)
+++ win32/setup.mak	(revision 48069)
@@ -218,4 +218,5 @@ $(CPU) = $(PROCESSOR_LEVEL) https://github.com/ruby/ruby/blob/trunk/win32/setup.mak#L218
 $(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."

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]