Sxian/clt 2506/fix release livekit version number (#45)

* use the request_async_id in cpp

* changed the code back to always throw when ffi returns invalid result

* fix the timeout issue and a few bugs related to the SimpleRoom example

* update to the latest rust sdk commit with the audio thread fix

* pass the release version to build scripts

Author: xianshijing-lk

.github/workflows/make-release.yml

@@ -142,11 +142,11 @@ jobs:
         if: runner.os == 'Windows'
         shell: pwsh
         run: |
-          .\build.cmd release-examples
-
           $version   = "${{ steps.version.outputs.version }}"
           $bundleDir = "sdk-out/livekit-sdk-${{ matrix.name }}-$version"
 
+          .\build.cmd release-examples --version $version
+
           # There is the missing step that generates LiveKitTargets.cmake in the install tree
           # TODO(sxian): fix it after getting access to a windows machine
           cmake --install "build-release" --config Release --prefix "$bundleDir"

build.cmd

@@ -5,6 +5,8 @@ set "PROJECT_ROOT=%~dp0"
 set "PROJECT_ROOT=%PROJECT_ROOT:~0,-1%"
 set "BUILD_TYPE=Release"
 set "PRESET=windows-release"
+set "LIVEKIT_VERSION="
+set "CMAKE_EXTRA_ARGS="
 
 REM ============================================================
 REM Auto-detect LIBCLANG_PATH if not already set
@@ -55,42 +57,71 @@ if not defined LIBCLANG_PATH (
 )
 
 if "%1"=="" goto usage
-if "%1"=="help" goto usage
+if /I "%1"=="help" goto usage
 if "%1"=="-h" goto usage
 if "%1"=="--help" goto usage
 
-if "%1"=="debug" (
+set "CMD=%1"
+shift
+goto parse_args
+
+:parse_args
+if "%1"=="" goto after_parse
+
+if "%1"=="--version" (
+    shift
+    if "%1"=="" (
+        echo ERROR: --version requires a value
+        exit /b 1
+    )
+    set "LIVEKIT_VERSION=%1"
+    shift
+    goto parse_args
+)
+
+echo ERROR: Unknown option: %1
+exit /b 1
+
+:after_parse
+if defined LIVEKIT_VERSION (
+    set "CMAKE_EXTRA_ARGS=-DLIVEKIT_VERSION=%LIVEKIT_VERSION%"
+    echo ==^> Injecting LIVEKIT_VERSION=%LIVEKIT_VERSION%
+)
+goto dispatch
+
+:dispatch
+if "%CMD%"=="debug" (
     set "BUILD_TYPE=Debug"
     set "PRESET=windows-debug"
     set "BUILD_DIR=%PROJECT_ROOT%\build-debug"
     goto configure_build
 )
 
-if "%1"=="debug-examples" (
+if "%CMD%"=="debug-examples" (
     set "BUILD_TYPE=Debug"
     set "PRESET=windows-debug-examples"
     set "BUILD_DIR=%PROJECT_ROOT%\build-debug"
     goto configure_build
 )
 
-if "%1"=="release" (
+if "%CMD%"=="release" (
     set "BUILD_TYPE=Release"
     set "PRESET=windows-release"
     set "BUILD_DIR=%PROJECT_ROOT%\build-release"
     goto configure_build
 )
 
-if "%1"=="release-examples" (
+if "%CMD%"=="release-examples" (
     set "BUILD_TYPE=Release"
     set "PRESET=windows-release-examples"
     set "BUILD_DIR=%PROJECT_ROOT%\build-release"
     goto configure_build
 )
 
-if "%1"=="clean" goto clean
-if "%1"=="clean-all" goto clean_all
+if "%CMD%"=="clean" goto clean
+if "%CMD%"=="clean-all" goto clean_all
 
-echo Unknown command: %1
+echo Unknown command: %CMD%
 goto usage
 
 :usage
@@ -117,9 +148,9 @@ goto :eof
 echo ==^> Configuring CMake (%BUILD_TYPE%)...
 if not defined VCPKG_ROOT (
     echo Warning: VCPKG_ROOT is not set. Attempting to configure without vcpkg...
-    cmake -S . -B "%BUILD_DIR%" -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=%BUILD_TYPE%
+    cmake -S . -B "%BUILD_DIR%" -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=%BUILD_TYPE% %CMAKE_EXTRA_ARGS%
 ) else (
-    cmake --preset %PRESET%
+    cmake --preset "%PRESET%" %CMAKE_EXTRA_ARGS%
 )
 if errorlevel 1 (
     echo Configuration failed!

build.sh

@@ -126,9 +126,21 @@ parse_opts() {
 
 configure() {
   echo "==> Configuring CMake (${BUILD_TYPE}) using preset ${PRESET}..."
-  if ! cmake --preset "${PRESET}"; then
-    echo "Warning: CMake preset '${PRESET}' failed. Falling back to traditional configure..."
-    cmake -S . -B "${BUILD_DIR}" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}"
+  local -a extra_args=()
+  if [[ -n "${LIVEKIT_VERSION}" ]]; then
+    echo "==> Injecting LIVEKIT_VERSION=${LIVEKIT_VERSION}"
+    extra_args+=("-DLIVEKIT_VERSION=${LIVEKIT_VERSION}")
+  fi
+  if ((${#extra_args[@]})); then
+    if ! cmake --preset "${PRESET}" "${extra_args[@]}"; then
+      echo "Warning: CMake preset '${PRESET}' failed. Falling back to traditional configure..."
+      cmake -S . -B "${BUILD_DIR}" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}" "${extra_args[@]}"
+    fi
+  else
+    if ! cmake --preset "${PRESET}"; then
+      echo "Warning: CMake preset '${PRESET}' failed. Falling back to traditional configure..."
+      cmake -S . -B "${BUILD_DIR}" -DCMAKE_BUILD_TYPE="${BUILD_TYPE}"
+    fi
   fi
 }
 

examples/simple_room/main.cpp

@@ -233,9 +233,16 @@ static std::vector<std::uint8_t> toBytes(const std::string &s) {
   return std::vector<std::uint8_t>(s.begin(), s.end());
 }
 
+void print_livekit_version() {
+  std::cout << "LiveKit version: " << LIVEKIT_BUILD_VERSION_FULL << " ("
+            << LIVEKIT_BUILD_FLAVOR << ", commit " << LIVEKIT_BUILD_COMMIT
+            << ", built " << LIVEKIT_BUILD_DATE << ")" << std::endl;
+}
+
 } // namespace
 
 int main(int argc, char *argv[]) {
+  print_livekit_version();
   std::string url, token;
   bool enable_e2ee = false;
   std::string e2ee_key;

include/livekit/livekit.h

@@ -19,6 +19,7 @@
 #include "audio_frame.h"
 #include "audio_source.h"
 #include "audio_stream.h"
+#include "build.h"
 #include "e2ee.h"
 #include "local_audio_track.h"
 #include "local_participant.h"