build system improvements
parent
e274a54cf8
commit
41f4fd4064
|
@ -1,10 +1,14 @@
|
||||||
*.o
|
*.o
|
||||||
*.core
|
*.core
|
||||||
|
*.a
|
||||||
|
*.so
|
||||||
|
examples/coroutine1
|
||||||
|
examples/coroutine2
|
||||||
examples/format
|
examples/format
|
||||||
examples/listdir
|
examples/listdir
|
||||||
examples/range
|
examples/range
|
||||||
|
examples/range_pipe
|
||||||
examples/signal
|
examples/signal
|
||||||
examples/stream1
|
examples/stream1
|
||||||
examples/stream2
|
examples/stream2
|
||||||
examples/range_pipe
|
|
||||||
test_runner
|
test_runner
|
||||||
|
|
180
build.sh
180
build.sh
|
@ -17,56 +17,58 @@ CXX_SOURCES="context_stack"
|
||||||
|
|
||||||
# output lib
|
# output lib
|
||||||
OSTD_LIB="libostd"
|
OSTD_LIB="libostd"
|
||||||
OSTD_DYNLIB=""
|
|
||||||
|
|
||||||
# default opts
|
# default opts
|
||||||
BUILD_EXAMPLES="true"
|
BUILD_EXAMPLES="yes"
|
||||||
BUILD_TESTSUITE="true"
|
BUILD_TESTSUITE="yes"
|
||||||
BUILD_LIB="mixed"
|
BUILD_STATIC="yes"
|
||||||
|
BUILD_SHARED="no"
|
||||||
BUILD_CFG="debug"
|
BUILD_CFG="debug"
|
||||||
VERBOSE="false"
|
VERBOSE="no"
|
||||||
CLEAN="false"
|
CLEAN="no"
|
||||||
|
|
||||||
print_help() {
|
print_help() {
|
||||||
echo "$1 [options]"
|
cat << EOF
|
||||||
echo "Available options:"
|
$1 [options]
|
||||||
echo " [no-]examples - (do not) build examples (default: build)"
|
Available options:
|
||||||
echo " [no-]test-suite - (do not) build test suite (default: build)"
|
[no-]examples - (do not) build examples (default: yes)
|
||||||
echo " static-lib - static libostd"
|
[no-]test-suite - (do not) build test suite (default: yes)
|
||||||
echo " shared-lib - shared libostd"
|
[no-]static-lib - (do not) build static libostd (default: yes)
|
||||||
echo " mixed-lib - static + shared libostd (default)"
|
[no-]shared-lib - (do not) build shared libostd (default: no)
|
||||||
echo " release - release build (strip, no -g)"
|
release - release build (strip, no -g)
|
||||||
echo " debug - debug build (default, no strip, -g)"
|
debug - debug build (default, no strip, -g)
|
||||||
echo " verbose - print entire commands"
|
verbose - print entire commands
|
||||||
echo " clean - remove temporary files and exit"
|
clean - remove generated files and exit
|
||||||
echo " help - print this"
|
help - print this and exit
|
||||||
|
EOF
|
||||||
}
|
}
|
||||||
|
|
||||||
for arg in "$@"; do
|
for arg in "$@"; do
|
||||||
case "$arg" in
|
case "$arg" in
|
||||||
examples) BUILD_EXAMPLES="true" ;;
|
examples) BUILD_EXAMPLES="yes" ;;
|
||||||
no-examples) BUILD_EXAMPLES="false" ;;
|
no-examples) BUILD_EXAMPLES="no" ;;
|
||||||
test-suite) BUILD_TESTSUITE="true" ;;
|
test-suite) BUILD_TESTSUITE="yes" ;;
|
||||||
no-test-suite) BUILD_TESTSUITE="false" ;;
|
no-test-suite) BUILD_TESTSUITE="no" ;;
|
||||||
static-lib) BUILD_LIB="static" ;;
|
static-lib) BUILD_STATIC="yes" ;;
|
||||||
shared-lib) BUILD_LIB="shared" ;;
|
no-static-lib) BUILD_STATIC="no" ;;
|
||||||
mixed-lib) BUILD_LIB="mixed" ;;
|
shared-lib) BUILD_SHARED="yes" ;;
|
||||||
|
no-shared-lib) BUILD_SHARED="no" ;;
|
||||||
release) BUILD_CFG="release" ;;
|
release) BUILD_CFG="release" ;;
|
||||||
debug) BUILD_CFG="debug" ;;
|
debug) BUILD_CFG="debug" ;;
|
||||||
verbose) VERBOSE="true" ;;
|
verbose) VERBOSE="yes" ;;
|
||||||
clean) CLEAN="true" ;;
|
clean) CLEAN="yes" ;;
|
||||||
help) print_help "$0"; exit 0 ;;
|
help) print_help "$0"; exit 0 ;;
|
||||||
*) ;;
|
*) ;;
|
||||||
esac
|
esac
|
||||||
shift
|
shift
|
||||||
done
|
done
|
||||||
|
|
||||||
if [ "$BUILD_LIB" = "shared" ]; then
|
OSTD_STATIC_LIB="${OSTD_LIB}.a"
|
||||||
OSTD_LIB="${OSTD_LIB}.so"
|
OSTD_SHARED_LIB="${OSTD_LIB}.so"
|
||||||
OSTD_DYNLIB=""
|
OSTD_DEFAULT_LIB="$OSTD_SHARED_LIB"
|
||||||
else
|
|
||||||
OSTD_LIB="${OSTD_LIB}.a"
|
if [ "$BUILD_STATIC" = "yes" ]; then
|
||||||
OSTD_DYNLIB="${OSTD_LIB}.so"
|
OSTD_DEFAULT_LIB="$OSTD_STATIC_LIB"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# compiler
|
# compiler
|
||||||
|
@ -95,7 +97,7 @@ if [ -z "$STRIP" ]; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# cross builds
|
# cross builds
|
||||||
if [ -z "$CROSS" ]; then
|
if [ ! -z "$CROSS" ]; then
|
||||||
CXX="${CROSS}${CXX}"
|
CXX="${CROSS}${CXX}"
|
||||||
CPP="${CROSS}${CPP}"
|
CPP="${CROSS}${CPP}"
|
||||||
AS="${CROSS}${AS}"
|
AS="${CROSS}${AS}"
|
||||||
|
@ -115,11 +117,6 @@ OSTD_CXXFLAGS="${OSTD_CXXFLAGS} -O2"
|
||||||
# warnings
|
# warnings
|
||||||
OSTD_CXXFLAGS="${OSTD_CXXFLAGS} -Wall -Wextra -Wshadow -Wold-style-cast"
|
OSTD_CXXFLAGS="${OSTD_CXXFLAGS} -Wall -Wextra -Wshadow -Wold-style-cast"
|
||||||
|
|
||||||
# -fPIC for shared libs
|
|
||||||
if [ "$BUILD_LIB" = "shared" ]; then
|
|
||||||
OSTD_CXXFLAGS="${OSTD_CXXFLAGS} -fPIC"
|
|
||||||
fi
|
|
||||||
|
|
||||||
# -g for debug builds
|
# -g for debug builds
|
||||||
if [ "$BUILD_CFG" = "debug" ]; then
|
if [ "$BUILD_CFG" = "debug" ]; then
|
||||||
OSTD_CXXFLAGS="${OSTD_CXXFLAGS} -g"
|
OSTD_CXXFLAGS="${OSTD_CXXFLAGS} -g"
|
||||||
|
@ -150,8 +147,8 @@ fi
|
||||||
OSTD_ASFLAGS=""
|
OSTD_ASFLAGS=""
|
||||||
|
|
||||||
# custom assembler flags
|
# custom assembler flags
|
||||||
if [ ! -z "$LDFLAGS" ]; then
|
if [ ! -z "$ASFLAGS" ]; then
|
||||||
OSTD_LDFLAGS="${OSTD_LDFLAGS} ${LDFLAGS}"
|
OSTD_ASFLAGS="${OSTD_ASFLAGS} ${ASFLAGS}"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#
|
#
|
||||||
|
@ -159,15 +156,15 @@ fi
|
||||||
#
|
#
|
||||||
|
|
||||||
evalv() {
|
evalv() {
|
||||||
if [ "$VERBOSE" = "true" ]; then
|
if [ "$VERBOSE" = "yes" ]; then
|
||||||
echo "$@"
|
echo "$*"
|
||||||
fi
|
fi
|
||||||
eval "$@"
|
eval "$*"
|
||||||
}
|
}
|
||||||
|
|
||||||
echoq() {
|
echoq() {
|
||||||
if [ "$VERBOSE" = "false" ]; then
|
if [ "$VERBOSE" = "no" ]; then
|
||||||
echo "$@"
|
echo "$*"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -179,37 +176,33 @@ clean() {
|
||||||
done
|
done
|
||||||
for as in ${ASM_SOURCES}; do
|
for as in ${ASM_SOURCES}; do
|
||||||
evalv "rm -f \"${ASM_SOURCE_DIR}/${as}.o\""
|
evalv "rm -f \"${ASM_SOURCE_DIR}/${as}.o\""
|
||||||
evalv "rm -f \"${ASM_SOURCE_DIR}/${as}_dyn.o\""
|
|
||||||
done
|
done
|
||||||
for cs in ${CXX_SOURCES}; do
|
for cs in ${CXX_SOURCES}; do
|
||||||
evalv "rm -f \"${CXX_SOURCE_DIR}/${cs}.o\""
|
evalv "rm -f \"${CXX_SOURCE_DIR}/${cs}.o\""
|
||||||
evalv "rm -f \"${CXX_SOURCE_DIR}/${cs}_dyn.o\""
|
evalv "rm -f \"${CXX_SOURCE_DIR}/${cs}_dyn.o\""
|
||||||
done
|
done
|
||||||
evalv "rm -f \"$OSTD_LIB\""
|
evalv "rm -f \"$OSTD_STATIC_LIB\""
|
||||||
if [ "$BUILD_LIB" = "mixed" ]; then
|
evalv "rm -f \"$OSTD_SHARED_LIB\""
|
||||||
evalv "rm -f \"$OSTD_DYNLIB\""
|
|
||||||
fi
|
|
||||||
evalv "rm -f test_runner.o test_runner"
|
evalv "rm -f test_runner.o test_runner"
|
||||||
}
|
}
|
||||||
|
|
||||||
# call_cxx input output
|
# call_cxx input output [shared]
|
||||||
call_cxx() {
|
call_cxx() {
|
||||||
echoq "CXX: $1"
|
FLAGS="${OSTD_CPPFLAGS} ${OSTD_CXXFLAGS}"
|
||||||
evalv "${CXX} ${OSTD_CPPFLAGS} ${OSTD_CXXFLAGS} -c -o \"${2}\" \"${1}\""
|
if [ "x$3" = "xshared" ]; then
|
||||||
if [ "$BUILD_LIB" = "mixed" ] && [ "x$3" = "xlib" ]; then
|
echoq "CXX (shared): $1"
|
||||||
echoq "CXX (dynamic): $1"
|
FLAGS="${FLAGS} -fPIC"
|
||||||
DYNOBJ=$(echo "$2" | sed 's/\.o/_dyn\.o/g')
|
else
|
||||||
evalv "${CXX} ${OSTD_CPPFLAGS} ${OSTD_CXXFLAGS} -fPIC -c -o \"${DYNOBJ}\" \"${1}\""
|
echoq "CXX: $1"
|
||||||
fi
|
fi
|
||||||
|
evalv "${CXX} ${FLAGS} -c -o \"${2}\" \"${1}\""
|
||||||
}
|
}
|
||||||
|
|
||||||
# call_as input output
|
# call_as input output
|
||||||
call_as() {
|
call_as() {
|
||||||
echoq "AS: $1"
|
echoq "AS: $1"
|
||||||
evalv "${CPP} -x assembler-with-cpp \"${1}\" | ${AS} -o \"${2}\""
|
evalv "${CPP} -x assembler-with-cpp \"${1}\" | \
|
||||||
if [ "$BUILD_LIB" = "mixed" ]; then
|
${AS} ${OSTD_ASFLAGS} -o \"${2}\""
|
||||||
cp "$2" "$(echo $2 | sed 's/\.o/_dyn\.o/')"
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# call_ld output file1 file2 ...
|
# call_ld output file1 file2 ...
|
||||||
|
@ -224,76 +217,79 @@ call_ld() {
|
||||||
|
|
||||||
# call_ldlib output file1 file2 ...
|
# call_ldlib output file1 file2 ...
|
||||||
call_ldlib() {
|
call_ldlib() {
|
||||||
if [ "$BUILD_LIB" = "shared" ]; then
|
LIBTYPE="$1"
|
||||||
|
shift
|
||||||
|
if [ "$LIBTYPE" = "shared" ]; then
|
||||||
call_ld "$@" "-shared"
|
call_ld "$@" "-shared"
|
||||||
else
|
else
|
||||||
echoq "AR: $1"
|
echoq "AR: $1"
|
||||||
evalv "${AR} rcs $@"
|
evalv "${AR} rcs $@"
|
||||||
fi
|
fi
|
||||||
if [ "$BUILD_LIB" = "mixed" ]; then
|
|
||||||
OUT=$(echo "$1" | sed 's/\.a/\.so/')
|
|
||||||
shift
|
|
||||||
OBJS="$@"
|
|
||||||
DYN_OBJ=$(echo "$OBJS" | sed 's/\.o/_dyn\.o/g')
|
|
||||||
call_ld "$OUT" "$DYN_OBJ" "-fPIC -shared"
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# build_example name
|
# build_example name
|
||||||
build_example() {
|
build_example() {
|
||||||
call_cxx "examples/${1}.cc" "examples/${1}.o"
|
call_cxx "examples/${1}.cc" "examples/${1}.o"
|
||||||
call_ld "examples/${1}" "examples/${1}.o" "$OSTD_LIB"
|
call_ld "examples/${1}" "examples/${1}.o" "$OSTD_DEFAULT_LIB"
|
||||||
rm -f "examples/${1}.o"
|
rm -f "examples/${1}.o"
|
||||||
}
|
}
|
||||||
|
|
||||||
# build test runner
|
# build test runner
|
||||||
build_test_runner() {
|
build_test_runner() {
|
||||||
call_cxx test_runner.cc test_runner.o
|
call_cxx test_runner.cc test_runner.o
|
||||||
call_ld test_runner test_runner.o "$OSTD_LIB"
|
call_ld test_runner test_runner.o "$OSTD_DEFAULT_LIB"
|
||||||
rm -f test_runner.o
|
rm -f test_runner.o
|
||||||
}
|
}
|
||||||
|
|
||||||
# add_sfx_pfx str sfx pfx
|
|
||||||
add_sfx_pfx() {
|
|
||||||
RET=""
|
|
||||||
for it in $1; do
|
|
||||||
RET="$RET ${3}${it}${2}"
|
|
||||||
done
|
|
||||||
echo $RET
|
|
||||||
}
|
|
||||||
|
|
||||||
# check if cleaning
|
# check if cleaning
|
||||||
if [ "$CLEAN" = "true" ]; then
|
if [ "$CLEAN" = "yes" ]; then
|
||||||
clean
|
clean
|
||||||
exit 0
|
exit 0
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# build assembly
|
# build library
|
||||||
|
|
||||||
|
# built as files are compiled, used at link
|
||||||
|
ASM_OBJ=""
|
||||||
|
CXX_OBJ=""
|
||||||
|
CXX_DYNOBJ=""
|
||||||
|
|
||||||
echo "Building the library..."
|
echo "Building the library..."
|
||||||
for as in $ASM_SOURCES; do
|
for as in $ASM_SOURCES; do
|
||||||
call_as "${ASM_SOURCE_DIR}/${as}.S" "${ASM_SOURCE_DIR}/${as}.o" &
|
call_as "${ASM_SOURCE_DIR}/${as}.S" "${ASM_SOURCE_DIR}/${as}.o" &
|
||||||
|
ASM_OBJ="${ASM_OBJ} ${ASM_SOURCE_DIR}/${as}.o"
|
||||||
done
|
done
|
||||||
for cs in $CXX_SOURCES; do
|
for cs in $CXX_SOURCES; do
|
||||||
call_cxx "${CXX_SOURCE_DIR}/${cs}.cc" "${CXX_SOURCE_DIR}/${cs}.o" lib &
|
if [ "$BUILD_STATIC" = "yes" ]; then
|
||||||
|
call_cxx "${CXX_SOURCE_DIR}/${cs}.cc" "${CXX_SOURCE_DIR}/${cs}.o" &
|
||||||
|
CXX_OBJ="${CXX_OBJ} ${CXX_SOURCE_DIR}/${cs}.o"
|
||||||
|
fi
|
||||||
|
if [ "$BUILD_SHARED" = "yes" ]; then
|
||||||
|
call_cxx "${CXX_SOURCE_DIR}/${cs}.cc" \
|
||||||
|
"${CXX_SOURCE_DIR}/${cs}_dyn.o" shared &
|
||||||
|
CXX_DYNOBJ="${CXX_DYNOBJ} ${CXX_SOURCE_DIR}/${cs}_dyn.o"
|
||||||
|
fi
|
||||||
done
|
done
|
||||||
wait
|
wait
|
||||||
|
|
||||||
ASM_OBJ=$(add_sfx_pfx "$ASM_SOURCES" ".o" "$ASM_SOURCE_DIR/")
|
if [ "$BUILD_STATIC" = "yes" ]; then
|
||||||
CXX_OBJ=$(add_sfx_pfx "$CXX_SOURCES" ".o" "$CXX_SOURCE_DIR/")
|
call_ldlib static "$OSTD_STATIC_LIB" "$ASM_OBJ" "$CXX_OBJ"
|
||||||
CXX_DYNOBJ=$(add_sfx_pfx "$CXX_SOURCES" ".o" "$CXX_SOURCE_DIR/dyn_")
|
evalv "rm -f $CXX_OBJ"
|
||||||
|
fi
|
||||||
call_ldlib "$OSTD_LIB" "$ASM_OBJ" "$CXX_OBJ"
|
if [ "$BUILD_SHARED" = "yes" ]; then
|
||||||
|
call_ldlib shared "$OSTD_SHARED_LIB" "$ASM_OBJ" "$CXX_DYNOBJ"
|
||||||
|
evalv "rm -f $CXX_DYNOBJ"
|
||||||
|
fi
|
||||||
evalv "rm -f $ASM_OBJ"
|
evalv "rm -f $ASM_OBJ"
|
||||||
evalv "rm -f $CXX_OBJ"
|
|
||||||
|
|
||||||
# build test runner
|
# build test runner
|
||||||
if [ "$BUILD_TESTSUITE" = "true" ]; then
|
if [ "$BUILD_TESTSUITE" = "yes" ]; then
|
||||||
echo "Building test runner..."
|
echo "Building test runner..."
|
||||||
build_test_runner &
|
build_test_runner &
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# build examples
|
# build examples
|
||||||
if [ "$BUILD_EXAMPLES" = "true" ]; then
|
if [ "$BUILD_EXAMPLES" = "yes" ]; then
|
||||||
echo "Building examples..."
|
echo "Building examples..."
|
||||||
for ex in $EXAMPLES; do
|
for ex in $EXAMPLES; do
|
||||||
build_example "$ex" &
|
build_example "$ex" &
|
||||||
|
|
Loading…
Reference in New Issue