Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[python] Fix Python device library build #20043

Merged
merged 2 commits into from
Jun 28, 2022
Merged

[python] Fix Python device library build #20043

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a84c3e
Drop chip_use_clusters_for_ip_commissioning
agners Jun 28, 2022
7726aed
Drop unused variables
agners Jun 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 1 addition & 8 deletions scripts/build_python_device.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ ENVIRONMENT_ROOT="$CHIP_ROOT/out/python_env"
declare chip_detail_logging=false
declare enable_pybindings=false
declare chip_mdns
declare clusters=true

help() {

Expand All @@ -54,8 +53,6 @@ Input Options:
By default it is false.
-m, --chip_mdns ChipMDNSValue Specify ChipMDNSValue as platform or minimal.
By default it is minimal.
-c, --clusters_for_ip_commissioning true/false Specify whether to use clusters for IP commissioning.
By default it is true.
-p, --enable_pybindings EnableValue Specify whether to enable pybindings as python controller.
"
}
Expand All @@ -76,10 +73,6 @@ while (($#)); do
chip_mdns=$2
shift
;;
--clusters_for_ip_commissioning | -c)
clusters=$2
shift
;;
--enable_pybindings | -p)
enable_pybindings=$2
shift
Expand All @@ -104,7 +97,7 @@ source "$CHIP_ROOT/scripts/activate.sh"

chip_data_model_arg="chip_data_model=\"///examples/lighting-app/lighting-common\""

gn --root="$CHIP_ROOT" gen "$OUTPUT_ROOT" --args="chip_detail_logging=$chip_detail_logging enable_pylib=$enable_pybindings enable_rtti=$enable_pybindings chip_use_clusters_for_ip_commissioning=$clusters $chip_mdns_arg chip_controller=false $chip_data_model_arg"
gn --root="$CHIP_ROOT" gen "$OUTPUT_ROOT" --args="chip_detail_logging=$chip_detail_logging enable_pylib=$enable_pybindings enable_rtti=$enable_pybindings $chip_mdns_arg chip_controller=false $chip_data_model_arg"

# Compiles python files
# Check pybindings was requested
Expand Down
3 changes: 0 additions & 3 deletions src/controller/python/chip/server/ServerInit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,6 @@ void pychip_server_native_init()

// parts from ChipLinuxAppMainLoop

uint16_t securePort = CHIP_PORT;
uint16_t unsecurePort = CHIP_UDC_PORT;

// Init ZCL Data Model and CHIP App Server
static chip::CommonCaseDeviceServerInitParams initParams;
(void) initParams.InitializeStaticResourcesBeforeServerInit();
Expand Down