From 25c38ce1b61a076c3706eed864932fe6bf058915 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20De=20Keersmaeker?= <francois.dekeersmaeker@uclouvain.be> Date: Wed, 2 Oct 2024 07:40:04 +0000 Subject: [PATCH] Build: arg directory: -d -> -C --- .github/workflows/full-test.yaml | 4 ++-- build.sh | 11 ++++++----- src/parsers | 2 +- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.github/workflows/full-test.yaml b/.github/workflows/full-test.yaml index db77846..eb36e70 100644 --- a/.github/workflows/full-test.yaml +++ b/.github/workflows/full-test.yaml @@ -17,7 +17,7 @@ jobs: run: sudo $GITHUB_WORKSPACE/.ci_scripts/native-build/install_packages.sh - name: Build project with CMake - run: $GITHUB_WORKSPACE/build.sh -d $GITHUB_WORKSPACE + run: $GITHUB_WORKSPACE/build.sh -C $GITHUB_WORKSPACE - name: Run CUnit tests run: $GITHUB_WORKSPACE/.ci_scripts/native-build/run_tests.sh @@ -47,4 +47,4 @@ jobs: submodules: recursive - name: Run cross-compilation - run: $GITHUB_WORKSPACE/build.sh -d $GITHUB_WORKSPACE -t $GITHUB_WORKSPACE/openwrt/tl-wdr4900.cmake + run: $GITHUB_WORKSPACE/build.sh -C $GITHUB_WORKSPACE -t $GITHUB_WORKSPACE/openwrt/tl-wdr4900.cmake diff --git a/build.sh b/build.sh index 487b0aa..9fc78b1 100755 --- a/build.sh +++ b/build.sh @@ -1,25 +1,26 @@ #!/bin/bash # Build the project. -# Usage: build.sh [-d working_directory] [-t cmake_toolchain_file] -# -d working_directory: The directory to build the project in. +# Usage: build.sh [-C working_directory] [-t cmake_toolchain_file] +# -C working_directory: The directory to build the project in. # -t cmake_toolchain_file: The CMake toolchain file to use. # Default values WORKING_DIRECTORY="" CMAKE_TOOLCHAIN_FILE="" +DEVICE="" # Print usage information usage() { - echo "Usage: $0 [-d working_directory] [-t cmake_toolchain_file]" 1>&2 + echo "Usage: $0 [-C working_directory] [-t cmake_toolchain_file]" 1>&2 exit 1 } # Parse command line arguments -while getopts "d:t:" opt; +while getopts "C:t:" opt; do case "${opt}" in - d) + C) # Working directory WORKING_DIRECTORY="${OPTARG}" echo "Building in directory ${WORKING_DIRECTORY}" diff --git a/src/parsers b/src/parsers index 746030e..0ef0b31 160000 --- a/src/parsers +++ b/src/parsers @@ -1 +1 @@ -Subproject commit 746030e98cab5d64007c71b21aa113db77175959 +Subproject commit 0ef0b310bc56c35c8ca4134956326190d9b73a51 -- GitLab