summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKieran Bingham <kieran.bingham@ideasonboard.com>2021-08-17 13:03:10 +0100
committerKieran Bingham <kieran.bingham@ideasonboard.com>2021-08-17 13:08:30 +0100
commit4c8a6ac341b505630da4f362688420291bff73e6 (patch)
tree4795af035083095ecdab9e56b3f2e030a5fdd86e
parentea527b3e4dfe86661f2b00db889c0c7c07706014 (diff)
common: Default the ID to $0
Use the script name as a default identifier for stamp and log files. Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
-rwxr-xr-x02-update-mirrors.sh2
-rwxr-xr-x03-update-patchwork.sh2
-rwxr-xr-x10-build-matrix.sh2
-rwxr-xr-x40-build-vivid.sh1
-rwxr-xr-x51-run-unit-tests.sh1
-rwxr-xr-x53-generate-coverage-reports.sh1
-rwxr-xr-x54-run-scan-build.sh1
-rwxr-xr-x55-include-what-you-use.sh1
-rwxr-xr-x60-simple-cam.sh1
-rwxr-xr-x61-ipu3-ipa.sh1
-rwxr-xr-xcommon.sh2
11 files changed, 4 insertions, 11 deletions
diff --git a/02-update-mirrors.sh b/02-update-mirrors.sh
index 1520134..2e61862 100755
--- a/02-update-mirrors.sh
+++ b/02-update-mirrors.sh
@@ -4,8 +4,6 @@
source ./common.sh
-ID=mirror
-
LIBCAMERA=${1:-$(srcdir libcamera)}
check_version $LIBCAMERA $ID
diff --git a/03-update-patchwork.sh b/03-update-patchwork.sh
index a809266..bc081be 100755
--- a/03-update-patchwork.sh
+++ b/03-update-patchwork.sh
@@ -7,8 +7,6 @@ source ./common.sh
LIBCAMERA=${1:-$(srcdir libcamera)}
BOT=$(pwd)/scripts/git-patchwork-bot.py
-ID=patchwork-bot
-
logfile=$(log_filename $ID)
$BOT -v -r $LIBCAMERA/.git -l $logfile > $logfile.stdout.log 2> $logfile.stderr.log
diff --git a/10-build-matrix.sh b/10-build-matrix.sh
index 56973a6..d022f13 100755
--- a/10-build-matrix.sh
+++ b/10-build-matrix.sh
@@ -12,6 +12,8 @@
source ./common.sh
LIBCAMERA=${1:-$(srcdir libcamera)}
+
+# Override the default build ID
ID=build-matrix
check_version $LIBCAMERA $ID
diff --git a/40-build-vivid.sh b/40-build-vivid.sh
index e4c583c..c33d152 100755
--- a/40-build-vivid.sh
+++ b/40-build-vivid.sh
@@ -5,7 +5,6 @@
source ./common.sh
-ID=vivid-pipeline
logfile=$(log_filename $ID)
BUILDDIR="$(builddir $ID)"
diff --git a/51-run-unit-tests.sh b/51-run-unit-tests.sh
index a96b877..528d4a4 100755
--- a/51-run-unit-tests.sh
+++ b/51-run-unit-tests.sh
@@ -5,7 +5,6 @@
source ./common.sh
-ID=run-unit-tests
logfile=$(log_filename $ID)
LIBCAMERA=${1:-$(srcdir libcamera)}
diff --git a/53-generate-coverage-reports.sh b/53-generate-coverage-reports.sh
index a8b279a..33aeb01 100755
--- a/53-generate-coverage-reports.sh
+++ b/53-generate-coverage-reports.sh
@@ -5,7 +5,6 @@
source ./common.sh
-ID=$0
logfile=$(log_filename $ID)
LIBCAMERA=${1:-$(srcdir libcamera)}
diff --git a/54-run-scan-build.sh b/54-run-scan-build.sh
index c9d89ce..8b9b7be 100755
--- a/54-run-scan-build.sh
+++ b/54-run-scan-build.sh
@@ -5,7 +5,6 @@
source ./common.sh
-ID=$0
logfile=$(log_filename $ID)
LIBCAMERA=${1:-$(srcdir libcamera)}
diff --git a/55-include-what-you-use.sh b/55-include-what-you-use.sh
index f4a392a..6f92a92 100755
--- a/55-include-what-you-use.sh
+++ b/55-include-what-you-use.sh
@@ -5,7 +5,6 @@
source ./common.sh
-ID=$0
logfile=$(log_filename $ID)
BUILDDIR=${1:-$(builddir unit-tests)}
diff --git a/60-simple-cam.sh b/60-simple-cam.sh
index ae14305..8ab89d5 100755
--- a/60-simple-cam.sh
+++ b/60-simple-cam.sh
@@ -14,7 +14,6 @@ source ./common.sh
LIBCAMERA_BUILD=${1:-"$(builddir unit-tests)"}
LIBCAMERA=$LIBCAMERA_BUILD/source/
-ID=$0
SIMPLECAM=$(srcdir simple-cam)
SIMPLECAM_REPO=https://git.libcamera.org/libcamera/simple-cam.git
diff --git a/61-ipu3-ipa.sh b/61-ipu3-ipa.sh
index aa349b7..09a6ea0 100755
--- a/61-ipu3-ipa.sh
+++ b/61-ipu3-ipa.sh
@@ -11,7 +11,6 @@ source ./common.sh
LIBCAMERA_BUILD=${1:-"$(builddir unit-tests)"}
LIBCAMERA=$LIBCAMERA_BUILD/source/
-ID=ipu3-ipa
IPU3IPA=$(srcdir ipu3-ipa)
IPU3IPA_REPO=https://git.libcamera.org/libcamera/ipu3-ipa.git
diff --git a/common.sh b/common.sh
index bc7988f..9177630 100755
--- a/common.sh
+++ b/common.sh
@@ -8,6 +8,8 @@ STAMPS=$(pwd)/stamps
BUILDS=$(pwd)/builds
SOURCES=$(pwd)/src
+ID=$(basename $0)
+
libcamera_version() {
project="$1"