Build system: Improve output readability and prepare for script based unit tests
parent
748c91c375
commit
e882a09099
|
@ -33,7 +33,7 @@ fi
|
||||||
|
|
||||||
# `.cpp` files in src/lib will be automatically picked up and compiled into
|
# `.cpp` files in src/lib will be automatically picked up and compiled into
|
||||||
# dynamically linked libraries.
|
# dynamically linked libraries.
|
||||||
echo "Building libs..."
|
echo ">>> Building libs..."
|
||||||
create_directory bin/lib
|
create_directory bin/lib
|
||||||
for lib in $(find ./src/lib -name "*.cpp"); do
|
for lib in $(find ./src/lib -name "*.cpp"); do
|
||||||
COMPILE_COMMAND="$CXX_WITH_FLAGS -I ./include -fPIC -shared -o $(sed -e 's/^.\/src/.\/bin/;s/cpp$/so/' <<< $lib) $lib"
|
COMPILE_COMMAND="$CXX_WITH_FLAGS -I ./include -fPIC -shared -o $(sed -e 's/^.\/src/.\/bin/;s/cpp$/so/' <<< $lib) $lib"
|
||||||
|
@ -55,7 +55,7 @@ wait
|
||||||
# How to run a tool: specify the library path to use for the dynamic linker
|
# How to run a tool: specify the library path to use for the dynamic linker
|
||||||
# when running a program
|
# when running a program
|
||||||
# Example: LD_LIBRARY_PATH=bin/lib bin/tools/dumpnbt
|
# Example: LD_LIBRARY_PATH=bin/lib bin/tools/dumpnbt
|
||||||
echo "Building tools..."
|
echo ">>> Building tools..."
|
||||||
create_directory bin/tools
|
create_directory bin/tools
|
||||||
# add compile commands to this array
|
# add compile commands to this array
|
||||||
COMPILE_COMMANDS=(
|
COMPILE_COMMANDS=(
|
||||||
|
|
|
@ -15,6 +15,8 @@
|
||||||
# version 3 along with this program.
|
# version 3 along with this program.
|
||||||
# If not, see https://www.gnu.org/licenses/agpl-3.0.en.html
|
# If not, see https://www.gnu.org/licenses/agpl-3.0.en.html
|
||||||
|
|
||||||
|
echo ">>> Cleaning build files..."
|
||||||
|
|
||||||
source scripts/lib.sh
|
source scripts/lib.sh
|
||||||
|
|
||||||
remove ./bin
|
remove ./bin
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
|
|
||||||
source scripts/lib.sh
|
source scripts/lib.sh
|
||||||
|
|
||||||
echo "Checking download cache for unneeded or corrupted files..."
|
echo ">>> Checking download cache for unneeded or corrupted files..."
|
||||||
for file in $(ls .download_cache); do
|
for file in $(ls .download_cache); do
|
||||||
#TODO: remove if unknown shasum
|
#TODO: remove if unknown shasum
|
||||||
if grep $file scripts/setup_project.sh >/dev/null 2>&1; then
|
if grep $file scripts/setup_project.sh >/dev/null 2>&1; then
|
||||||
|
@ -32,7 +32,8 @@ for file in $(ls .download_cache); do
|
||||||
rm ".download_cache/$file"
|
rm ".download_cache/$file"
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
echo ""
|
echo "
|
||||||
|
>>> Cleaning dependencies..."
|
||||||
|
|
||||||
remove ./dependencies
|
remove ./dependencies
|
||||||
create_directory ./dependencies
|
create_directory ./dependencies
|
||||||
|
|
|
@ -72,9 +72,7 @@ function download {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
echo "Cleaning build files..."
|
|
||||||
scripts/clean.sh
|
scripts/clean.sh
|
||||||
echo "Cleaning dependencies..."
|
|
||||||
scripts/clean_dependencies.sh
|
scripts/clean_dependencies.sh
|
||||||
|
|
||||||
set -e # failures are not acceptable here
|
set -e # failures are not acceptable here
|
||||||
|
@ -82,20 +80,21 @@ create_directory dependencies/tmp
|
||||||
download https://github.com/DuffsDevice/tiny-utf8/archive/refs/tags/v4.4.3.tar.gz dependencies/tmp/tiny-utf8.tar.gz 8e3f61651909c9f3105d3501932a96aa65733127fb6e7cf94cb1b0a2dff42c8f
|
download https://github.com/DuffsDevice/tiny-utf8/archive/refs/tags/v4.4.3.tar.gz dependencies/tmp/tiny-utf8.tar.gz 8e3f61651909c9f3105d3501932a96aa65733127fb6e7cf94cb1b0a2dff42c8f
|
||||||
download https://github.com/fpagliughi/sockpp/archive/refs/tags/v0.7.1.tar.gz dependencies/tmp/sockpp.tar.gz 2e023528bebbd2ac083fc91fbe6d5c4158c3336bedbcff48f594f3b28f53b940
|
download https://github.com/fpagliughi/sockpp/archive/refs/tags/v0.7.1.tar.gz dependencies/tmp/sockpp.tar.gz 2e023528bebbd2ac083fc91fbe6d5c4158c3336bedbcff48f594f3b28f53b940
|
||||||
|
|
||||||
echo -n "Extracting tiny-utf8... "
|
echo -n ">>> Extracting tiny-utf8... "
|
||||||
gzip -d dependencies/tmp/tiny-utf8.tar.gz
|
gzip -d dependencies/tmp/tiny-utf8.tar.gz
|
||||||
tar -xf dependencies/tmp/tiny-utf8.tar -C dependencies
|
tar -xf dependencies/tmp/tiny-utf8.tar -C dependencies
|
||||||
echo "done."
|
echo "done"
|
||||||
|
|
||||||
echo -n "Extracting sockpp... "
|
echo -n ">>> Extracting sockpp... "
|
||||||
gzip -d dependencies/tmp/sockpp.tar.gz
|
gzip -d dependencies/tmp/sockpp.tar.gz
|
||||||
tar -xf dependencies/tmp/sockpp.tar -C dependencies
|
tar -xf dependencies/tmp/sockpp.tar -C dependencies
|
||||||
echo "done."
|
echo "done"
|
||||||
echo -n "Building sockpp... "
|
|
||||||
|
echo ">>> Building sockpp... "
|
||||||
pushd dependencies/sockpp-0.7.1/ >/dev/null 2>&1
|
pushd dependencies/sockpp-0.7.1/ >/dev/null 2>&1
|
||||||
cmake -Bbuild .
|
cmake -Bbuild .
|
||||||
cmake --build build
|
cmake --build build
|
||||||
popd >/dev/null 2>&1
|
popd >/dev/null 2>&1
|
||||||
echo "done."
|
|
||||||
|
|
||||||
|
echo ">>> Cleaning up..."
|
||||||
remove dependencies/tmp
|
remove dependencies/tmp
|
||||||
|
|
|
@ -27,7 +27,7 @@ echo "$LD_LIBRARY_PATH"
|
||||||
|
|
||||||
create_directory bin/test
|
create_directory bin/test
|
||||||
|
|
||||||
echo "Building tests..."
|
echo ">>> Building tests..."
|
||||||
|
|
||||||
# add compile commands to this array
|
# add compile commands to this array
|
||||||
COMPILE_COMMANDS=(
|
COMPILE_COMMANDS=(
|
||||||
|
@ -45,9 +45,15 @@ done
|
||||||
|
|
||||||
wait
|
wait
|
||||||
|
|
||||||
echo "Running tests..."
|
echo ">>> Running tests..."
|
||||||
|
|
||||||
|
# explicitly allow commands to fail at this stage
|
||||||
set +e
|
set +e
|
||||||
|
|
||||||
for test in $(ls bin/test); do
|
for test in $(ls bin/test); do
|
||||||
bin/test/$test
|
bin/test/$test
|
||||||
done
|
done
|
||||||
|
|
||||||
|
for test in $(ls scripts/test); do
|
||||||
|
scripts/test/$test
|
||||||
|
done
|
||||||
|
|
|
@ -0,0 +1,8 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
echo "################################################################################
|
||||||
|
Testing hexnet
|
||||||
|
################################################################################"
|
||||||
|
|
||||||
|
echo "Test not yet implemented."
|
||||||
|
#TODO: implement unit test after merging back with master
|
Loading…
Reference in New Issue