address last comments

project-chip · Dec 7, 2022 · 6390d13 · 6390d13
1 parent d870853
commit 6390d13
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 12 deletions.
diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py
@@ -223,7 +223,7 @@ def BuildEfr32Target():
     target.AppendModifier('additional_data_advertising', enable_additional_data_advertising=True)
     target.AppendModifier('use_ot_lib', enable_ot_lib=True).ExceptIfRe('-(wifi|use_ot_coap_lib)')
     target.AppendModifier('use_ot_coap_lib', enable_ot_coap_lib=True).ExceptIfRe('-(wifi|use_ot_lib)')
-    target.AppendModifier('skip-versioning', skip_version=True)
+    target.AppendModifier('no-version', no_version=True)
 
     return target
 

diff --git a/scripts/build/builders/efr32.py b/scripts/build/builders/efr32.py
@@ -134,7 +134,7 @@ def __init__(self,
                  enable_additional_data_advertising: bool = False,
                  enable_ot_lib: bool = False,
                  enable_ot_coap_lib: bool = False,
-                 skip_version: bool = False
+                 no_version: bool = False
                  ):
         super(Efr32Builder, self).__init__(
             root=app.BuildRoot(root),
@@ -202,7 +202,7 @@ def __init__(self,
             self.extra_gn_options.append(
                 'use_silabs_thread_lib=true chip_openthread_target="../silabs:ot-efr32-cert" use_thread_coap_lib=true openthread_external_platform=""')
 
-        if skip_version == False:
+        if not no_version:
             shortCommitSha = subprocess.check_output(['git', 'describe', '--always', '--dirty']).decode('ascii').strip()
             branchName = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']).decode('ascii').strip()
             self.extra_gn_options.append(

diff --git a/scripts/build/testdata/all_targets_linux_x64.txt b/scripts/build/testdata/all_targets_linux_x64.txt
@@ -3,7 +3,7 @@ android-{arm,arm64,x86,x64,androidstudio-arm,androidstudio-arm64,androidstudio-x
 bouffalolab-{bl602-iot-matter-v1,bl602-iot-dvk-3s,bl602-night-light,xt-zb6-devkit,bl706-iot-dvk,bl706-night-light}-light[-shell][-115200][-rpc]
 cc13x2x7_26x2x7-{all-clusters,all-clusters-minimal,lock,pump,pump-controller,shell}[-ftd][-mtd]
 cyw30739-cyw930739m2evb_01-{light,lock,ota-requestor}[-no-progress-logging]
-efr32-{brd4161a,brd4187c,brd4163a,brd4164a,brd4166a,brd4170a,brd4186a,brd4187a,brd4304a}-{window-covering,switch,unit-test,light,lock}[-rpc][-with-ota-requestor][-sed][-low-power][-shell][-no_logging][-openthread_mtd][-enable_heap_monitoring][-no_openthread_cli][-show_qr_code][-wifi][-rs911x][-wf200][-wifi_ipv4][-additional_data_advertising][-use_ot_lib][-use_ot_coap_lib][-skip-versioning]
+efr32-{brd4161a,brd4187c,brd4163a,brd4164a,brd4166a,brd4170a,brd4186a,brd4187a,brd4304a}-{window-covering,switch,unit-test,light,lock}[-rpc][-with-ota-requestor][-sed][-low-power][-shell][-no_logging][-openthread_mtd][-enable_heap_monitoring][-no_openthread_cli][-show_qr_code][-wifi][-rs911x][-wf200][-wifi_ipv4][-additional_data_advertising][-use_ot_lib][-use_ot_coap_lib][-no-version]
 esp32-{m5stack,c3devkit,devkitc,qemu}-{all-clusters,all-clusters-minimal,ota-provider,ota-requestor,shell,light,lock,bridge,temperature-measurement,ota-requestor,tests}[-rpc][-ipv6only]
 genio-lighting-app
 linux-fake-tests[-mbedtls][-boringssl][-asan][-tsan][-libfuzzer][-coverage][-dmalloc][-clang]

diff --git a/scripts/examples/gn_efr32_example.sh b/scripts/examples/gn_efr32_example.sh
@@ -33,7 +33,7 @@ source "$CHIP_ROOT/scripts/activate.sh"
 set -x
 env
 USE_WIFI=false
-USE_SILABS_VERSIONING=true
+USE_GIT_SHA_FOR_VERSION=true
 
 SILABS_THREAD_TARGET=\""../silabs:ot-efr32-cert"\"
 USAGE="./scripts/examples/gn_efr32_example.sh <AppRootFolder> <outputFolder> <silabs_board_name> [<Build options>]"
@@ -85,7 +85,7 @@ if [ "$#" == "0" ]; then
         sl_matter_version_str
             Set a Matter sotfware version string for the Silabs examples
             Used and formatted by default in this script.
-            To skip that formatting or use your own version string use --skip_versioning
+            To skip that formatting or use your own version string use --no-version
         use_rs911x
             Build wifi example with extension board rs911x. (Default false)
         use_wf200
@@ -109,7 +109,7 @@ if [ "$#" == "0" ]; then
             enable Addition data advertissing and rotating device ID
         --use_ot_lib
             use the silabs openthread library
-        --skip_versioning
+        --no-version
             Skip the silabs formating for the Matter software version string
             Currently : v1.0-<branchName>-<ShortCommitSha>
     "
@@ -136,9 +136,9 @@ else
                     exit 1
                 fi
                 if [ "$2" = "rs911x" ]; then
-                    optArgs+="use_rs911x=true"
+                    optArgs+="use_rs911x=true "
                 elif [ "$2" = "wf200" ]; then
-                    optArgs+="use_wf200=true"
+                    optArgs+="use_wf200=true "
                 else
                     echo "Wifi usage: --wifi rs911x|wf200"
                     exit 1
@@ -171,8 +171,8 @@ else
                 optArgs+="use_silabs_thread_lib=true chip_openthread_target=$SILABS_THREAD_TARGET openthread_external_platform=\"""\" use_thread_coap_lib=true "
                 shift
                 ;;
-            --skip_versioning)
-                USE_SILABS_VERSIONING=false
+            --no-version)
+                USE_GIT_SHA_FOR_VERSION=false
                 shift
                 ;;
             *)
@@ -191,7 +191,7 @@ else
         exit 1
     fi
 
-    if [ "$USE_SILABS_VERSIONING" == true ]; then
+    if [ "$USE_GIT_SHA_FOR_VERSION" == true ]; then
         {
             ShortCommitSha=$(git describe --always --dirty)
             branchName=$(git rev-parse --abbrev-ref HEAD)