pico_w httpd example builds again

Fixed in raspberrypi/pico-sdk#1841
ndabas · Aug 19, 2024 · 152169e · 152169e
1 parent 3adab59
commit 152169e
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 21 deletions.
diff --git a/config/repositories.json b/config/repositories.json
@@ -1,13 +1,13 @@
 {
   "repositories": [
     {
-      "href": "https://github.com/raspberrypi/pico-sdk.git",
-      "tree": "2.0.0",
+      "href": "https://github.com/ndabas/pico-sdk.git",
+      "tree": "2.0.0-0",
       "submodules": true
     },
     {
-      "href": "https://github.com/raspberrypi/pico-examples.git",
-      "tree": "sdk-2.0.0"
+      "href": "https://github.com/ndabas/pico-examples.git",
+      "tree": "sdk-2.0.0-0"
     },
     {
       "href": "https://github.com/raspberrypi/pico-extras.git",

diff --git a/packages/pico-setup-windows/pico-setup.cmd b/packages/pico-setup-windows/pico-setup.cmd
@@ -38,17 +38,19 @@ for %%i in (examples extras playground) do (
 )
 
 rem Build a couple of examples
-mkdir "%PICO_REPOS_PATH%\pico-examples\build"
-pushd "%PICO_REPOS_PATH%\pico-examples\build"
-cmake -G Ninja .. -DCMAKE_BUILD_TYPE=Debug --fresh || exit /b 1
+for %%j in (pico pico2) do (
+  mkdir "%PICO_REPOS_PATH%\pico-examples\build-%%j"
+  pushd "%PICO_REPOS_PATH%\pico-examples\build-%%j"
+  cmake -G Ninja .. -DPICO_BOARD=%%j -DCMAKE_BUILD_TYPE=Debug --fresh || exit /b 1
+
+  for %%i in (blink "hello_world/all") do (
+    echo Building %%i for %%j
+    ninja "%%i" || exit /b 1
+  )
 
-for %%i in (blink "hello_world/all") do (
-  echo Building %%i
-  ninja "%%i" || exit /b 1
+  popd
 )
 
-popd
-
 if "%interactive%" equ "1" (
   rem Open repo folder in Explorer
   start .

diff --git a/tests/pico-build.cmd b/tests/pico-build.cmd
@@ -1,5 +1,19 @@
 @if not defined _echo echo off
 
+goto main
+
+:test-build
+
+    mkdir "%BUILD_DIR%"
+    pushd "%BUILD_DIR%"
+    cmake "%SRC_DIR%" -G Ninja -DCMAKE_BUILD_TYPE=Debug --fresh %* || exit /b 1
+    cmake --build . || exit /b 1
+    popd
+
+  goto :EOF
+
+:main
+
 call "%PICO_INSTALL_PATH%\pico-env.cmd" || exit /b 1
 
 pushd "%PICO_REPOS_PATH%"
@@ -10,15 +24,21 @@ popd
 
 subst P: "%PICO_REPOS_PATH%" || exit /b 1
 
-pushd "P:\pico-examples\build"
-cmake -G Ninja .. -DPICO_BOARD=pico_w -DWIFI_SSID=ssid -DWIFI_PASSWORD=pass "-DFREERTOS_KERNEL_PATH=P:\FreeRTOS-Kernel" -DTEST_TCP_SERVER_IP=10.10.10.10 -DCMAKE_BUILD_TYPE=Debug --fresh || exit /b 1
-ninja --quiet || exit /b 1
-popd
+set "SRC_DIR=P:\pico-examples"
 
-mkdir "P:\pico-sdk-build"
-pushd "P:\pico-sdk-build"
-cmake "%PICO_SDK_PATH%" -G Ninja -DPICO_SDK_TESTS_ENABLED=1 -DCMAKE_BUILD_TYPE=Debug -DPICO_BOARD=pico_w --fresh || exit /b 1
-ninja --quiet || exit /b 1
-popd
+set "BUILD_DIR=P:\pico-examples\build-pico"
+call :test-build -DPICO_BOARD=pico || exit /b 1
+
+set "BUILD_DIR=P:\pico-examples\build-pico2"
+call :test-build -DPICO_BOARD=pico2 || exit /b 1
+
+rem call :test-build build-pico2-riscv -DPICO_BOARD=pico2 -DPICO_PLATFORM=rp2350-riscv || exit /b 1
+
+set "BUILD_DIR=P:\pico-examples\build-pico_w"
+call :test-build -DPICO_BOARD=pico_w -DWIFI_SSID=ssid -DWIFI_PASSWORD=pass "-DFREERTOS_KERNEL_PATH=P:\FreeRTOS-Kernel" -DTEST_TCP_SERVER_IP=10.10.10.10 || exit /b 1
+
+set "SRC_DIR=%PICO_SDK_PATH%"
+set "BUILD_DIR=P:\pico-sdk-build"
+call :test-build -DPICO_SDK_TESTS_ENABLED=1 -DPICO_BOARD=pico_w || exit /b 1
 
 subst P: /d