fixed inclusion of resources in swift package (#50050)

Summary:
We had some issues with the Swift package build step where we saw an error message when we included resources and couldn't find out why this was happening.

After systematically going through the generated swift package file and looking for a reason I found a mistake.

When we generate the Package.swift file we pass all compilerFlags from the configuration of the target to both cpp/c flags - which in the case of the folly target ends up being passed to the dependency scanner which isn't too happy about this c++ flag.

The solution was to split `compilerFlags` into `cCompilerFlags` and `cxxCompilerFlags`.

This commit fixes this by:
- split `compilerFlags` into `cCompilerFlags` and `cxxCompilerFlags`.
- Updated configuration with correct settings
- Updated Package.swift generation to use these new flags
- Fixed issue with the copy bundles step that didn't copy the directory in some cases.

## Changelog:

[INTERNAL]  - Fixed processing resources in the generated swift package for the RN Dependencies/prebuild

## Test-plan

Test by prebuilding RNDependencies, include the XCFramework in a new app and try to load resource bundles:

```obj-c
- (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions {
  std::string input = "3.1416 xyz ";
  double_conversion::DoubleToStringConverter::EcmaScriptConverter();
  LOG(INFO) << "Hello from GLOG";
  fmt::print("Hello, world from FMT!\n");
  BOOST_ASSERT(100 == 100);
  double result;
  fast_float::from_chars(input.data(), input.data() + input.size(), result);
  LOG(INFO) << "Answer :" << result;

  NSArray *frameworks = [NSBundle allFrameworks];

  for (NSBundle *framework in frameworks) {
    NSString *frameworkName = framework.bundleURL.lastPathComponent;
    if ([frameworkName isEqualToString: @"ReactNativeDependencies.framework"]) {
      [self loadBundle:framework bundleName:@"ReactNativeDependencies_glog"];
      [self loadBundle:framework bundleName:@"ReactNativeDependencies_boost"];
      [self loadBundle:framework bundleName:@"ReactNativeDependencies_folly"];
      break;
    }
  }
  return YES;
}

- (void) loadBundle:(NSBundle*)framework bundleName: (NSString*)bundleName {
  NSBundle *bundle = [NSBundle bundleWithURL:[framework bundleURL]];
  NSURL *bundleURL = [bundle URLForResource:bundleName withExtension:@"bundle"];
  NSBundle *resourceBundle = [NSBundle bundleWithURL:bundleURL];
  NSURL* url = [resourceBundle URLForResource:@"PrivacyInfo" withExtension:@"xcprivacy"];
  if (url == nil) {
    LOG(ERROR) << "Could not find PrivacyInfo.xcprivacy in the " << [bundleName UTF8String] << " bundle";
  } else {
    LOG(INFO) << "Found PrivacyInfo.xcprivacy in " << [bundleName UTF8String] << ".";
  }
}
```

Pull Request resolved: #50050

Reviewed By: javache

Differential Revision: D71316215

Pulled By: cipolleschi

fbshipit-source-id: 53093f962874101f5618997fdac3dd4550768da5

Author: chrfalch

scripts/releases/ios-prebuild/compose-framework.js

@@ -113,6 +113,7 @@ function copyBundles(
             targetArchFolder,
             `${scheme}.framework`,
             'Resources',
+            bundleName,
           );
           if (
             !fs.existsSync(path.join(targetArchFolder, `${scheme}.framework`))
@@ -123,7 +124,8 @@ function copyBundles(
             console.warn("Source bundle doesn't exist", sourceBundlePath);
           }
           // A bundle is a directory, so we need to copy the whole directory
-          execSync(`cp -r ${sourceBundlePath} ${targetBundlePath}`);
+          execSync(`mkdir -p "${targetBundlePath}"`);
+          execSync(`cp -r "${sourceBundlePath}/" "${targetBundlePath}"`);
         });
       } else {
         console.warn(`Bundle ${sourceBundlePath} not found`);

scripts/releases/ios-prebuild/configuration.js

@@ -48,13 +48,14 @@ const dependencies /*: $ReadOnlyArray<Dependency> */ = [
         'src/vlog_is_on.cc',
       ],
       headers: ['src/glog/*.h'],
-      // resources: ['../third-party-podspecs/glog/PrivacyInfo.xcprivacy'],
+      resources: ['../third-party-podspecs/glog/PrivacyInfo.xcprivacy'],
       headerSkipFolderNames: 'src',
     },
     settings: {
       publicHeaderFiles: './headers',
       headerSearchPaths: ['src'],
-      compilerFlags: ['-Wno-shorten-64-to-32', '-Wno-everything'],
+      cCompilerFlags: ['-Wno-shorten-64-to-32'],
+      cxxCompilerFlags: ['-Wno-shorten-64-to-32', `-std=${CPP_STANDARD}`],
       defines: [
         {name: 'DEFINES_MODULE', value: 'YES'},
         {name: 'USE_HEADERMAP', value: 'NO'},
@@ -76,7 +77,6 @@ const dependencies /*: $ReadOnlyArray<Dependency> */ = [
     settings: {
       publicHeaderFiles: './headers',
       headerSearchPaths: ['src'],
-      compilerFlags: ['-Wno-everything'],
     },
   },
   {
@@ -94,7 +94,7 @@ const dependencies /*: $ReadOnlyArray<Dependency> */ = [
       publicHeaderFiles: './include',
       headerSearchPaths: ['include'],
       linkedLibraries: ['c++'],
-      compilerFlags: ['-Wno-everything', `-std=${CPP_STANDARD}`],
+      cxxCompilerFlags: [`-std=${CPP_STANDARD}`],
     },
   },
   {
@@ -107,12 +107,13 @@ const dependencies /*: $ReadOnlyArray<Dependency> */ = [
     files: {
       sources: ['boost/**/*.hpp', 'dummy.cc'],
       headers: ['boost/**/*.hpp'],
-      // resources: ['../third-party-podspecs/boost/PrivacyInfo.xcprivacy'],
+      resources: ['../third-party-podspecs/boost/PrivacyInfo.xcprivacy'],
     },
     settings: {
       publicHeaderFiles: './',
       headerSearchPaths: ['./'],
-      compilerFlags: ['-Wno-everything', '-Wno-documentation'],
+      cCompilerFlags: ['-Wno-documentation'],
+      cxxCompilerFlags: ['-Wno-documentation', `-std=${CPP_STANDARD}`],
     },
   },
   {
@@ -130,7 +131,7 @@ const dependencies /*: $ReadOnlyArray<Dependency> */ = [
     settings: {
       publicHeaderFiles: './include',
       headerSearchPaths: ['include'],
-      compilerFlags: ['-Wno-everything', `-std=${CPP_STANDARD}`],
+      cxxCompilerFlags: [`-std=${CPP_STANDARD}`],
       linkedLibraries: ['c++'],
     },
   },
@@ -158,7 +159,6 @@ const dependencies /*: $ReadOnlyArray<Dependency> */ = [
         'SocketRocket/Internal/Security',
         'SocketRocket/Internal/Utilities',
       ],
-      compilerFlags: ['-Wno-everything'],
     },
   },
   {
@@ -245,8 +245,7 @@ const dependencies /*: $ReadOnlyArray<Dependency> */ = [
         'folly/portability/*.h',
         'folly/system/*.h',
       ],
-      // TODO: When including this we get "failed to scan dependencies" error
-      // resources: ['../third-party-podspecs/RCT-Folly/PrivacyInfo.xcprivacy'],
+      resources: ['../third-party-podspecs/RCT-Folly/PrivacyInfo.xcprivacy'],
     },
     dependencies: [
       'glog',
@@ -259,12 +258,12 @@ const dependencies /*: $ReadOnlyArray<Dependency> */ = [
     settings: {
       publicHeaderFiles: './',
       headerSearchPaths: ['./'],
-      compilerFlags: [
-        '-Wno-everything',
-        `-std=${CPP_STANDARD}`,
+      cCompilerFlags: ['-faligned-new', '-Wno-shorten-64-to-32', '-Wno-comma'],
+      cxxCompilerFlags: [
         '-faligned-new',
         '-Wno-shorten-64-to-32',
         '-Wno-comma',
+        `-std=${CPP_STANDARD}`,
       ],
       defines: [
         {name: 'USE_HEADERMAP', value: 'NO'},

scripts/releases/ios-prebuild/swift-package.js

@@ -68,9 +68,15 @@ ${dependencies.map(d => createSwiftTarget(d)).join('')}
  */
 function createSwiftTarget(dependency /*  :Dependency */) {
   // Setup unsafe flags
-  let unsafeCAndCxxSettings = '';
-  if (dependency.settings.compilerFlags != null) {
-    unsafeCAndCxxSettings = `.unsafeFlags([${dependency.settings.compilerFlags.map(flag => `"${flag}"`).join(', ')}]),`;
+  let unsafeCSettings = '';
+  if (dependency.settings.cCompilerFlags != null) {
+    unsafeCSettings = `.unsafeFlags([${dependency.settings.cCompilerFlags.map(flag => `"${flag}"`).join(', ')}]),`;
+  }
+
+  // Add c++ version to c++ settings if provided
+  let unsafeCxxSettings = '';
+  if (dependency.settings.cxxCompilerFlags != null) {
+    unsafeCxxSettings = `.unsafeFlags([${dependency.settings.cxxCompilerFlags.map(flag => `"${flag}"`).join(', ')}]),`;
   }
 
   // Setup defines
@@ -120,12 +126,12 @@ function createSwiftTarget(dependency /*  :Dependency */) {
               publicHeadersPath: "${dependency.settings.publicHeaderFiles}",
               cSettings: [
                 ${headerSearchPaths}
-                ${unsafeCAndCxxSettings}
+                ${unsafeCSettings}
                 ${defines}
               ],
               cxxSettings: [
                 ${headerSearchPaths}
-                ${unsafeCAndCxxSettings}
+                ${unsafeCxxSettings}
                 ${defines}
               ],
               linkerSettings: [

scripts/releases/ios-prebuild/types.js

@@ -31,7 +31,8 @@ export type Define = $ReadOnly<{
 export type Settings = $ReadOnly<{
   headerSearchPaths?: $ReadOnlyArray<string>,
   defines?: $ReadOnlyArray<Define>,
-  compilerFlags?: $ReadOnlyArray<string>,
+  cCompilerFlags?: $ReadOnlyArray<string>,
+  cxxCompilerFlags?: $ReadOnlyArray<string>,
   linkedLibraries?: $ReadOnlyArray<string>,
   publicHeaderFiles: string,
   linkerSettings?: $ReadOnlyArray<string>