Skip to content

Commit 83be949

Browse files
committed
fix(apple): update objc ffi generated paths
1 parent e1b7e1e commit 83be949

3 files changed

Lines changed: 15 additions & 15 deletions

File tree

.gitignore

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ packages/*/types
6767
SwiftBindgen
6868

6969
# Generated Objective-C/C dispatch wrappers
70-
NativeScript/ffi/*/GeneratedSignatureDispatch.inc
71-
NativeScript/ffi/*/GeneratedSignatureDispatch.inc.stamp
72-
NativeScript/ffi/*/GeneratedGsdSignatureDispatch.inc
73-
NativeScript/ffi/*/GeneratedGsdSignatureDispatch.inc.stamp
70+
NativeScript/ffi/**/GeneratedSignatureDispatch.inc
71+
NativeScript/ffi/**/GeneratedSignatureDispatch.inc.stamp
72+
NativeScript/ffi/**/GeneratedGsdSignatureDispatch.inc
73+
NativeScript/ffi/**/GeneratedGsdSignatureDispatch.inc.stamp
7474

7575
# Packaged native framework artifacts
7676
packages/*/NativeScript.xcframework/

scripts/metagen.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ async function main() {
338338
const signatureBindingsPath =
339339
process.env.NS_SIGNATURE_BINDINGS_CPP_PATH ||
340340
process.env.TNS_SIGNATURE_BINDINGS_CPP_PATH ||
341-
path.resolve(__dirname, "..", "NativeScript", "ffi", "napi", "GeneratedSignatureDispatch.inc");
341+
path.resolve(__dirname, "..", "NativeScript", "ffi", "objc", "napi", "GeneratedSignatureDispatch.inc");
342342
await fsp.rm(typesDir, { recursive: true, force: true });
343343
await fsp.mkdir(typesDir, { recursive: true });
344344
await fsp.mkdir(metadataDir, { recursive: true });

scripts/run-tests-macos.js

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -106,16 +106,16 @@ const junitEndTag = "</testsuites>";
106106
const consoleLogMarker = "CONSOLE LOG:";
107107
const crashReportsDir = path.join(os.homedir(), "Library", "Logs", "DiagnosticReports");
108108
const generatedRuntimeBuildOutputs = new Set([
109-
path.join(nativeScriptSourceRoot, "ffi", "napi", "GeneratedSignatureDispatch.inc"),
110-
path.join(nativeScriptSourceRoot, "ffi", "napi", "GeneratedSignatureDispatch.inc.stamp"),
111-
path.join(nativeScriptSourceRoot, "ffi", "hermes", "GeneratedSignatureDispatch.inc"),
112-
path.join(nativeScriptSourceRoot, "ffi", "hermes", "GeneratedSignatureDispatch.inc.stamp"),
113-
path.join(nativeScriptSourceRoot, "ffi", "v8", "GeneratedSignatureDispatch.inc"),
114-
path.join(nativeScriptSourceRoot, "ffi", "v8", "GeneratedSignatureDispatch.inc.stamp"),
115-
path.join(nativeScriptSourceRoot, "ffi", "jsc", "GeneratedSignatureDispatch.inc"),
116-
path.join(nativeScriptSourceRoot, "ffi", "jsc", "GeneratedSignatureDispatch.inc.stamp"),
117-
path.join(nativeScriptSourceRoot, "ffi", "quickjs", "GeneratedSignatureDispatch.inc"),
118-
path.join(nativeScriptSourceRoot, "ffi", "quickjs", "GeneratedSignatureDispatch.inc.stamp")
109+
path.join(nativeScriptSourceRoot, "ffi", "objc", "napi", "GeneratedSignatureDispatch.inc"),
110+
path.join(nativeScriptSourceRoot, "ffi", "objc", "napi", "GeneratedSignatureDispatch.inc.stamp"),
111+
path.join(nativeScriptSourceRoot, "ffi", "objc", "hermes", "GeneratedSignatureDispatch.inc"),
112+
path.join(nativeScriptSourceRoot, "ffi", "objc", "hermes", "GeneratedSignatureDispatch.inc.stamp"),
113+
path.join(nativeScriptSourceRoot, "ffi", "objc", "v8", "GeneratedSignatureDispatch.inc"),
114+
path.join(nativeScriptSourceRoot, "ffi", "objc", "v8", "GeneratedSignatureDispatch.inc.stamp"),
115+
path.join(nativeScriptSourceRoot, "ffi", "objc", "jsc", "GeneratedSignatureDispatch.inc"),
116+
path.join(nativeScriptSourceRoot, "ffi", "objc", "jsc", "GeneratedSignatureDispatch.inc.stamp"),
117+
path.join(nativeScriptSourceRoot, "ffi", "objc", "quickjs", "GeneratedSignatureDispatch.inc"),
118+
path.join(nativeScriptSourceRoot, "ffi", "objc", "quickjs", "GeneratedSignatureDispatch.inc.stamp")
119119
]);
120120

121121
function parseArgs() {

0 commit comments

Comments
 (0)