From fe5554af85bf2e3363a62647d0bb68d4961dfeb9 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 27 Dec 2013 05:46:01 +0000 Subject: 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. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44446 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- template/verconf.h.in | 61 ------------------------------------------------- template/verconf.h.tmpl | 61 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 61 deletions(-) delete mode 100644 template/verconf.h.in create mode 100644 template/verconf.h.tmpl (limited to 'template') diff --git a/template/verconf.h.in b/template/verconf.h.in deleted file mode 100644 index 79c003e09f..0000000000 --- a/template/verconf.h.in +++ /dev/null @@ -1,61 +0,0 @@ -% 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 -% } diff --git a/template/verconf.h.tmpl b/template/verconf.h.tmpl new file mode 100644 index 0000000000..79c003e09f --- /dev/null +++ b/template/verconf.h.tmpl @@ -0,0 +1,61 @@ +% 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 +% } -- cgit v1.2.3