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

ruby-changes:43604

From: nobu <ko1@a...>
Date: Thu, 14 Jul 2016 15:46:59 +0900 (JST)
Subject: [ruby-changes:43604] nobu:r55677 (trunk): make-snapshot: fix VPATH regexp [ci skip]

nobu	2016-07-14 15:46:53 +0900 (Thu, 14 Jul 2016)

  New Revision: 55677

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

  Log:
    make-snapshot: fix VPATH regexp [ci skip]
    
    * tool/make-snapshot (package): replace nmake style VPATH in
      common.mk by regexp same as one for uncommon.mk, not to replace
      too much, BEGIN and END in awk and ruby.

  Modified files:
    trunk/tool/make-snapshot
Index: tool/make-snapshot
===================================================================
--- tool/make-snapshot	(revision 55676)
+++ tool/make-snapshot	(revision 55677)
@@ -311,7 +311,7 @@ def package(vcs, rev, destdir, tmp = nil https://github.com/ruby/ruby/blob/trunk/tool/make-snapshot#L311
       }
       args = vars.dup
       mk.gsub!(/@([A-Za-z_]\w*)@/) {args.delete($1); vars[$1] || ENV[$1]}
-      mk << commonmk.gsub(/(?<!#)\{[^{}]*\}/, "")
+      mk << commonmk.gsub(/\{\$([^(){}]*)[^{}]*\}/, "")
       mk << <<-'APPEND'
 
 prereq: clean-cache $(CLEAN_CACHE)

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

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