redoconf: a stub rc_include() now sources ./redoconf.rc automatically.

This lets us remove the awkward ". ./redoconf.rc" line from zillions of .od scripts, without paying the price of *always* including that whole file every time default.do.sh is used.
2019-03-02 04:23:05 -05:00 · 2019-03-02 04:23:05 -05:00 · 1a3c11f220
commit 1a3c11f220
parent 49f85f2156
34 changed files with 5 additions and 34 deletions
--- a/redoconf/compile.od
+++ b/redoconf/compile.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include _all.rc
 redo-ifchange _compile

--- a/redoconf/default.do.sh
+++ b/redoconf/default.do.sh
@ -14,6 +14,11 @@ die() {
    exit 99
 }

+rc_include() {
+	. ./redoconf.rc || exit 1  # redefines rc_include
+	rc_include "$@"
+}
+
 _mkdir_of() {
 	local dir="${1%/*}"
 	[ "$dir" = "$1" ] ||
--- a/redoconf/default.precompile.od
+++ b/redoconf/default.precompile.od
@ -4,7 +4,6 @@
 # Notably, we have to precompile any precompiled
 # headers.  We also generate redoconf.h in case
 # programs want to include it.
-. ./redoconf.rc
 rc_include _all.rc

 case ${1%.precompile} in
--- a/redoconf/link-shlib.od
+++ b/redoconf/link-shlib.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include _all.rc

 # Tricky quoting: see _compile.od for details.
--- a/redoconf/link.od
+++ b/redoconf/link.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include _all.rc

 # Tricky quoting: see _compile.od for details.
--- a/redoconf/rc/CC.rc.od
+++ b/redoconf/rc/CC.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include

 rc_helpmsg ARCH "Architecture prefix for output (eg. i686-w64-mingw32-)"
--- a/redoconf/rc/CXX.rc.od
+++ b/redoconf/rc/CXX.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include rc/CC.rc

 rc_helpmsg CXX "C++ compiler name (c++)"
--- a/redoconf/rc/Wall.rc.od
+++ b/redoconf/rc/Wall.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include rc/CC.rc

 rc_appendln CPPFLAGS "-Wall"
--- a/redoconf/rc/Wextra.rc.od
+++ b/redoconf/rc/Wextra.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include rc/CC.rc

 rc_appendln CPPFLAGS "-Wextra"
--- a/redoconf/rc/default.autolib.rc.od
+++ b/redoconf/rc/default.autolib.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include rc/CC.rc

 base="${1#*/}"
--- a/redoconf/rc/default.h.precompiled.rc.od
+++ b/redoconf/rc/default.h.precompiled.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include rc/CC.rc

 base="${1#rc/}"
--- a/redoconf/rc/default.h.rc.od
+++ b/redoconf/rc/default.h.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include rc/CC.rc

 base="${1#*/}"
--- a/redoconf/rc/default.hpp.precompiled.rc.od
+++ b/redoconf/rc/default.hpp.precompiled.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include rc/CXX.rc

 base="${1#rc/}"
--- a/redoconf/rc/default.required.rc.od
+++ b/redoconf/rc/default.required.rc.od
@ -1,5 +1,3 @@
-. ./redoconf.rc
-
 base=${1%.required.rc}
 name=${base#*/}
 NAME=$(echo "$name" | tr 'a-z.' 'A-Z_')
--- a/redoconf/rc/libgl.rc.od
+++ b/redoconf/rc/libgl.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include rc/CC.rc rc/pkg-config.rc

 prog='
--- a/redoconf/rc/libgtk2.rc.od
+++ b/redoconf/rc/libgtk2.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include rc/CC.rc rc/pkg-config.rc

 prog='
--- a/redoconf/rc/libm.rc.od
+++ b/redoconf/rc/libm.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include rc/CC.rc rc/pkg-config.rc

 prog='
--- a/redoconf/rc/libpng.rc.od
+++ b/redoconf/rc/libpng.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include rc/CC.rc rc/pkg-config.rc

 prog='
--- a/redoconf/rc/libqt4.rc.od
+++ b/redoconf/rc/libqt4.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include rc/CXX.rc rc/pkg-config.rc

 prog='
--- a/redoconf/rc/libsdl.rc.od
+++ b/redoconf/rc/libsdl.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include rc/CC.rc rc/pkg-config.rc

 prog='
--- a/redoconf/rc/libssl.rc.od
+++ b/redoconf/rc/libssl.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include rc/CC.rc rc/pkg-config.rc

 prog="
--- a/redoconf/rc/libx11.rc.od
+++ b/redoconf/rc/libx11.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include rc/CC.rc rc/pkg-config.rc

 prog='
--- a/redoconf/rc/pkg-config.rc.od
+++ b/redoconf/rc/pkg-config.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include

 for d in "$PKG_CONFIG" pkg-config; do
--- a/redoconf/rc/run.rc.od
+++ b/redoconf/rc/run.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include rc/CC.rc rc/windows.h.rc

 consider() {
--- a/redoconf/rc/shlib.rc.od
+++ b/redoconf/rc/shlib.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include rc/CC.rc

 prog='
--- a/redoconf/rc/zdefs.rc.od
+++ b/redoconf/rc/zdefs.rc.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include rc/CC.rc

 x="-Wl,-z,defs"
--- a/redoconf/run.od
+++ b/redoconf/run.od
@ -1,4 +1,3 @@
-. ./redoconf.rc
 rc_include rc/run.rc

 if [ -n "$CAN_RUN" ]; then