Add ability to override 'objc_defines' via --user-options (#125)

sergeykhliustin · Mar 8, 2024 · 299f652 · 299f652
1 parent 7b7b570
commit 299f652
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -94,7 +94,7 @@ OPTIONS:
                           If 'user_options' not specified, but --user_options exist, user_options patch are applied automatically.
   --user-options <user-options>
                           User extra options.
-                          Supported fields: 'sdk_frameworks', 'sdk_dylibs', 'weak_sdk_frameworks', 'vendored_libraries', 'vendored_frameworks', 'vendored_xcframeworks', 'testonly', 'link_dynamic', 'data', 'runner', 'test_host', 'timeout'.
+                          Supported fields: 'sdk_frameworks', 'sdk_dylibs', 'weak_sdk_frameworks', 'vendored_libraries', 'vendored_frameworks', 'vendored_xcframeworks', 'testonly', 'link_dynamic', 'data', 'objc_defines', 'runner', 'test_host', 'timeout'.
                           Supported operators: '+=' (append), '-=' (delete), ':=' (replace).
                           Example:
                           'SomePod.sdk_dylibs += something,something'
@@ -139,7 +139,7 @@ OPTIONS:
                           If 'user_options' not specified, but --user_options exist, user_options patch are applied automatically.
   --user-options <user-options>
                           User extra options.
-                          Supported fields: 'sdk_frameworks', 'sdk_dylibs', 'weak_sdk_frameworks', 'vendored_libraries', 'vendored_frameworks', 'vendored_xcframeworks', 'testonly', 'link_dynamic', 'data', 'runner', 'test_host', 'timeout'.
+                          Supported fields: 'sdk_frameworks', 'sdk_dylibs', 'weak_sdk_frameworks', 'vendored_libraries', 'vendored_frameworks', 'vendored_xcframeworks', 'testonly', 'link_dynamic', 'data', 'objc_defines', 'runner', 'test_host', 'timeout'.
                           Supported operators: '+=' (append), '-=' (delete), ':=' (replace).
                           Example:
                           'SomePod.sdk_dylibs += something,something'

diff --git a/Sources/BazelPodsCore/Analyzer/Analyzers/BuildSettingsAnalyzer.swift b/Sources/BazelPodsCore/Analyzer/Analyzers/BuildSettingsAnalyzer.swift
@@ -9,12 +9,12 @@ import Foundation
 
 struct BuildSettingsAnalyzer<S: XCConfigRepresentable> {
     struct Result {
-        let swiftCopts: [String]
-        let objcCopts: [String]
-        let ccCopts: [String]
-        let linkOpts: [String]
-        let objcDefines: [String]
-        let xcconfig: [String: StarlarkNode]
+        var swiftCopts: [String]
+        var objcCopts: [String]
+        var ccCopts: [String]
+        var linkOpts: [String]
+        var objcDefines: [String]
+        var xcconfig: [String: StarlarkNode]
     }
     private let platform: Platform
     private let spec: S

diff --git a/Sources/BazelPodsCore/Core/UserOption.swift b/Sources/BazelPodsCore/Core/UserOption.swift
@@ -54,6 +54,7 @@ public struct UserOption {
         case testonly(Bool)
         case link_dynamic(Bool)
         case data([String])
+        case objc_defines([String])
         case runner(String)
         case test_host(String)
         case timeout(TestsTimeout)
@@ -68,6 +69,7 @@ public struct UserOption {
         case testonly
         case link_dynamic
         case data
+        case objc_defines
         case runner
         case test_host
         case timeout
@@ -175,6 +177,8 @@ public struct UserOption {
             attribute = .link_dynamic(bool)
         case .data:
             attribute = .data(value)
+        case .objc_defines:
+            attribute = .objc_defines(value)
         case .runner:
             guard opt == .replace else {
                 log_error("Incorrect option for \(string). '\(keyPath)' supports only \(Opt.replace.rawValue) operator. Skipping...")

diff --git a/Sources/BazelPodsCore/Patches/UserOptionsPatch.swift b/Sources/BazelPodsCore/Patches/UserOptionsPatch.swift
@@ -91,6 +91,15 @@ struct UserOptionsPatch: Patch, TestSpecSpecificPatch {
                 case .replace:
                     resources.resources = value
                 }
+            case .objc_defines(let value):
+                switch option.opt {
+                case .append:
+                    buildSettings.objcDefines += value.filter({ !buildSettings.objcDefines.contains($0) })
+                case .delete:
+                    buildSettings.objcDefines.removeAll(where: { value.contains($0) })
+                case .replace:
+                    buildSettings.objcDefines = value
+                }
             case .runner:
                 // test spec specific option
                 break