ruby-changes:32367
From: nobu <ko1@a...>
Date: Fri, 27 Dec 2013 14:46:10 +0900 (JST)
Subject: [ruby-changes:32367] nobu:r44446 (trunk): verconf.h.tmpl: rename
nobu 2013-12-27 14:46:01 +0900 (Fri, 27 Dec 2013) New Revision: 44446 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=44446 Log: verconf.h.tmpl: rename * template/verconf.h.tmpl: rename from .in since this is an erb template file, but not for config.status. * common.mk (verconf.h): rename the dependent. Added files: trunk/template/verconf.h.tmpl Removed files: trunk/template/verconf.h.in Modified files: trunk/common.mk Index: common.mk =================================================================== --- common.mk (revision 44445) +++ common.mk (revision 44446) @@ -843,9 +843,9 @@ newline.$(OBJEXT): $(NEWLINE_C) {$(VPATH https://github.com/ruby/ruby/blob/trunk/common.mk#L843 {$(VPATH)}intern.h {$(VPATH)}missing.h {$(VPATH)}st.h \ {$(VPATH)}transcode_data.h {$(VPATH)}ruby.h {$(VPATH)}config.h {$(VPATH)}subst.h -verconf.h: $(srcdir)/template/verconf.h.in $(srcdir)/tool/generic_erb.rb $(RBCONFIG) +verconf.h: $(srcdir)/template/verconf.h.tmpl $(srcdir)/tool/generic_erb.rb $(RBCONFIG) $(ECHO) creating $@ - $(Q) $(MINIRUBY) "$(srcdir)/tool/generic_erb.rb" $(srcdir)/template/verconf.h.in > $@ + $(Q) $(MINIRUBY) "$(srcdir)/tool/generic_erb.rb" $(srcdir)/template/verconf.h.tmpl > $@ DTRACE_DEPENDENT_OBJS = array.$(OBJEXT) \ eval.$(OBJEXT) \ Index: template/verconf.h.in =================================================================== --- template/verconf.h.in (revision 44445) +++ template/verconf.h.in (revision 44446) @@ -1,61 +0,0 @@ https://github.com/ruby/ruby/blob/trunk/template/verconf.h.in#L0 -% require './rbconfig' -% C = RbConfig::MAKEFILE_CONFIG.dup -% def C.[](name) str = super and (str unless str.empty?); end -#define RUBY_BASE_NAME "${RUBY_BASE_NAME}" -#define RUBY_VERSION_NAME RUBY_BASE_NAME"-"RUBY_LIB_VERSION -% if C["RUBY_LIB_VERSION_STYLE"] -#define RUBY_LIB_VERSION_STYLE ${RUBY_LIB_VERSION_STYLE} -% elsif !C["RUBY_LIB_VERSION"] -#define RUBY_LIB_VERSION_STYLE 3 /* full */ -% else -#define RUBY_LIB_VERSION ${RUBY_LIB_VERSION} -% end -#define RUBY_EXEC_PREFIX "<%='${RUBY_EXEC_PREFIX}' if C['RUBY_EXEC_PREFIX']%>" -#define RUBY_LIB_PREFIX "${rubylibprefix}" -% unless (sitearch = C["sitearch"]) == '$(arch)' -#define RUBY_SITEARCH "<%=sitearch%>" -% end -#define RUBY_ARCH_PREFIX_FOR(arch) "${rubyarchprefix}" -#define RUBY_SITEARCH_PREFIX_FOR(arch) "${rubysitearchprefix}" -#define RUBY_LIB "${rubylibdir}" -#define RUBY_ARCH_LIB_FOR(arch) "${rubyarchdir}" -% if C["sitedir"] == "no" -#define NO_RUBY_SITE_LIB 1 -% else -#define RUBY_SITE_LIB "${sitedir}" -#define RUBY_SITE_ARCH_LIB_FOR(arch) "${sitearchdir}" -% end -% if C["vendordir"] == "no" -#define NO_RUBY_VENDOR_LIB 1 -% else -#define RUBY_VENDOR_LIB "${vendordir}" -#define RUBY_VENDOR_ARCH_LIB_FOR(arch) "${vendorarchdir}" -% end -% if C["RUBY_SEARCH_PATH"] -#define RUBY_SEARCH_PATH "${RUBY_SEARCH_PATH}" -% end -% -% R = {} -% R["ruby_version"] = '"RUBY_LIB_VERSION"' -% R["arch"] = '"arch"' -% R["sitearch"] = '"arch"' -% R["vendorlibdir"] = '"RUBY_VENDOR_LIB2"' -% R["sitelibdir"] = '"RUBY_SITE_LIB2"' -% R["vendordir"] = '"RUBY_VENDOR_LIB"' -% R["sitedir"] = '"RUBY_SITE_LIB"' -% R["rubylibdir"] = '"RUBY_LIB"' -% R["rubylibprefix"] = '"RUBY_LIB_PREFIX"' -% R["rubyarchprefix"] = '"RUBY_ARCH_PREFIX_FOR(arch)"' -% R["rubysitearchprefix"] = '"RUBY_SITEARCH_PREFIX_FOR(arch)"' -% R["exec_prefix"] = '"RUBY_EXEC_PREFIX"' -% R["prefix"] = '"RUBY_EXEC_PREFIX"' -% exec_prefix_pat = /\A"#{Regexp.quote(RbConfig::CONFIG['exec_prefix'])}(?=\/|\z)/ -% _erbout.gsub!(/^(#define\s+(\S+)\s+)(.*)/) { -% pre, name, repl = $1, $2, $3 -% pat = %["#{name}"] -% c = C.merge(R.reject {|key, value| key == name or value.include?(pat)}) -% RbConfig.expand(repl, c) -% repl.gsub!(/^""(?!$)|(.)""$/, '\1') -% repl.sub!(exec_prefix_pat, 'RUBY_EXEC_PREFIX"') -% pre + repl -% } Index: template/verconf.h.tmpl =================================================================== --- template/verconf.h.tmpl (revision 0) +++ template/verconf.h.tmpl (revision 44446) @@ -0,0 +1,61 @@ https://github.com/ruby/ruby/blob/trunk/template/verconf.h.tmpl#L1 +% require './rbconfig' +% C = RbConfig::MAKEFILE_CONFIG.dup +% def C.[](name) str = super and (str unless str.empty?); end +#define RUBY_BASE_NAME "${RUBY_BASE_NAME}" +#define RUBY_VERSION_NAME RUBY_BASE_NAME"-"RUBY_LIB_VERSION +% if C["RUBY_LIB_VERSION_STYLE"] +#define RUBY_LIB_VERSION_STYLE ${RUBY_LIB_VERSION_STYLE} +% elsif !C["RUBY_LIB_VERSION"] +#define RUBY_LIB_VERSION_STYLE 3 /* full */ +% else +#define RUBY_LIB_VERSION ${RUBY_LIB_VERSION} +% end +#define RUBY_EXEC_PREFIX "<%='${RUBY_EXEC_PREFIX}' if C['RUBY_EXEC_PREFIX']%>" +#define RUBY_LIB_PREFIX "${rubylibprefix}" +% unless (sitearch = C["sitearch"]) == '$(arch)' +#define RUBY_SITEARCH "<%=sitearch%>" +% end +#define RUBY_ARCH_PREFIX_FOR(arch) "${rubyarchprefix}" +#define RUBY_SITEARCH_PREFIX_FOR(arch) "${rubysitearchprefix}" +#define RUBY_LIB "${rubylibdir}" +#define RUBY_ARCH_LIB_FOR(arch) "${rubyarchdir}" +% if C["sitedir"] == "no" +#define NO_RUBY_SITE_LIB 1 +% else +#define RUBY_SITE_LIB "${sitedir}" +#define RUBY_SITE_ARCH_LIB_FOR(arch) "${sitearchdir}" +% end +% if C["vendordir"] == "no" +#define NO_RUBY_VENDOR_LIB 1 +% else +#define RUBY_VENDOR_LIB "${vendordir}" +#define RUBY_VENDOR_ARCH_LIB_FOR(arch) "${vendorarchdir}" +% end +% if C["RUBY_SEARCH_PATH"] +#define RUBY_SEARCH_PATH "${RUBY_SEARCH_PATH}" +% end +% +% R = {} +% R["ruby_version"] = '"RUBY_LIB_VERSION"' +% R["arch"] = '"arch"' +% R["sitearch"] = '"arch"' +% R["vendorlibdir"] = '"RUBY_VENDOR_LIB2"' +% R["sitelibdir"] = '"RUBY_SITE_LIB2"' +% R["vendordir"] = '"RUBY_VENDOR_LIB"' +% R["sitedir"] = '"RUBY_SITE_LIB"' +% R["rubylibdir"] = '"RUBY_LIB"' +% R["rubylibprefix"] = '"RUBY_LIB_PREFIX"' +% R["rubyarchprefix"] = '"RUBY_ARCH_PREFIX_FOR(arch)"' +% R["rubysitearchprefix"] = '"RUBY_SITEARCH_PREFIX_FOR(arch)"' +% R["exec_prefix"] = '"RUBY_EXEC_PREFIX"' +% R["prefix"] = '"RUBY_EXEC_PREFIX"' +% exec_prefix_pat = /\A"#{Regexp.quote(RbConfig::CONFIG['exec_prefix'])}(?=\/|\z)/ +% _erbout.gsub!(/^(#define\s+(\S+)\s+)(.*)/) { +% pre, name, repl = $1, $2, $3 +% pat = %["#{name}"] +% c = C.merge(R.reject {|key, value| key == name or value.include?(pat)}) +% RbConfig.expand(repl, c) +% repl.gsub!(/^""(?!$)|(.)""$/, '\1') +% repl.sub!(exec_prefix_pat, 'RUBY_EXEC_PREFIX"') +% pre + repl +% } Property changes on: template/verconf.h.tmpl ___________________________________________________________________ Added: svn:eol-style + LF -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/