Add env turning triplets into quadruplets

Author: kraenhansen

packages/cmake-rn/src/platforms/android.ts

@@ -6,7 +6,8 @@ import { Option } from "@commander-js/extra-typings";
 import {
   createAndroidLibsDirectory,
   determineAndroidLibsFilename,
-  AndroidTriplet as Target,
+  AndroidTriplet,
+  isAndroidTriplet,
 } from "react-native-node-api";
 
 import type { Platform } from "./types.js";
@@ -15,6 +16,8 @@ import chalk from "chalk";
 import { getWeakNodeApiVariables } from "../weak-node-api.js";
 import { toDeclarationArguments } from "../cmake.js";
 
+type Target = `${AndroidTriplet}-reactnative`;
+
 // This should match https://github.com/react-native-community/template/blob/main/template/android/build.gradle#L7
 const DEFAULT_NDK_VERSION = "27.1.12297006";
 const DEFAULT_ANDROID_SDK_VERSION = "24";
@@ -26,7 +29,7 @@ export const ANDROID_ARCHITECTURES = {
   "aarch64-linux-android": "arm64-v8a",
   "i686-linux-android": "x86",
   "x86_64-linux-android": "x86_64",
-} satisfies Record<Target, AndroidArchitecture>;
+} satisfies Record<AndroidTriplet, AndroidArchitecture>;
 
 const ndkVersionOption = new Option(
   "--ndk-version <version>",
@@ -40,20 +43,26 @@ const androidSdkVersionOption = new Option(
 
 type AndroidOpts = { ndkVersion: string; androidSdkVersion: string };
 
+function tripletFromTarget(target: Target): AndroidTriplet {
+  const result = target.replaceAll(/-reactnative$/g, "") as AndroidTriplet;
+  assert(isAndroidTriplet(result), `Invalid Android triplet: ${target}`);
+  return result;
+}
+
 export const platform: Platform<Target[], AndroidOpts> = {
   id: "android",
   name: "Android",
   targets: [
-    "aarch64-linux-android",
-    "armv7a-linux-androideabi",
-    "i686-linux-android",
-    "x86_64-linux-android",
+    "aarch64-linux-android-reactnative",
+    "armv7a-linux-androideabi-reactnative",
+    "i686-linux-android-reactnative",
+    "x86_64-linux-android-reactnative",
   ],
   defaultTargets() {
     if (process.arch === "arm64") {
-      return ["aarch64-linux-android"];
+      return ["aarch64-linux-android-reactnative"];
     } else if (process.arch === "x64") {
-      return ["x86_64-linux-android"];
+      return ["x86_64-linux-android-reactnative"];
     } else {
       return [];
     }
@@ -88,6 +97,8 @@ export const platform: Platform<Target[], AndroidOpts> = {
       "build/cmake/android.toolchain.cmake",
     );
 
+    const triplet = tripletFromTarget(target);
+
     return [
       "-G",
       "Ninja",
@@ -100,12 +111,12 @@ export const platform: Platform<Target[], AndroidOpts> = {
         // "CMAKE_C_COMPILER_LAUNCHER": "ccache",
         // "CMAKE_CXX_COMPILER_LAUNCHER": "ccache",
         ANDROID_NDK: ndkPath,
-        ANDROID_ABI: ANDROID_ARCHITECTURES[target],
+        ANDROID_ABI: ANDROID_ARCHITECTURES[triplet],
         ANDROID_TOOLCHAIN: "clang",
         ANDROID_PLATFORM: androidSdkVersion,
         // TODO: Make this configurable
         ANDROID_STL: "c++_shared",
-        ...(weakNodeApiLinkage ? getWeakNodeApiVariables(target) : {}),
+        ...(weakNodeApiLinkage ? getWeakNodeApiVariables(triplet) : {}),
       }),
     ];
   },
@@ -137,10 +148,11 @@ export const platform: Platform<Target[], AndroidOpts> = {
             )
             .map((dirent) => path.join(dirent.parentPath, dirent.name));
           assert.equal(result.length, 1, "Expected exactly one library file");
-          return [target, result[0]] as const;
+          const triplet = tripletFromTarget(target);
+          return [triplet, result[0]] as const;
         }),
       ),
-    ) as Record<Target, string>;
+    ) as Record<AndroidTriplet, string>;
     const androidLibsFilename = determineAndroidLibsFilename(
       Object.values(libraryPathByTriplet),
     );

packages/cmake-rn/src/platforms/apple.ts

@@ -5,17 +5,20 @@ import fs from "node:fs";
 import { Option } from "@commander-js/extra-typings";
 import { oraPromise } from "ora";
 import {
-  AppleTriplet as Target,
+  AppleTriplet,
   createAppleFramework,
   createXCframework,
   determineXCFrameworkFilename,
+  isAppleTriplet,
 } from "react-native-node-api";
 
 import type { Platform } from "./types.js";
 import chalk from "chalk";
 import { toDeclarationArguments } from "../cmake.js";
 import { getWeakNodeApiVariables } from "../weak-node-api.js";
 
+type Target = `${AppleTriplet}-reactnative`;
+
 type XcodeSDKName =
   | "iphoneos"
   | "iphonesimulator"
@@ -37,7 +40,7 @@ const XCODE_SDK_NAMES = {
   "arm64-apple-tvos-sim": "appletvsimulator",
   "arm64-apple-visionos": "xros",
   "arm64-apple-visionos-sim": "xrsimulator",
-} satisfies Record<Target, XcodeSDKName>;
+} satisfies Record<AppleTriplet, XcodeSDKName>;
 
 type CMakeSystemName = "Darwin" | "iOS" | "tvOS" | "watchOS" | "visionOS";
 
@@ -52,7 +55,7 @@ const CMAKE_SYSTEM_NAMES = {
   "arm64-apple-tvos-sim": "tvOS",
   "arm64-apple-visionos": "visionOS",
   "arm64-apple-visionos-sim": "visionOS",
-} satisfies Record<Target, CMakeSystemName>;
+} satisfies Record<AppleTriplet, CMakeSystemName>;
 
 type AppleArchitecture = "arm64" | "x86_64" | "arm64;x86_64";
 
@@ -67,7 +70,13 @@ export const APPLE_ARCHITECTURES = {
   "arm64-apple-tvos-sim": "arm64",
   "arm64-apple-visionos": "arm64",
   "arm64-apple-visionos-sim": "arm64",
-} satisfies Record<Target, AppleArchitecture>;
+} satisfies Record<AppleTriplet, AppleArchitecture>;
+
+function tripletFromTarget(target: Target): AppleTriplet {
+  const result = target.replaceAll(/-reactnative$/g, "") as AppleTriplet;
+  assert(isAppleTriplet(result), `Invalid Apple triplet: ${target}`);
+  return result;
+}
 
 export function createPlistContent(values: Record<string, string>) {
   return [
@@ -102,29 +111,30 @@ export const platform: Platform<Target[], AppleOpts> = {
   id: "apple",
   name: "Apple",
   targets: [
-    "arm64;x86_64-apple-darwin",
-    "arm64-apple-ios",
-    "arm64-apple-ios-sim",
-    "arm64-apple-tvos",
-    "arm64-apple-tvos-sim",
-    "arm64-apple-visionos",
-    "arm64-apple-visionos-sim",
+    "arm64;x86_64-apple-darwin-reactnative",
+    "arm64-apple-ios-reactnative",
+    "arm64-apple-ios-sim-reactnative",
+    "arm64-apple-tvos-reactnative",
+    "arm64-apple-tvos-sim-reactnative",
+    "arm64-apple-visionos-reactnative",
+    "arm64-apple-visionos-sim-reactnative",
   ],
   defaultTargets() {
-    return process.arch === "arm64" ? ["arm64-apple-ios-sim"] : [];
+    return process.arch === "arm64" ? ["arm64-apple-ios-sim-reactnative"] : [];
   },
   amendCommand(command) {
     return command.addOption(xcframeworkExtensionOption);
   },
   configureArgs({ target }, { weakNodeApiLinkage }) {
+    const triplet = tripletFromTarget(target);
     return [
       "-G",
       "Xcode",
       ...toDeclarationArguments({
-        CMAKE_SYSTEM_NAME: CMAKE_SYSTEM_NAMES[target],
-        CMAKE_OSX_SYSROOT: XCODE_SDK_NAMES[target],
-        CMAKE_OSX_ARCHITECTURES: APPLE_ARCHITECTURES[target],
-        ...(weakNodeApiLinkage ? getWeakNodeApiVariables(target) : {}),
+        CMAKE_SYSTEM_NAME: CMAKE_SYSTEM_NAMES[triplet],
+        CMAKE_OSX_SYSROOT: XCODE_SDK_NAMES[triplet],
+        CMAKE_OSX_ARCHITECTURES: APPLE_ARCHITECTURES[triplet],
+        ...(weakNodeApiLinkage ? getWeakNodeApiVariables(triplet) : {}),
       }),
     ];
   },

packages/cmake-rn/src/platforms/node.ts

@@ -7,16 +7,25 @@ import chalk from "chalk";
 import {
   createNodeLibsDirectory,
   determineNodeLibsFilename,
-  NodeTriplet as Target,
+  isNodeTriplet,
+  NodeTriplet,
 } from "react-native-node-api";
 
 import type { Platform } from "./types.js";
 import { toDeclarationArguments } from "../cmake.js";
 import { getNodeApiIncludeDirectories } from "../headers.js";
 
+type Target = `${NodeTriplet}-node`;
+
 type NodeOpts = Record<string, unknown>;
 
-function getLinkerFlags(target: Target): string {
+function tripletFromTarget(target: Target): NodeTriplet {
+  const result = target.replaceAll(/-node$/g, "") as NodeTriplet;
+  assert(isNodeTriplet(result), `Invalid Node triplet: ${target}`);
+  return result;
+}
+
+function getLinkerFlags(target: NodeTriplet): string {
   if (
     target === "arm64-apple-darwin" ||
     target === "x86_64-apple-darwin" ||
@@ -38,16 +47,16 @@ export const platform: Platform<Target[], NodeOpts> = {
   id: "nodejs",
   name: "Node.js",
   targets: [
-    "arm64-apple-darwin",
-    "x86_64-apple-darwin",
-    "arm64;x86_64-apple-darwin",
+    "arm64-apple-darwin-node",
+    "x86_64-apple-darwin-node",
+    "arm64;x86_64-apple-darwin-node",
   ],
   defaultTargets() {
     if (process.platform === "darwin") {
       if (process.arch === "arm64") {
-        return ["arm64-apple-darwin"];
+        return ["arm64-apple-darwin-node"];
       } else if (process.arch === "x64") {
-        return ["x86_64-apple-darwin"];
+        return ["x86_64-apple-darwin-node"];
       }
     }
     return [];
@@ -56,17 +65,19 @@ export const platform: Platform<Target[], NodeOpts> = {
     return command;
   },
   configureArgs({ target }) {
+    const triplet = tripletFromTarget(target);
     return [
       "-G",
       "Ninja",
       ...toDeclarationArguments({
         // TODO: Make this names less "cmake-js" specific with an option to use the CMAKE_JS prefix
         CMAKE_JS_INC: getNodeApiIncludeDirectories(),
-        CMAKE_SHARED_LINKER_FLAGS: getLinkerFlags(target),
+        CMAKE_SHARED_LINKER_FLAGS: getLinkerFlags(triplet),
       }),
     ];
   },
   buildArgs() {
+    // TODO: Include the arch in the build command
     return [];
   },
   isSupportedByHost() {
@@ -96,10 +107,11 @@ export const platform: Platform<Target[], NodeOpts> = {
             )
             .map((dirent) => path.join(dirent.parentPath, dirent.name));
           assert.equal(result.length, 1, "Expected exactly one library file");
-          return [target, result[0]] as const;
+          const triplet = tripletFromTarget(target);
+          return [triplet, result[0]] as const;
         }),
       ),
-    ) as Record<Target, string>;
+    ) as Record<NodeTriplet, string>;
     const nodeLibsFilename = determineNodeLibsFilename(
       Object.values(libraryPathByTriplet),
     );