From 11ed0f75feb790287fbf7013c80a526e38dbbfe4 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Thu, 18 Feb 2010 10:35:21 +0200 Subject: [PATCH] Script/interpreter terminology renaming - No functional changes, just making more obvious mapping between attributes and the dependency extractor names. This also leaves the term "interpreter" free for use for the actual interpreters, such as interpreter(python) provides if we go that way (ticket #136). --- build/rpmfc.c | 10 +++++----- macros.in | 2 +- scripts/Makefile.am | 4 ++-- scripts/{interpreter.req => script.req} | 0 4 files changed, 8 insertions(+), 8 deletions(-) rename scripts/{interpreter.req => script.req} (100%) diff --git a/build/rpmfc.c b/build/rpmfc.c index 108e7ff..83e07e7 100644 --- a/build/rpmfc.c +++ b/build/rpmfc.c @@ -683,7 +683,7 @@ static int isExecutable(const char *fn) * @param fc file classifier * @return 0 on success */ -static int rpmfcINTERP(rpmfc fc) +static int rpmfcSCRIPT(rpmfc fc) { int rc = 0; int is_executable = isExecutable(fc->fn[fc->ix]); @@ -691,7 +691,7 @@ static int rpmfcINTERP(rpmfc fc) if (is_executable < 0) return -1; /* only executables are searched, and these can only be requires */ if (is_executable) - rc = rpmfcGenDeps(fc, "interpreter", DEP_REQ); + rc = rpmfcGenDeps(fc, "script", DEP_REQ); return rc; } @@ -700,7 +700,7 @@ static int rpmfcINTERP(rpmfc fc) * @param fc file classifier * @return 0 on success */ -static int rpmfcSCRIPT(rpmfc fc) +static int rpmfcLANG(rpmfc fc) { const char * fn = fc->fn[fc->ix]; ARGV_t fattrs = fc->fattrs[fc->ix]; @@ -778,8 +778,8 @@ typedef const struct rpmfcApplyTbl_s { */ static const struct rpmfcApplyTbl_s const rpmfcApplyTable[] = { { rpmfcELF, "elf" }, - { rpmfcINTERP, "script" }, - { rpmfcSCRIPT, "perl,python,mono,ocaml,pkgconfig,libtool" }, + { rpmfcSCRIPT, "script" }, + { rpmfcLANG, "perl,python,mono,ocaml,pkgconfig,libtool" }, { rpmfcMISC, "font,text" }, { NULL, 0 } }; diff --git a/macros.in b/macros.in index 063b1d9..6f4af7f 100644 --- a/macros.in +++ b/macros.in @@ -486,7 +486,7 @@ print (t)\ #%__perl_provides %{_rpmconfigdir}/perldeps.pl --provides #%__perl_requires %{_rpmconfigdir}/perldeps.pl --requires -%__interpreter_requires %{_rpmconfigdir}/interpreter.req +%__script_requires %{_rpmconfigdir}/script.req %__elf_provides %{_rpmconfigdir}/elfdeps --provides %{?__filter_GLIBC_PRIVATE:--filter-private} %__elf_requires %{_rpmconfigdir}/elfdeps --requires %{?__filter_GLIBC_PRIVATE:--filter-private} diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 905719b..a2152f5 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -20,7 +20,7 @@ EXTRA_DIST = \ mono-find-requires mono-find-provides \ ocaml-find-requires.sh ocaml-find-provides.sh \ pkgconfigdeps.sh libtooldeps.sh \ - fontconfig.prov desktop-file.prov interpreter.req \ + fontconfig.prov desktop-file.prov script.req \ macros.perl macros.php macros.python rpmconfig_SCRIPTS = \ @@ -34,7 +34,7 @@ rpmconfig_SCRIPTS = \ mono-find-requires mono-find-provides \ pkgconfigdeps.sh libtooldeps.sh \ ocaml-find-requires.sh ocaml-find-provides.sh \ - fontconfig.prov desktop-file.prov interpreter.req \ + fontconfig.prov desktop-file.prov script.req \ rpmdb_loadcvt rpmdiff rpm2cpio.sh tcl.req tgpg rpmconfig_DATA = \ diff --git a/scripts/interpreter.req b/scripts/script.req similarity index 100% rename from scripts/interpreter.req rename to scripts/script.req -- 2.7.4