Commit 841cc61
committed
Move bridge C sources to src/native_bridge/ (consolidation step 1, take 2)
First attempt (commit fb60a8c, reverted by c7d71b0) used filesystem
symlinks in darwin/Classes/ pointing outside the pod's directory tree.
CocoaPods 1.16 silently rejects source_files whose resolved path lies
outside the pod's enclosing dir — pod install crashed at "Adding source
files" with an unhelpful "undefined method `map' for nil" from the
error-reporting fallback.
Replace the symlink approach with committed real-file copies under
serious_python_bridge/darwin/Classes/ that the podspec keeps in sync
with src/native_bridge/ at pod-evaluation time via a small Ruby block:
__native_bridge = File.expand_path('../../../native_bridge', __dir__)
if File.directory?(__native_bridge)
FileUtils.cp ... # refresh Classes/ from canonical source
end
Monorepo dev: each `pod install` refreshes Classes/ from the canonical
src/native_bridge/. End users pulling the published pod from pub.dev
have only the committed copies; the relative path doesn't exist for
them, so the sync block is a no-op and CocoaPods sees real files inside
the pod dir as expected.
HEADER_SEARCH_PATHS updated to point at "${PODS_TARGET_SRCROOT}/Classes"
rather than the previous "../native".
Other platforms (linux/windows/android) use add_subdirectory("../../native_bridge")
directly — CMake doesn't care about CocoaPods's directory boundary rule.
CI workflow paths (ci.yml Android cross-build + test-bridge-build.yml
Windows-Debug shim compile) and serious_python_bridge/python/setup.py's
NATIVE_ROOT also rewritten to the new path.1 parent c7d71b0 commit 841cc61
26 files changed
Lines changed: 5698 additions & 27 deletions
File tree
- .github/workflows
- src
- native_bridge
- dart_api
- internal
- serious_python_bridge
- android
- darwin
- Classes
- dart_api
- internal
- linux
- python
- windows
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
535 | 535 | | |
536 | 536 | | |
537 | 537 | | |
538 | | - | |
539 | | - | |
540 | | - | |
| 538 | + | |
| 539 | + | |
| 540 | + | |
541 | 541 | | |
542 | 542 | | |
543 | 543 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
63 | 63 | | |
64 | 64 | | |
65 | 65 | | |
66 | | - | |
| 66 | + | |
67 | 67 | | |
68 | 68 | | |
69 | 69 | | |
| |||
222 | 222 | | |
223 | 223 | | |
224 | 224 | | |
225 | | - | |
226 | | - | |
| 225 | + | |
| 226 | + | |
227 | 227 | | |
228 | 228 | | |
229 | 229 | | |
| |||
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
0 commit comments