Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions cpp/obs/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ else()
endif()

include("${CMAKE_CURRENT_SOURCE_DIR}/cmake/common/bootstrap.cmake" NO_POLICY_SCOPE)
# The template turns this on for every directory, which puts cpp/obs and cpp/moq on the
# include path; on case-insensitive filesystems their VERSION files then answer
# `#include <version>`. Every plugin include is a same-directory quoted one, so nothing needs it.
set(CMAKE_INCLUDE_CURRENT_DIR FALSE)

project(${_name} VERSION ${_version})

Expand Down
2 changes: 1 addition & 1 deletion quest/m1/cpp/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Confirmed in [#4100](https://github.com/moq-dev/moq/pull/4100):

## Required

- [OBS builds on case-insensitive filesystems](/quest/m1/cpp/obs-version-header.md) - `cpp/moq/VERSION` stops shadowing `<version>`, so the macOS and Windows OBS jobs build again
- [Generated bindings end with a newline](/quest/m1/cpp/generated-newline.md) - uniffi-bindgen-cpp stops tripping `-Wnewline-eof`, so the macOS OBS job builds again
- [Client settings parity](/quest/m1/cpp/client-config.md) - moq-ffi offers libmoq's client knobs, and the OBS advanced settings get back the ones the migration dropped
- [Session report parity](/quest/m1/cpp/session-report.md) - a session reports its negotiated draft and reconnect failures, so the OBS dock shows them again
- [Catalog switch](/quest/m1/cpp/catalog-switch.md) - a catalog update keeps OBS playback running until the replacement track is decoding
Expand Down
29 changes: 29 additions & 0 deletions quest/m1/cpp/generated-newline.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# [S] Generated bindings end with a newline

## Goal

`OBS (macOS)` in `platform.yml` builds the plugin against the in-tree
`cpp/moq`. Today it fails with `no newline at end of file
[-Werror,-Wnewline-eof]` on the rendered `moq.hpp`, `moq.cpp`, and
`moq_scaffolding.hpp`.

## Plan

Askama drops each template's final newline, so uniffi-bindgen-cpp writes
files that end mid-line. The OBS template builds with `-Wnewline-eof` and
warnings as errors, and any consumer compiling the published `moq.cpp` with
the same flags hits it too, so fix the generator, not the OBS flags.

In the fork (`kixelated/uniffi-bindgen-cpp`, branch `kixelated/uniffi-0.32`),
append `"\n"` to the three `fs::write` calls in
`bindgen/src/bindings/cpp/mod.rs`, and build `cpp-tests` with
`-Werror=newline-eof` on clang as the regression check. Tag
`v0.11.0-kixelated.3+v0.32.2` and bump every pin site (grep the old tag;
`flake.nix` also needs its hashes), as #4292 did.

The fork release needs the maintainer: an unattended agent was refused
permission to cut it.

## Related

- [C++ through moq-ffi](/quest/m1/cpp/README.md) - the line this blocks
24 changes: 0 additions & 24 deletions quest/m1/cpp/obs-version-header.md

This file was deleted.

Loading