Skip to content

Commit f90034f

Browse files
committed
temp: Disable picotool build
Signed-off-by: paulober <[email protected]>
1 parent 8adc562 commit f90034f

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

build.ps1

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -221,9 +221,9 @@ if (-not (Test-Path ".\build\openocd-install\$msysEnv") -and ($env:SKIP_OPENOCD
221221
msys "cd build && ../packages/windows/openocd/build-openocd.sh"
222222
}
223223

224-
if (-not (Test-Path ".\build\picotool-install\$msysEnv")) {
225-
msys "cd build && ../packages/windows/picotool/build-picotool.sh $version"
226-
}
224+
#if (-not (Test-Path ".\build\picotool-install\$msysEnv")) {
225+
# msys "cd build && ../packages/windows/picotool/build-picotool.sh $version"
226+
#}
227227

228228
if (-not (Test-Path ".\build\dtc-install\$msysEnv")) {
229229
msys "cd build && ../packages/windows/dtc/build-dtc.sh $version"
@@ -270,15 +270,15 @@ exec { tar -a -cf "bin\$filename" -C "build\pico-sdk-tools\$msysEnv" '*' }
270270

271271
# Package picotool separately as well
272272

273-
$version = (cmd /c ".\build\picotool-install\$msysEnv\picotool\picotool.exe" version -s '2>&1')
274-
Write-Host "Picotool version $version"
273+
#$version = (cmd /c ".\build\picotool-install\$msysEnv\picotool\picotool.exe" version -s '2>&1')
274+
#Write-Host "Picotool version $version"
275275

276-
$filename = 'picotool-{0}-{1}.zip' -f
277-
$version,
278-
$suffix
276+
#$filename = 'picotool-{0}-{1}.zip' -f
277+
# $version,
278+
# $suffix
279279

280-
Write-Host "Saving picotool package to $filename"
281-
exec { tar -a -cf "bin\$filename" -C "build\picotool-install\$msysEnv" '*' }
280+
#Write-Host "Saving picotool package to $filename"
281+
#exec { tar -a -cf "bin\$filename" -C "build\picotool-install\$msysEnv" '*' }
282282

283283
# Package dtc separately as well
284284
$versionOutput = & ".\build\dtc-install\$msysEnv\bin\dtc.exe" --version

build_linux.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ if [[ "$SKIP_RISCV" != 1 ]]; then
5050
# Takes ages to build
5151
../packages/linux/riscv/build-riscv-gcc.sh
5252
fi
53-
../packages/linux/picotool/build-picotool.sh
53+
#../packages/linux/picotool/build-picotool.sh
5454
../packages/linux/dtc/build-dtc.sh
5555
cd ..
5656

@@ -68,15 +68,15 @@ if [ ${version:0:1} -ge 2 ]; then
6868
fi
6969

7070
# Package picotool separately as well
71-
version=$("./$builddir/picotool-install/picotool/picotool" version -s)
72-
echo "Picotool version $version"
71+
#version=$("./$builddir/picotool-install/picotool/picotool" version -s)
72+
#echo "Picotool version $version"
7373

74-
filename="picotool-${version}-${suffix}.tar.gz"
74+
#filename="picotool-${version}-${suffix}.tar.gz"
7575

76-
echo "Saving picotool package to $filename"
77-
pushd "$builddir/picotool-install/"
78-
tar -a -cf "$topd/bin/$filename" * .keep
79-
popd
76+
#echo "Saving picotool package to $filename"
77+
#pushd "$builddir/picotool-install/"
78+
#tar -a -cf "$topd/bin/$filename" * .keep
79+
#popd
8080

8181
# Package dtc separately as well
8282
version=$("./$builddir/dtc-install/bin/dtc" --version | awk '{print $3}')

build_macos.sh

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ if [[ "$SKIP_RISCV" != 1 ]]; then
5757
# Takes ages to build
5858
../packages/macos/riscv/build-riscv-gcc.sh
5959
fi
60-
arch -x86_64 ../packages/macos/picotool/build-picotool.sh
61-
arch -arm64 ../packages/macos/picotool/build-picotool.sh
62-
../packages/macos/picotool/merge-picotool.sh
60+
#arch -x86_64 ../packages/macos/picotool/build-picotool.sh
61+
#arch -arm64 ../packages/macos/picotool/build-picotool.sh
62+
#../packages/macos/picotool/merge-picotool.sh
6363

6464
arch -x86_64 ../packages/macos/dtc/build-dtc.sh
6565
arch -arm64 ../packages/macos/dtc/build-dtc.sh
@@ -78,15 +78,15 @@ if [ ${version:0:1} -ge 2 ]; then
7878
fi
7979

8080
# Package picotool separately as well
81-
version=$("./$builddir/picotool-install/picotool/picotool" version -s)
82-
echo "Picotool version $version"
81+
#version=$("./$builddir/picotool-install/picotool/picotool" version -s)
82+
#echo "Picotool version $version"
8383

84-
filename="picotool-${version}-${suffix}.zip"
84+
#filename="picotool-${version}-${suffix}.zip"
8585

86-
echo "Saving picotool package to $filename"
87-
pushd "$builddir/picotool-install/"
88-
tar -a -cf "$topd/bin/$filename" * .keep
89-
popd
86+
#echo "Saving picotool package to $filename"
87+
#pushd "$builddir/picotool-install/"
88+
#tar -a -cf "$topd/bin/$filename" * .keep
89+
#popd
9090

9191
# Package dtc separately as well
9292
version=$("./$builddir/dtc-install/bin/dtc" --version | awk '{print $3}')

0 commit comments

Comments
 (0)