removeing quotes from wildcard

Alami-Amine · Sep 5, 2024 · 9f0f860 · 9f0f860
1 parent aa13a29
commit 9f0f860
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 16 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -197,7 +197,7 @@ jobs:
                       esac
 
                       rm -rf ./out/sanitizers
-                      BUILD_TYPE=sanitizers scripts/build/gn_gen.sh --args="$GN_ARGS chip_data_model_check_die_on_failure=true" --add-export-compile-commands="*"
+                      BUILD_TYPE=sanitizers scripts/build/gn_gen.sh --args="$GN_ARGS chip_data_model_check_die_on_failure=true" --add-export-compile-commands=*
                       BUILD_TYPE=sanitizers scripts/tests/gn_tests.sh
                   done
             - name: Ensure codegen is done for sanitize
@@ -415,7 +415,7 @@ jobs:
                           # clang.
                           "default") GN_ARGS='target_os="all" is_asan=true enable_host_clang_build=false';;
                       esac
-                      BUILD_TYPE=$BUILD_TYPE scripts/build/gn_gen.sh --args="$GN_ARGS chip_data_model_check_die_on_failure=true" --add-export-compile-commands="*"
+                      BUILD_TYPE=$BUILD_TYPE scripts/build/gn_gen.sh --args="$GN_ARGS chip_data_model_check_die_on_failure=true" --add-export-compile-commands=*
                       scripts/run_in_build_env.sh "ninja -C ./out/$BUILD_TYPE"
                       BUILD_TYPE=$BUILD_TYPE scripts/tests/gn_tests.sh
                   done

diff --git a/examples/chef/chef.py b/examples/chef/chef.py
@@ -884,7 +884,7 @@ def main() -> int:
                         """))
             if options.do_clean:
                 shell.run_cmd("rm -rf out")
-            shell.run_cmd("gn gen --add-export-compile-commands="*" out")
+            shell.run_cmd("gn gen --add-export-compile-commands=* out")
             shell.run_cmd("ninja -C out")
 
     #

diff --git a/examples/lighting-app/tizen/README.md b/examples/lighting-app/tizen/README.md
@@ -13,7 +13,7 @@ Generating tizen-arm-light
 ```sh
 gn gen --check \
     --fail-on-unused-args \
-    --add-export-compile-commands="*" \
+    --add-export-compile-commands=* \
     --root=$PW_PROJECT_ROOT/examples/lighting-app/tizen \
     "--args=target_os=\"tizen\" target_cpu=\"arm\" tizen_sdk_root=\"$TIZEN_SDK_ROOT\" tizen_sdk_sysroot=\"$TIZEN_SDK_SYSROOT\"" \
     $PW_PROJECT_ROOT/out/tizen-arm-light

diff --git a/scripts/build/builders/efr32.py b/scripts/build/builders/efr32.py
@@ -324,7 +324,7 @@ def bundle_outputs(self):
     def generate(self):
         cmd = [
             'gn', 'gen', '--check', '--fail-on-unused-args',
-            '--add-export-compile-commands="*"',
+            '--add-export-compile-commands=*',
             '--root=%s' % self.root
         ]
         if self.dotfile:

diff --git a/scripts/build/builders/gn.py b/scripts/build/builders/gn.py
@@ -55,7 +55,7 @@ def PostBuildCommand(self):
     def generate(self):
         cmd = [
             'gn', 'gen', '--check', '--fail-on-unused-args',
-            '--add-export-compile-commands="*"',
+            '--add-export-compile-commands=*',
             '--root=%s' % self.root
         ]
 

diff --git a/scripts/build/builders/nxp.py b/scripts/build/builders/nxp.py
@@ -244,7 +244,7 @@ def generate(self):
                     elif p.sdk_name == 'common':
                         cmd += 'export NXP_SDK_ROOT="' + str(p.sdk_storage_location_abspath) + '" \n '
             # add empty space at the end to avoid concatenation issue when there is no --args
-            cmd += 'gn gen --check --fail-on-unused-args --add-export-compile-commands="*" --root=%s ' % self.root
+            cmd += 'gn gen --check --fail-on-unused-args --add-export-compile-commands=* --root=%s ' % self.root
 
             extra_args = []
 

diff --git a/scripts/build/testdata/dry_run_efr32-brd4187c-light-rpc-no-version.txt b/scripts/build/testdata/dry_run_efr32-brd4187c-light-rpc-no-version.txt
@@ -2,7 +2,7 @@
 cd "{root}"
 
 # Generating efr32-brd4187c-light-rpc-no-version
-gn gen --check --fail-on-unused-args --add-export-compile-commands="*" --root={root}/examples/lighting-app/silabs '--args=silabs_board="BRD4187C" is_debug=false import("//with_pw_rpc.gni") efr32_sdk_root="TEST_GSDK_ROOT" openthread_root="TEST_GSDK_ROOT/util/third_party/openthread" wiseconnect_sdk_root="TEST_WISECONNECT_SDK_ROOT" wifi_sdk_root="TEST_WIFI_SDK_ROOT"' {out}/efr32-brd4187c-light-rpc-no-version
+gn gen --check --fail-on-unused-args --add-export-compile-commands=* --root={root}/examples/lighting-app/silabs '--args=silabs_board="BRD4187C" is_debug=false import("//with_pw_rpc.gni") efr32_sdk_root="TEST_GSDK_ROOT" openthread_root="TEST_GSDK_ROOT/util/third_party/openthread" wiseconnect_sdk_root="TEST_WISECONNECT_SDK_ROOT" wifi_sdk_root="TEST_WIFI_SDK_ROOT"' {out}/efr32-brd4187c-light-rpc-no-version
 
 # Building efr32-brd4187c-light-rpc-no-version
 ninja -C {out}/efr32-brd4187c-light-rpc-no-version
diff --git a/scripts/build/testdata/dry_run_linux-arm64-chip-tool-ipv6only-clang.txt b/scripts/build/testdata/dry_run_linux-arm64-chip-tool-ipv6only-clang.txt
@@ -4,7 +4,7 @@ cd "{root}"
 # Generating linux-arm64-chip-tool-ipv6only-clang
 bash -c '
 PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \
- gn gen --check --fail-on-unused-args --add-export-compile-commands="*" --root={root}/examples/chip-tool '"'"'--args=chip_inet_config_enable_ipv4=false is_clang=true target_cpu="arm64" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-chip-tool-ipv6only-clang'
+ gn gen --check --fail-on-unused-args --add-export-compile-commands=* --root={root}/examples/chip-tool '"'"'--args=chip_inet_config_enable_ipv4=false is_clang=true target_cpu="arm64" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-chip-tool-ipv6only-clang'
 
 # Setting up Java deps
 third_party/java_deps/set_up_java_deps.sh

diff --git a/scripts/build/testdata/dry_run_linux-arm64-ota-requestor-nodeps-ipv6only.txt b/scripts/build/testdata/dry_run_linux-arm64-ota-requestor-nodeps-ipv6only.txt
@@ -4,7 +4,7 @@ cd "{root}"
 # Generating linux-arm64-ota-requestor-nodeps-ipv6only
 bash -c '
 PKG_CONFIG_PATH="SYSROOT_AARCH64/lib/aarch64-linux-gnu/pkgconfig" \
- gn gen --check --fail-on-unused-args --add-export-compile-commands="*" --root={root}/examples/ota-requestor-app/linux '"'"'--args=chip_inet_config_enable_ipv4=false chip_config_network_layer_ble=false chip_enable_wifi=false chip_enable_openthread=false is_clang=true chip_crypto="mbedtls" target_cpu="arm64" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-ota-requestor-nodeps-ipv6only'
+ gn gen --check --fail-on-unused-args --add-export-compile-commands=* --root={root}/examples/ota-requestor-app/linux '"'"'--args=chip_inet_config_enable_ipv4=false chip_config_network_layer_ble=false chip_enable_wifi=false chip_enable_openthread=false is_clang=true chip_crypto="mbedtls" target_cpu="arm64" sysroot="SYSROOT_AARCH64"'"'"' {out}/linux-arm64-ota-requestor-nodeps-ipv6only'
 
 # Setting up Java deps
 third_party/java_deps/set_up_java_deps.sh

diff --git a/scripts/build/testdata/dry_run_linux-x64-all-clusters-coverage.txt b/scripts/build/testdata/dry_run_linux-x64-all-clusters-coverage.txt
@@ -2,7 +2,7 @@
 cd "{root}"
 
 # Generating linux-x64-all-clusters-coverage
-gn gen --check --fail-on-unused-args --add-export-compile-commands="*" --root={root}/examples/all-clusters-app/linux --args=use_coverage=true {out}/linux-x64-all-clusters-coverage
+gn gen --check --fail-on-unused-args --add-export-compile-commands=* --root={root}/examples/all-clusters-app/linux --args=use_coverage=true {out}/linux-x64-all-clusters-coverage
 
 # Setting up Java deps
 third_party/java_deps/set_up_java_deps.sh

diff --git a/scripts/examples/gn_bouffalolab_example.sh b/scripts/examples/gn_bouffalolab_example.sh
@@ -200,7 +200,7 @@ else
     example_dir=$MATTER_ROOT/examples/$example_name/bouffalolab/$bouffalo_chip
     output_dir=$MATTER_ROOT/$output_folder
 
-    gn gen --check --fail-on-unused-args --add-export-compile-commands="*" --root="$example_dir" "$output_dir" --args="${optArgs[*]}"
+    gn gen --check --fail-on-unused-args --add-export-compile-commands=* --root="$example_dir" "$output_dir" --args="${optArgs[*]}"
 
     ninja -C "$output_dir"
 fi
diff --git a/scripts/examples/gn_silabs_example.sh b/scripts/examples/gn_silabs_example.sh
@@ -340,7 +340,7 @@ else
         optArgs+="openthread_root=\"$GSDK_ROOT/util/third_party/openthread\" "
     fi
 
-    "$GN_PATH" gen --check --script-executable="$PYTHON_PATH" --fail-on-unused-args --add-export-compile-commands="*" --root="$ROOT" --dotfile="$DOTFILE" --args="silabs_board=\"$SILABS_BOARD\" $optArgs" "$BUILD_DIR"
+    "$GN_PATH" gen --check --script-executable="$PYTHON_PATH" --fail-on-unused-args --add-export-compile-commands=* --root="$ROOT" --dotfile="$DOTFILE" --args="silabs_board=\"$SILABS_BOARD\" $optArgs" "$BUILD_DIR"
 
     if [ "$USE_SLC" == true ]; then
         # Activation needs to be after SLC generation which is done in gn gen.

diff --git a/scripts/examples/gn_stm32_example.sh b/scripts/examples/gn_stm32_example.sh
@@ -176,14 +176,14 @@ else
     BUILD_DIR=$OUTDIR/$STM32_BOARD
     echo BUILD_DIR="$BUILD_DIR"
     if [ "$USE_WIFI" == true ]; then
-        gn gen --check --fail-on-unused-args --add-export-compile-commands="*" --root="$ROOT" --dotfile="$ROOT"/build_for_wifi_gnfile.gn --args="stm32_board=\"$STM32_BOARD\" $optArgs" "$BUILD_DIR"
+        gn gen --check --fail-on-unused-args --add-export-compile-commands=* --root="$ROOT" --dotfile="$ROOT"/build_for_wifi_gnfile.gn --args="stm32_board=\"$STM32_BOARD\" $optArgs" "$BUILD_DIR"
     else
         # thread build
         #
         if [ -z "$optArgs" ]; then
-            gn gen --check --fail-on-unused-args --add-export-compile-commands="*" --root="$ROOT" --args="stm32_board=\"$STM32_BOARD\" treat_warnings_as_errors=false" --ide=json "$BUILD_DIR"
+            gn gen --check --fail-on-unused-args --add-export-compile-commands=* --root="$ROOT" --args="stm32_board=\"$STM32_BOARD\" treat_warnings_as_errors=false" --ide=json "$BUILD_DIR"
         else
-            gn gen --check --fail-on-unused-args --add-export-compile-commands="*" --root="$ROOT" --args="stm32_board=\"$STM32_BOARD\" $optArgs treat_warnings_as_errors=false" --ide=json "$BUILD_DIR"
+            gn gen --check --fail-on-unused-args --add-export-compile-commands=* --root="$ROOT" --args="stm32_board=\"$STM32_BOARD\" $optArgs treat_warnings_as_errors=false" --ide=json "$BUILD_DIR"
         fi
     fi
     ninja -v -C "$BUILD_DIR"/