More .cproject normalization
#79
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Example when adding a new module: diff --git a/src/ncp-uart-hw/.cproject b/src/ncp-uart-hw/.cproject
index 37449b4..fdf151b 100644
--- a/src/ncp-uart-hw/.cproject
+++ b/src/ncp-uart-hw/.cproject
@@ -141,6 +141,7 @@ studio:/sdk/platform/radio/mac/
studio:/sdk/util/silicon_labs/silabs_core/
studio:/sdk/protocol/zigbee/stack/core/
studio:/sdk/protocol/zigbee/stack/mac/
+studio:/sdk/protocol/zigbee/app/ncp/plugin/xncp/
studio:/sdk/protocol/zigbee/stack/zll/
studio:/project/config/
studio:/project/autogen/
@@ -214,6 +215,7 @@ studio:/sdk/platform/radio/mac/
studio:/sdk/util/silicon_labs/silabs_core/
studio:/sdk/protocol/zigbee/stack/core/
studio:/sdk/protocol/zigbee/stack/mac/
+studio:/sdk/protocol/zigbee/app/ncp/plugin/xncp/
studio:/sdk/protocol/zigbee/stack/zll/
studio:/project/config/
studio:/project/autogen/
@@ -287,6 +289,7 @@ studio:/sdk/platform/radio/mac/
studio:/sdk/util/silicon_labs/silabs_core/
studio:/sdk/protocol/zigbee/stack/core/
studio:/sdk/protocol/zigbee/stack/mac/
+studio:/sdk/protocol/zigbee/app/ncp/plugin/xncp/
studio:/sdk/protocol/zigbee/stack/zll/",
"resolvedOptionsStr": "[
@@ -1148,6 +1151,8 @@ studio:/sdk/protocol/zigbee/stack/zll/",
\"${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/ncp-pro-library/release_singlenetwork/libncp-pro-library.a\",
+\"${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/zigbee-xncp/release_singlenetwork/libzigbee-xncp.a\",
+
\"${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/ncp-source-route-library/release_singlenetwork/libncp-source-route-library.a\",
\"${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/zigbee-gp/release_singlenetwork/libzigbee-gp.a\",
@@ -1192,6 +1197,8 @@ studio:/sdk/protocol/zigbee/stack/zll/",
\"${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/ncp-pro-library/release_singlenetwork/libncp-pro-library.a\": \"TRUE\",
+\"${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/zigbee-xncp/release_singlenetwork/libzigbee-xncp.a\": \"TRUE\",
+
\"${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/ncp-source-route-library/release_singlenetwork/libncp-source-route-library.a\": \"TRUE\",
\"${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/zigbee-gp/release_singlenetwork/libzigbee-gp.a\": \"TRUE\",
@@ -1296,6 +1303,8 @@ studio:/sdk/protocol/zigbee/stack/zll/",
\"${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/ncp-pro-library/release_singlenetwork/libncp-pro-library.a\",
+\"${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/zigbee-xncp/release_singlenetwork/libzigbee-xncp.a\",
+
\"${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/ncp-source-route-library/release_singlenetwork/libncp-source-route-library.a\",
\"${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/zigbee-gp/release_singlenetwork/libzigbee-gp.a\",
@@ -1340,6 +1349,8 @@ studio:/sdk/protocol/zigbee/stack/zll/",
\"${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/ncp-pro-library/release_singlenetwork/libncp-pro-library.a\": \"TRUE\",
+\"${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/zigbee-xncp/release_singlenetwork/libzigbee-xncp.a\": \"TRUE\",
+
\"${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/ncp-source-route-library/release_singlenetwork/libncp-source-route-library.a\": \"TRUE\",
\"${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/zigbee-gp/release_singlenetwork/libzigbee-gp.a\": \"TRUE\",
@@ -1358,8 +1369,8 @@ studio:/sdk/protocol/zigbee/stack/zll/",
}
]" moduleId="com.silabs.ss.framework.ide.project.core.cpp" projectCommon.boardIds="brd4001a:0.0.0.A01 brd4179b:0.0.0.A05" projectCommon.buildArtifactType="EXE" projectCommon.partId="mcu.arm.efr32.mg21.efr32mg21a010f1024im32" projectCommon.referencedModules="[
{
- "builtinExcludes": [],
"removed": false,
+ "builtinExcludes": [],
"builtinSources": [],
"module": "<project:MModule xmlns:project=\"http://www.silabs.com/ss/Project.ecore\" builtin=\"true\" id=\"uc.module.setup.CommonProjectPostBuild.com.silabs.ss.framework.project.toolchain.core.default#com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt:12.2.1.20221205.gcc\" pdm=\"true\">
@@ -1369,8 +1380,8 @@ studio:/sdk/protocol/zigbee/stack/zll/",
"builtin": true
},
{
- "builtinExcludes": [],
"removed": false,
+ "builtinExcludes": [],
"builtinSources": [],
"module": "<project:MModule xmlns:project=\"http://www.silabs.com/ss/Project.ecore\" builtin=\"true\" id=\"uc.module.setup.ProjectPostBuild.com.silabs.ss.framework.project.toolchain.core.default#com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt:12.2.1.20221205.gcc\" pdm=\"true\">
@@ -1380,8 +1391,8 @@ studio:/sdk/protocol/zigbee/stack/zll/",
"builtin": true
},
{
- "builtinExcludes": [],
"removed": false,
+ "builtinExcludes": [],
"builtinSources": [
"config/SEGGER_RTT_Conf.h",
"config/app_properties_config.h",
@@ -1431,8 +1442,8 @@ studio:/sdk/protocol/zigbee/stack/zll/",
"builtin": true
},
{
- "builtinExcludes": [],
"removed": false,
+ "builtinExcludes": [],
"builtinSources": [
"autogen/RTE_Components.h",
"autogen/linkerfile.ld",
@@ -1470,8 +1481,8 @@ studio:/sdk/protocol/zigbee/stack/zll/",
"builtin": true
},
{
- "builtinExcludes": [],
"removed": false,
+ "builtinExcludes": [],
"builtinSources": [
"app.c",
"gecko_sdk_4.4.3/hardware/board/inc/sl_board_control.h",
@@ -1873,7 +1884,6 @@ studio:/sdk/protocol/zigbee/stack/zll/",
"gecko_sdk_4.4.3/protocol/zigbee/app/util/ezsp/ezsp-protocol.h",
"gecko_sdk_4.4.3/protocol/zigbee/app/util/security/security-address-cache.c",
"gecko_sdk_4.4.3/protocol/zigbee/app/util/security/security.h",
- "gecko_sdk_4.4.3/protocol/zigbee/app/xncp/xncp-stubs.c",
"gecko_sdk_4.4.3/protocol/zigbee/app/xncp/xncp.h",
"gecko_sdk_4.4.3/protocol/zigbee/build/gcc/cortex-m33/ncp-gp-library/release_singlenetwork/libncp-gp-library.a",
"gecko_sdk_4.4.3/protocol/zigbee/build/gcc/cortex-m33/ncp-mfglib-library/release_singlenetwork/libncp-mfglib-library.a",
@@ -2159,8 +2169,8 @@ studio:/sdk/protocol/zigbee/stack/zll/",
"builtin": true
},
{
- "builtinExcludes": [],
"removed": false,
+ "builtinExcludes": [],
"builtinSources": [],
"module": "<project:MModule xmlns:project=\"http://www.silabs.com/ss/Project.ecore\" builtin=\"true\" id=\"uc.module.setup.defaultSettings.com.silabs.ss.framework.project.toolchain.core.default#com.silabs.ss.tool.ide.arm.toolchain.gnu.cdt:12.2.1.20221205.gcc\" pdm=\"true\">
@@ -2170,8 +2180,8 @@ studio:/sdk/protocol/zigbee/stack/zll/",
"builtin": true
},
{
- "builtinExcludes": [],
"removed": false,
+ "builtinExcludes": [],
"builtinSources": [
"autogen/.crc_config.crc"
],
@@ -2290,6 +2300,7 @@ studio:/sdk/protocol/zigbee/stack/zll/",
<listOptionValue builtIn="false" value=""${StudioSdkPath}/util/silicon_labs/silabs_core""/>
<listOptionValue builtIn="false" value=""${StudioSdkPath}/protocol/zigbee/stack/core""/>
<listOptionValue builtIn="false" value=""${StudioSdkPath}/protocol/zigbee/stack/mac""/>
+ <listOptionValue builtIn="false" value=""${StudioSdkPath}/protocol/zigbee/app/ncp/plugin/xncp""/>
<listOptionValue builtIn="false" value=""${StudioSdkPath}/protocol/zigbee/stack/zll""/>
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.silabs.ide.si32.gcc.cdt.managedbuild.tool.gnu.c.compiler.def.symbols.148468628" name="Defined symbols (-D)" superClass="com.silabs.ide.si32.gcc.cdt.managedbuild.tool.gnu.c.compiler.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
@@ -2427,6 +2438,7 @@ studio:/sdk/protocol/zigbee/stack/zll/",
<listOptionValue builtIn="false" value=""${StudioSdkPath}/util/silicon_labs/silabs_core""/>
<listOptionValue builtIn="false" value=""${StudioSdkPath}/protocol/zigbee/stack/core""/>
<listOptionValue builtIn="false" value=""${StudioSdkPath}/protocol/zigbee/stack/mac""/>
+ <listOptionValue builtIn="false" value=""${StudioSdkPath}/protocol/zigbee/app/ncp/plugin/xncp""/>
<listOptionValue builtIn="false" value=""${StudioSdkPath}/protocol/zigbee/stack/zll""/>
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.silabs.ide.si32.gcc.cdt.managedbuild.tool.gnu.cpp.compiler.def.symbols.219106635" name="Defined symbols (-D)" superClass="com.silabs.ide.si32.gcc.cdt.managedbuild.tool.gnu.cpp.compiler.def.symbols" valueType="definedSymbols">
@@ -2544,6 +2556,7 @@ studio:/sdk/protocol/zigbee/stack/zll/",
<listOptionValue builtIn="false" value=""${StudioSdkPath}/util/silicon_labs/silabs_core""/>
<listOptionValue builtIn="false" value=""${StudioSdkPath}/protocol/zigbee/stack/core""/>
<listOptionValue builtIn="false" value=""${StudioSdkPath}/protocol/zigbee/stack/mac""/>
+ <listOptionValue builtIn="false" value=""${StudioSdkPath}/protocol/zigbee/app/ncp/plugin/xncp""/>
<listOptionValue builtIn="false" value=""${StudioSdkPath}/protocol/zigbee/stack/zll""/>
</option>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.silabs.ide.si32.gcc.cdt.managedbuild.tool.gnu.as.def.symbols.1323127775" name="Defined symbols (-D)" superClass="com.silabs.ide.si32.gcc.cdt.managedbuild.tool.gnu.as.def.symbols" useByScannerDiscovery="false" valueType="definedSymbols">
@@ -2599,6 +2612,7 @@ studio:/sdk/protocol/zigbee/stack/zll/",
<listOptionValue builtIn="false" value="${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/zigbee-r22-support/release_singlenetwork/libzigbee-r22-support.a"/>
<listOptionValue builtIn="false" value="${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/ncp-source-route-library/release_singlenetwork/libncp-source-route-library.a"/>
<listOptionValue builtIn="false" value="${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/zigbee-source-route/release_singlenetwork/libzigbee-source-route.a"/>
+ <listOptionValue builtIn="false" value="${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/zigbee-xncp/release_singlenetwork/libzigbee-xncp.a"/>
<listOptionValue builtIn="false" value="${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/ncp-zll-library/release_singlenetwork/libncp-zll-library.a"/>
<listOptionValue builtIn="false" value="${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/zigbee-zll/release_singlenetwork/libzigbee-zll.a"/>
</option>
@@ -2639,6 +2653,7 @@ studio:/sdk/protocol/zigbee/stack/zll/",
<listOptionValue builtIn="false" value="${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/zigbee-r22-support/release_singlenetwork/libzigbee-r22-support.a"/>
<listOptionValue builtIn="false" value="${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/ncp-source-route-library/release_singlenetwork/libncp-source-route-library.a"/>
<listOptionValue builtIn="false" value="${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/zigbee-source-route/release_singlenetwork/libzigbee-source-route.a"/>
+ <listOptionValue builtIn="false" value="${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/zigbee-xncp/release_singlenetwork/libzigbee-xncp.a"/>
<listOptionValue builtIn="false" value="${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/ncp-zll-library/release_singlenetwork/libncp-zll-library.a"/>
<listOptionValue builtIn="false" value="${StudioSdkPath}/protocol/zigbee/build/gcc/cortex-m33/zigbee-zll/release_singlenetwork/libzigbee-zll.a"/>
</option>
@@ -2674,7 +2689,7 @@ studio:/sdk/protocol/zigbee/stack/zll/",
<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
</cconfiguration>
</storageModule>
- <storageModule moduleId="com.silabs.ss.framework.ide.project.core.cpp" project.generation="32" projectCommon.boardIds="brd4001a:0.0.0.A01 brd4179b:0.0.0.A05" projectCommon.buildArtifactType="EXE" projectCommon.copiedFiles="[
+ <storageModule moduleId="com.silabs.ss.framework.ide.project.core.cpp" project.generation="16" projectCommon.boardIds="brd4001a:0.0.0.A01 brd4179b:0.0.0.A05" projectCommon.buildArtifactType="EXE" projectCommon.copiedFiles="[
{
"generated": false,
"projectPath": "app.c",
@@ -2743,7 +2758,7 @@ studio:/sdk/protocol/zigbee/stack/zll/",
"projectPath": "autogen/sl_component_catalog.h",
"originalPath": "",
"version": 1,
- "content": 678533625
+ "content": 918403523
},
{
"generated": true,
@@ -2855,7 +2870,7 @@ studio:/sdk/protocol/zigbee/stack/zll/",
"projectPath": "autogen/zigbee_af_token_headers.h",
"originalPath": "",
"version": 1,
- "content": 1893072452
+ "content": 1147217686
},
{
"generated": true,
@@ -2890,14 +2905,14 @@ studio:/sdk/protocol/zigbee/stack/zll/",
"projectPath": "autogen/zigbee_stack_callback_dispatcher.c",
"originalPath": "",
"version": 1,
- "content": 1364497267
+ "content": -821332300
},
{
"generated": true,
"projectPath": "autogen/zigbee_stack_callback_dispatcher.h",
"originalPath": "",
"version": 1,
- "content": 631221060
+ "content": -873972784
},
{
"generated": true, |
tl-sl
pushed a commit
to tl-sl/silabs-firmware-builder
that referenced
this pull request
Oct 20, 2024
* Make `.cproject` normalization split up JSON with newlines * Run it on the repo * One more pass
# for free
to join this conversation on GitHub.
Already have an account?
# to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This introduces newlines, which should make diffs involving
.cprojectmuch smaller.