[linux] Move door-lock-app to lock-app (project-chip#17396)

* [lock-app] Move Linux door-lock-app to lock-app * Fix tests
mspang · Apr 19, 2022 · 55a3a14 · 55a3a14
1 parent 0ba8743
commit 55a3a14
Show file tree

Hide file tree

Showing 43 changed files with 212 additions and 11,757 deletions.
diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml
@@ -71,7 +71,7 @@ jobs:
                      "./scripts/build/build_examples.py \
                         --target linux-arm64-all-clusters \
                         --target linux-arm64-chip-tool-no-interactive-ipv6only \
-                        --target linux-arm64-door-lock \
+                        --target linux-arm64-lock \
                         --target linux-arm64-minmdns \
                         --target linux-arm64-thermostat-no-ble \
                         build \

diff --git a/.github/workflows/examples-linux-standalone.yaml b/.github/workflows/examples-linux-standalone.yaml
@@ -138,16 +138,16 @@ jobs:
                     out/ota_requestor_debug/chip-ota-requestor-app \
                     /tmp/bloat_reports/
 
-            - name: Build example Standalone Door Lock App
+            - name: Build example Standalone Lock App
               timeout-minutes: 10
               run: |
                   ./scripts/run_in_build_env.sh \
                      "./scripts/build/build_examples.py \
-                        --target linux-x64-door-lock \
+                        --target linux-x64-lock \
                         build"
                   .environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
-                    linux debug door-lock-app \
-                    out/linux-x64-door-lock/chip-door-lock-app \
+                    linux debug lock-app \
+                    out/linux-x64-lock/chip-lock-app \
                     /tmp/bloat_reports/
             - name: Uploading Size Reports
               uses: actions/upload-artifact@v2

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -82,7 +82,7 @@ jobs:
                      "./scripts/build/build_examples.py \
                         --target linux-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT} \
                         --target linux-x64-all-clusters-test-group-${BUILD_VARIANT} \
-                        --target linux-x64-door-lock-${BUILD_VARIANT} \
+                        --target linux-x64-lock-${BUILD_VARIANT} \
                         --target linux-x64-tv-app-${BUILD_VARIANT} \
                         build \
                         --copy-artifacts-to objdir-clone \
@@ -96,7 +96,7 @@ jobs:
                      run \
                      --iterations 1 \
                      --all-clusters-app ./out/linux-x64-all-clusters-test-group-${BUILD_VARIANT}/chip-all-clusters-app \
-                     --door-lock-app ./out/linux-x64-door-lock-${BUILD_VARIANT}/chip-door-lock-app \
+                     --lock-app ./out/linux-x64-lock-${BUILD_VARIANT}/chip-lock-app \
                      --tv-app ./out/linux-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
                   "
             - name: Uploading core files
@@ -178,7 +178,7 @@ jobs:
                      "./scripts/build/build_examples.py \
                         --target darwin-x64-chip-tool${CHIP_TOOL_VARIANT}-${BUILD_VARIANT} \
                         --target darwin-x64-all-clusters-${BUILD_VARIANT} \
-                        --target darwin-x64-door-lock-${BUILD_VARIANT} \
+                        --target darwin-x64-lock-${BUILD_VARIANT} \
                         --target darwin-x64-tv-app-${BUILD_VARIANT} \
                         build \
                         --copy-artifacts-to objdir-clone \
@@ -193,7 +193,7 @@ jobs:
                      run \
                      --iterations 1 \
                      --all-clusters-app ./out/darwin-x64-all-clusters-${BUILD_VARIANT}/chip-all-clusters-app \
-                     --door-lock-app ./out/darwin-x64-door-lock-${BUILD_VARIANT}/chip-door-lock-app \
+                     --lock-app ./out/darwin-x64-lock-${BUILD_VARIANT}/chip-lock-app \
                      --tv-app ./out/darwin-x64-tv-app-${BUILD_VARIANT}/chip-tv-app \
                   "
             - name: Uploading core files

diff --git a/BUILD.gn b/BUILD.gn
@@ -246,8 +246,8 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     enable_linux_thermostat_app_build =
         enable_default_builds && (host_os == "linux" || host_os == "mac")
 
-    # Build the Linux door lock app example.
-    enable_linux_door_lock_app_build =
+    # Build the Linux lock app example.
+    enable_linux_lock_app_build =
         enable_default_builds && (host_os == "linux" || host_os == "mac")
 
     # Build the cc13x2x7_26x2x7 lock app example.
@@ -413,11 +413,9 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     }
   }
 
-  if (enable_linux_door_lock_app_build) {
-    group("linux_door_lock_app") {
-      deps = [
-        "${chip_root}/examples/door-lock-app/linux(${standalone_toolchain})",
-      ]
+  if (enable_linux_lock_app_build) {
+    group("linux_lock_app") {
+      deps = [ "${chip_root}/examples/lock-app/linux(${standalone_toolchain})" ]
     }
   }
 
@@ -518,8 +516,8 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
     if (enable_linux_lighting_app_build) {
       deps += [ ":linux_lighting_app" ]
     }
-    if (enable_linux_door_lock_app_build) {
-      deps += [ ":linux_door_lock_app" ]
+    if (enable_linux_lock_app_build) {
+      deps += [ ":linux_lock_app" ]
     }
     if (enable_efr32_lock_app_build) {
       deps += [ ":efr32_lock_app" ]

diff --git a/examples/all-clusters-app/linux/BUILD.gn b/examples/all-clusters-app/linux/BUILD.gn
@@ -23,9 +23,9 @@ source_set("chip-all-clusters-common") {
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/binding-handler.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/bridged-actions-stub.cpp",
     "${chip_root}/examples/all-clusters-app/all-clusters-common/src/static-supported-modes-manager.cpp",
-    "${chip_root}/examples/door-lock-app/linux/src/LockEndpoint.cpp",
-    "${chip_root}/examples/door-lock-app/linux/src/LockManager.cpp",
-    "${chip_root}/examples/door-lock-app/linux/src/ZCLDoorLockCallbacks.cpp",
+    "${chip_root}/examples/lock-app/linux/src/LockEndpoint.cpp",
+    "${chip_root}/examples/lock-app/linux/src/LockManager.cpp",
+    "${chip_root}/examples/lock-app/linux/src/ZCLDoorLockCallbacks.cpp",
     "AppOptions.cpp",
     "include/tv-callbacks.cpp",
     "include/tv-callbacks.h",
@@ -41,7 +41,7 @@ source_set("chip-all-clusters-common") {
 
   include_dirs = [
     "${chip_root}/examples/all-clusters-app/all-clusters-common/include",
-    "${chip_root}/examples/door-lock-app/linux/include",
+    "${chip_root}/examples/lock-app/linux/include",
   ]
 
   cflags = [ "-Wconversion" ]

diff --git a/examples/door-lock-app/door-lock-common/BUILD.gn b/examples/door-lock-app/door-lock-common/BUILD.gn