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.
This commit is contained in:
Avery Pennarun
parent
49f85f2156
commit
1a3c11f220
34 changed files with 5 additions and 34 deletions
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include \
|
rc_include \
|
||||||
rc/CC.required.rc \
|
rc/CC.required.rc \
|
||||||
rc/CXX.rc \
|
rc/CXX.rc \
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
# Demonstrate how to compile .o files using nonstandard
|
# Demonstrate how to compile .o files using nonstandard
|
||||||
# compiler flags. You could also do this for a whole
|
# compiler flags. You could also do this for a whole
|
||||||
# directory using default.o.od.
|
# directory using default.o.od.
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include all.rc
|
rc_include all.rc
|
||||||
|
|
||||||
src="$S/${1%.o}.c"
|
src="$S/${1%.o}.c"
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,5 @@
|
||||||
# This script is run from the output dir.
|
# This script is run from the output dir.
|
||||||
# The source dir is at $S.
|
# The source dir is at $S.
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include all.rc
|
rc_include all.rc
|
||||||
redo-ifchange "$S/sources"
|
redo-ifchange "$S/sources"
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CC.rc rc/rt.autolib.rc rc/posix.rc
|
rc_include rc/CC.rc rc/rt.autolib.rc rc/posix.rc
|
||||||
|
|
||||||
prog="
|
prog="
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include
|
rc_include
|
||||||
|
|
||||||
rc_appendln CPPFLAGS "-DEXTRA_RC_INCLUDED=1"
|
rc_appendln CPPFLAGS "-DEXTRA_RC_INCLUDED=1"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CC.rc
|
rc_include rc/CC.rc
|
||||||
|
|
||||||
prog='
|
prog='
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CC.rc rc/windows.h.rc rc/Wall.rc
|
rc_include rc/CC.rc rc/windows.h.rc rc/Wall.rc
|
||||||
|
|
||||||
appendln CPPFLAGS "-Werror" # abort if any warnings
|
appendln CPPFLAGS "-Werror" # abort if any warnings
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include _all.rc
|
rc_include _all.rc
|
||||||
redo-ifchange _compile
|
redo-ifchange _compile
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,6 +14,11 @@ die() {
|
||||||
exit 99
|
exit 99
|
||||||
}
|
}
|
||||||
|
|
||||||
|
rc_include() {
|
||||||
|
. ./redoconf.rc || exit 1 # redefines rc_include
|
||||||
|
rc_include "$@"
|
||||||
|
}
|
||||||
|
|
||||||
_mkdir_of() {
|
_mkdir_of() {
|
||||||
local dir="${1%/*}"
|
local dir="${1%/*}"
|
||||||
[ "$dir" = "$1" ] ||
|
[ "$dir" = "$1" ] ||
|
||||||
|
|
|
||||||
|
|
@ -4,7 +4,6 @@
|
||||||
# Notably, we have to precompile any precompiled
|
# Notably, we have to precompile any precompiled
|
||||||
# headers. We also generate redoconf.h in case
|
# headers. We also generate redoconf.h in case
|
||||||
# programs want to include it.
|
# programs want to include it.
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include _all.rc
|
rc_include _all.rc
|
||||||
|
|
||||||
case ${1%.precompile} in
|
case ${1%.precompile} in
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include _all.rc
|
rc_include _all.rc
|
||||||
|
|
||||||
# Tricky quoting: see _compile.od for details.
|
# Tricky quoting: see _compile.od for details.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include _all.rc
|
rc_include _all.rc
|
||||||
|
|
||||||
# Tricky quoting: see _compile.od for details.
|
# Tricky quoting: see _compile.od for details.
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include
|
rc_include
|
||||||
|
|
||||||
rc_helpmsg ARCH "Architecture prefix for output (eg. i686-w64-mingw32-)"
|
rc_helpmsg ARCH "Architecture prefix for output (eg. i686-w64-mingw32-)"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CC.rc
|
rc_include rc/CC.rc
|
||||||
|
|
||||||
rc_helpmsg CXX "C++ compiler name (c++)"
|
rc_helpmsg CXX "C++ compiler name (c++)"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CC.rc
|
rc_include rc/CC.rc
|
||||||
|
|
||||||
rc_appendln CPPFLAGS "-Wall"
|
rc_appendln CPPFLAGS "-Wall"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CC.rc
|
rc_include rc/CC.rc
|
||||||
|
|
||||||
rc_appendln CPPFLAGS "-Wextra"
|
rc_appendln CPPFLAGS "-Wextra"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CC.rc
|
rc_include rc/CC.rc
|
||||||
|
|
||||||
base="${1#*/}"
|
base="${1#*/}"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CC.rc
|
rc_include rc/CC.rc
|
||||||
|
|
||||||
base="${1#rc/}"
|
base="${1#rc/}"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CC.rc
|
rc_include rc/CC.rc
|
||||||
|
|
||||||
base="${1#*/}"
|
base="${1#*/}"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CXX.rc
|
rc_include rc/CXX.rc
|
||||||
|
|
||||||
base="${1#rc/}"
|
base="${1#rc/}"
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
|
|
||||||
base=${1%.required.rc}
|
base=${1%.required.rc}
|
||||||
name=${base#*/}
|
name=${base#*/}
|
||||||
NAME=$(echo "$name" | tr 'a-z.' 'A-Z_')
|
NAME=$(echo "$name" | tr 'a-z.' 'A-Z_')
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CC.rc rc/pkg-config.rc
|
rc_include rc/CC.rc rc/pkg-config.rc
|
||||||
|
|
||||||
prog='
|
prog='
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CC.rc rc/pkg-config.rc
|
rc_include rc/CC.rc rc/pkg-config.rc
|
||||||
|
|
||||||
prog='
|
prog='
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CC.rc rc/pkg-config.rc
|
rc_include rc/CC.rc rc/pkg-config.rc
|
||||||
|
|
||||||
prog='
|
prog='
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CC.rc rc/pkg-config.rc
|
rc_include rc/CC.rc rc/pkg-config.rc
|
||||||
|
|
||||||
prog='
|
prog='
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CXX.rc rc/pkg-config.rc
|
rc_include rc/CXX.rc rc/pkg-config.rc
|
||||||
|
|
||||||
prog='
|
prog='
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CC.rc rc/pkg-config.rc
|
rc_include rc/CC.rc rc/pkg-config.rc
|
||||||
|
|
||||||
prog='
|
prog='
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CC.rc rc/pkg-config.rc
|
rc_include rc/CC.rc rc/pkg-config.rc
|
||||||
|
|
||||||
prog="
|
prog="
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CC.rc rc/pkg-config.rc
|
rc_include rc/CC.rc rc/pkg-config.rc
|
||||||
|
|
||||||
prog='
|
prog='
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include
|
rc_include
|
||||||
|
|
||||||
for d in "$PKG_CONFIG" pkg-config; do
|
for d in "$PKG_CONFIG" pkg-config; do
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CC.rc rc/windows.h.rc
|
rc_include rc/CC.rc rc/windows.h.rc
|
||||||
|
|
||||||
consider() {
|
consider() {
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CC.rc
|
rc_include rc/CC.rc
|
||||||
|
|
||||||
prog='
|
prog='
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/CC.rc
|
rc_include rc/CC.rc
|
||||||
|
|
||||||
x="-Wl,-z,defs"
|
x="-Wl,-z,defs"
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,3 @@
|
||||||
. ./redoconf.rc
|
|
||||||
rc_include rc/run.rc
|
rc_include rc/run.rc
|
||||||
|
|
||||||
if [ -n "$CAN_RUN" ]; then
|
if [ -n "$CAN_RUN" ]; then
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue