From 25e7fb8b74dcecd8ab919413c33bb30b6b0f0119 Mon Sep 17 00:00:00 2001 From: Andy C Date: Wed, 18 Jan 2023 17:16:29 -0500 Subject: [PATCH] [devtools] Fix symlink creation Should fix soil/app-tests. --- devtools/bin.sh | 8 ++++++-- test/ble.sh | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/devtools/bin.sh b/devtools/bin.sh index cf4581d596..24c9051e82 100755 --- a/devtools/bin.sh +++ b/devtools/bin.sh @@ -70,7 +70,7 @@ opy-dev-snippet() { sh-snippet opy_.py $action } -make-bin-stubs() { +make-src-stubs() { ### bin/ is for running with the Python interpreter. mkdir -p bin @@ -86,7 +86,7 @@ make-bin-stubs() { make-osh-eval } -make-bin-links() { +make-ovm-links() { ### _bin/ is for running with OVM app bundles. mkdir -p _bin @@ -94,7 +94,11 @@ make-bin-links() { for link in "${OIL_OVM_NAMES[@]}"; do # _bin/ symlink ln -s -f --verbose oil.ovm _bin/$link + done +} +make-cpp-links() { + for link in "${OIL_OVM_NAMES[@]}"; do # Skip oil in favor of ysh. if test $link != 'oil'; then # TODO: do this in Ninja? diff --git a/test/ble.sh b/test/ble.sh index e3a6799790..78aa349304 100755 --- a/test/ble.sh +++ b/test/ble.sh @@ -23,7 +23,7 @@ build() { make # make osh # make _bin/osh - devtools/bin.sh make-bin-links + devtools/bin.sh make-ovm-links # make ble.sh cd $BASE_DIR