-
Notifications
You must be signed in to change notification settings - Fork 11
Separating coap code from mbed-client-c #119
Conversation
@kjbracey-arm FYI |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Eclipse project files also need adjustment to stop it getting confused, as they're being cloned between the two halves - search and replace "CoapCLibrary" with "NsdlCLibrary" in this side of the split? (Just use a text editor on the XML)
Makefile
Outdated
@@ -1,5 +1,5 @@ | |||
# | |||
# Makefile for combined NSDL+COAP library | |||
# Makefile for combined NSDL library |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's not "combined" any more
Makefile
Outdated
SERVLIB_DIR := ../libService | ||
override CFLAGS += -I$(SERVLIB_DIR)/libService | ||
override CFLAGS += -Insdl-c/ | ||
override CFLAGS += -I../libcoap/libcoap/ | ||
override CFLAGS += -I../libcoap/source/include/ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you really need to include /source/include? If you do, you're cheating a bit - as they should be private headers, not accessed from outside the library.
I guess you could argue that this component is coupled in some way. Would only cause a problem if you for some reason had binary coap library and were trying to compile source nsdl library.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Unfortunately sn_grs has some internal data handling with coap structure , hence it needs these private headers.
Is it ok, if we remove that dependency as a separate task, once we have this new structure in place ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure, it can be tidied up later.
module.json
Outdated
], | ||
"dependencies": { | ||
"nanostack-libservice": "^3.0.0", | ||
"mbed-trace": ">=0.2.0,<2.0.0", | ||
"nanostack-randlib": "^1.2.0" | ||
"nanostack-randlib": "^1.2.0", | ||
"libcoap": "^1.0.0" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As per discussion, libcoap versioning should really continue from the same point as nsdl, so 5.0.0.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Agreed.
This is inconsistent with #121, in that you flatten the directory to just source/ there, but this remains as source/libNsdl. |
This commit is linked with ARMmbed/mbed-client-c#121 and ARMmbed/mbed-client-c#119
This commit includes - Modifying extraIncludes path in module.json based on new folder structure - modifying dependencies for underlying components
This commit includes - Fixing header include paths to begin with module name followed by header file name
Conflicts: Makefile module.json nsdl-c/sn_nsdl.h test/nsdl-c/unittest/makefile_defines.txt
Abandoning this PR and superseding with #125 |
This commit includes