Skip to content

Modifying file headers and Makefile to adapt from libcoap to mbed-coap #3

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

Merged
merged 1 commit into from
Feb 15, 2017
Merged

Modifying file headers and Makefile to adapt from libcoap to mbed-coap #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions .cproject
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,14 +217,14 @@
<storageModule moduleId="org.eclipse.cdt.internal.ui.text.commentOwnerProjectMappings"/>
<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets">
<buildTargets>
<target name="libCoap" path="libCoap" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<target name="mbed-coap" path="mbed-coap" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<stopOnError>true</stopOnError>
<useDefaultCommand>true</useDefaultCommand>
<runAllBuilders>true</runAllBuilders>
</target>
<target name="clean" path="libCoap" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<target name="clean" path="mbed-coap" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
<buildCommand>make</buildCommand>
<buildArguments/>
<buildTarget>clean</buildTarget>
Expand Down
4 changes: 2 additions & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ Backup*
docs/
yotta_modules
yotta_targets
test/libcoap/unittest/coverages
test/libcoap/unittest/results
test/mbed-coap/unittest/coverages
test/mbed-coap/unittest/results
.yotta.json
coverage/
lcov/
Expand Down
4 changes: 2 additions & 2 deletions .settings/language.settings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<entry kind="includePath" name="/${ProjName}/libNsdl/src/include">
<flag value="VALUE_WORKSPACE_PATH"/>
</entry>
<entry kind="includePath" name="/${ProjName}/libCoap/src/include">
<entry kind="includePath" name="/${ProjName}/mbed-coap/src/include">
<flag value="VALUE_WORKSPACE_PATH"/>
</entry>
<entry kind="includePath" name="/libService/include">
Expand Down Expand Up @@ -100,7 +100,7 @@
<entry kind="includePath" name="/${ProjName}/libNsdl/src/include">
<flag value="VALUE_WORKSPACE_PATH"/>
</entry>
<entry kind="includePath" name="/${ProjName}/libCoap/src/include">
<entry kind="includePath" name="/${ProjName}/mbed-coap/src/include">
<flag value="VALUE_WORKSPACE_PATH"/>
</entry>
<entry kind="includePath" name="/libService/include">
Expand Down
5 changes: 2 additions & 3 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Makefile for combined COAP library
# Makefile for COAP library
#

# Define compiler toolchain with CC or PLATFORM variables
Expand All @@ -15,7 +15,7 @@
# OR (IAR-ARM)
# make CC=iccarm

LIB = libcoap.a
LIB = libmbedcoap.a
SRCS := \
source/sn_coap_protocol.c \
source/sn_coap_parser.c \
Expand All @@ -28,7 +28,6 @@ override CFLAGS += -Isource/include/
SERVLIB_DIR := ../libService
override CFLAGS += -I$(SERVLIB_DIR)/libService
override CFLAGS += -I.
#override CFLAGS += -Ilibcoap/

include ../libService/toolchain_rules.mk

Expand Down
4 changes: 2 additions & 2 deletions Makefile.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,13 +27,13 @@ test: $(TESTDIRS)
@rm -f lcov/index.xml
@find ./ -name '*.gcno' | xargs cp --backup=numbered -t ./coverage/
@find ./ -name '*.gcda' | xargs cp --backup=numbered -t ./coverage/
@gcovr --object-directory ./coverage --exclude-unreachable-branches -e '.*/builds/.*' -e '.*/test/.*' -e '.*/yotta_modules/.*' -e '.*/stubs/.*' -e '.*/libcoap/.*' -x -o ./lcov/gcovr.xml
@gcovr --object-directory ./coverage --exclude-unreachable-branches -e '.*/builds/.*' -e '.*/test/.*' -e '.*/yotta_modules/.*' -e '.*/stubs/.*' -e '.*/mbed-coap/.*' -x -o ./lcov/gcovr.xml
@lcov -d test/. -c -o $(COVERAGEFILE)
@lcov -q -r $(COVERAGEFILE) "/usr*" -o $(COVERAGEFILE)
@lcov -q -r $(COVERAGEFILE) "/test*" -o $(COVERAGEFILE)
@lcov -q -r $(COVERAGEFILE) "/mbed-client-libservice*" -o $(COVERAGEFILE)
@genhtml -q $(COVERAGEFILE) --show-details --output-directory lcov/html
@echo libcoap module unit tests built
@echo mbed-coap module unit tests built

$(TESTDIRS):
@make -C $(@:build-%=%)
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# libcoap
# mbed-coap
CoAP C library - Builder and Parser for CoAP messages
0 libcoap/sn_coap_header.h → mbed-coap/sn_coap_header.h
View file
Open in desktop
File renamed without changes.
0 libcoap/sn_coap_protocol.h → mbed-coap/sn_coap_protocol.h
View file
Open in desktop
File renamed without changes.
0 libcoap/sn_config.h → mbed-coap/sn_config.h
View file
Open in desktop
File renamed without changes.
6 changes: 3 additions & 3 deletions module.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"name": "libcoap",
"name": "mbed-coap",
"version": "4.0.0",
"description": "COAP library",
"keywords": [
Expand All @@ -18,8 +18,8 @@
"targetDependencies": {},
"author": "Yogesh Pande <[email protected]>",
"repository": {
"url": "https://github.com/ARMmbed/libcoap.git",
"url": "https://github.com/ARMmbed/mbed-coap.git",
"type": "git"
},
"homepage": "https://github.com/ARMmbed/libcoap"
"homepage": "https://github.com/ARMmbed/mbed-coap"
}
2 changes: 1 addition & 1 deletion run_unit_tests.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# limitations under the License.

echo
echo "Build libcoap C unit tests"
echo "Build mbed-coap C unit tests"
echo

yt target x86-linux-native
Expand Down
2 changes: 1 addition & 1 deletion source/include/sn_coap_protocol_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

#include "ns_list.h"
#include "sn_coap_header_internal.h"
#include "libcoap/sn_config.h"
#include "mbed-coap/sn_config.h"

#ifdef __cplusplus
extern "C" {
Expand Down
2 changes: 1 addition & 1 deletion source/sn_coap_builder.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <string.h> /* For memset() and memcpy() */

#include "ns_types.h"
#include "libcoap/sn_coap_header.h"
#include "mbed-coap/sn_coap_header.h"
#include "sn_coap_header_internal.h"
#include "sn_coap_protocol_internal.h"
#include "mbed-trace/mbed_trace.h"
Expand Down
4 changes: 2 additions & 2 deletions source/sn_coap_header_check.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

/* * * * INCLUDE FILES * * * */
#include "ns_types.h"
#include "libcoap/sn_coap_header.h"
#include "libcoap/sn_coap_protocol.h"
#include "mbed-coap/sn_coap_header.h"
#include "mbed-coap/sn_coap_protocol.h"
#include "sn_coap_header_internal.h"
#include "sn_coap_protocol_internal.h"

Expand Down
4 changes: 2 additions & 2 deletions source/sn_coap_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
#include <string.h> /* For memset() and memcpy() */

#include "ns_types.h"
#include "libcoap/sn_coap_header.h"
#include "libcoap/sn_coap_protocol.h"
#include "mbed-coap/sn_coap_header.h"
#include "mbed-coap/sn_coap_protocol.h"
#include "sn_coap_header_internal.h"
#include "sn_coap_protocol_internal.h"

Expand Down
2 changes: 1 addition & 1 deletion source/sn_coap_protocol.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
#endif

#include "ns_types.h"
#include "libcoap/sn_coap_protocol.h"
#include "mbed-coap/sn_coap_protocol.h"
#include "sn_coap_header_internal.h"
#include "sn_coap_protocol_internal.h"
#include "randLIB.h"
Expand Down
0 test/libcoap/unittest/Makefile → test/mbed-coap/unittest/Makefile
View file
Open in desktop
File renamed without changes.
0 test/libcoap/unittest/MakefileWorker.mk → test/mbed-coap/unittest/MakefileWorker.mk
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion test/libcoap/unittest/makefile_defines.txt → test/mbed-coap/unittest/makefile_defines.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ INCLUDE_DIRS =\
../stubs\
../../../..\
../../../../source\
../../../../libcoap\
../../../../mbed-coap\
../../../../yotta_modules/nanostack-libservice/mbed-client-libservice\
../../../../yotta_modules/mbed-trace\
../../../../yotta_modules/nanostack-randlib/mbed-client-randlib\
Expand Down
0 test/libcoap/unittest/run_tests → test/mbed-coap/unittest/run_tests
View file
Open in desktop
File renamed without changes.
0 ...libcoap/unittest/sn_coap_builder/Makefile → ...ed-coap/unittest/sn_coap_builder/Makefile
View file
Open in desktop
File renamed without changes.
0 .../sn_coap_builder/libCoap_builder_test.cpp → .../sn_coap_builder/libCoap_builder_test.cpp
View file
Open in desktop
File renamed without changes.
0 ...libcoap/unittest/sn_coap_builder/main.cpp → ...ed-coap/unittest/sn_coap_builder/main.cpp
View file
Open in desktop
File renamed without changes.
0 ...ap/unittest/sn_coap_header_check/Makefile → ...ap/unittest/sn_coap_header_check/Makefile
View file
Open in desktop
File renamed without changes.
0 ...coap_header_check/libCoap_header_test.cpp → ...coap_header_check/libCoap_header_test.cpp
View file
Open in desktop
File renamed without changes.
0 ...ap/unittest/sn_coap_header_check/main.cpp → ...ap/unittest/sn_coap_header_check/main.cpp
View file
Open in desktop
File renamed without changes.
0 .../libcoap/unittest/sn_coap_parser/Makefile → ...bed-coap/unittest/sn_coap_parser/Makefile
View file
Open in desktop
File renamed without changes.
0 .../libcoap/unittest/sn_coap_parser/main.cpp → ...bed-coap/unittest/sn_coap_parser/main.cpp
View file
Open in desktop
File renamed without changes.
0 ...est/sn_coap_parser/sn_coap_parsertest.cpp → ...est/sn_coap_parser/sn_coap_parsertest.cpp
View file
Open in desktop
File renamed without changes.
0 ...test/sn_coap_parser/test_sn_coap_parser.c → ...test/sn_coap_parser/test_sn_coap_parser.c
View file
Open in desktop
File renamed without changes.
0 ...test/sn_coap_parser/test_sn_coap_parser.h → ...test/sn_coap_parser/test_sn_coap_parser.h
View file
Open in desktop
File renamed without changes.
0 ...ibcoap/unittest/sn_coap_protocol/Makefile → ...d-coap/unittest/sn_coap_protocol/Makefile
View file
Open in desktop
File renamed without changes.
0 ...n_coap_protocol/libCoap_protocol_test.cpp → ...n_coap_protocol/libCoap_protocol_test.cpp
View file
Open in desktop
File renamed without changes.
0 ...ibcoap/unittest/sn_coap_protocol/main.cpp → ...d-coap/unittest/sn_coap_protocol/main.cpp
View file
Open in desktop
File renamed without changes.
0 ...p/unittest/sn_coap_protocol/test_config.h → ...p/unittest/sn_coap_protocol/test_config.h
View file
Open in desktop
File renamed without changes.
0 test/libcoap/unittest/stubs/ns_list_stub.c → test/mbed-coap/unittest/stubs/ns_list_stub.c
View file
Open in desktop
File renamed without changes.
0 test/libcoap/unittest/stubs/randLIB_stub.cpp → ...mbed-coap/unittest/stubs/randLIB_stub.cpp
View file
Open in desktop
File renamed without changes.
0 test/libcoap/unittest/stubs/randLIB_stub.h → test/mbed-coap/unittest/stubs/randLIB_stub.h
View file
Open in desktop
File renamed without changes.
0 ...oap/unittest/stubs/sn_coap_builder_stub.c → ...oap/unittest/stubs/sn_coap_builder_stub.c
View file
Open in desktop
File renamed without changes.
0 ...oap/unittest/stubs/sn_coap_builder_stub.h → ...oap/unittest/stubs/sn_coap_builder_stub.h
View file
Open in desktop
File renamed without changes.
0 ...nittest/stubs/sn_coap_header_check_stub.c → ...nittest/stubs/sn_coap_header_check_stub.c
View file
Open in desktop
File renamed without changes.
0 ...nittest/stubs/sn_coap_header_check_stub.h → ...nittest/stubs/sn_coap_header_check_stub.h
View file
Open in desktop
File renamed without changes.
0 ...coap/unittest/stubs/sn_coap_parser_stub.c → ...coap/unittest/stubs/sn_coap_parser_stub.c
View file
Open in desktop
File renamed without changes.
0 ...coap/unittest/stubs/sn_coap_parser_stub.h → ...coap/unittest/stubs/sn_coap_parser_stub.h
View file
Open in desktop
File renamed without changes.
0 ...ap/unittest/stubs/sn_coap_protocol_stub.c → ...ap/unittest/stubs/sn_coap_protocol_stub.c
View file
Open in desktop
File renamed without changes.
0 ...ap/unittest/stubs/sn_coap_protocol_stub.h → ...ap/unittest/stubs/sn_coap_protocol_stub.h
View file
Open in desktop
File renamed without changes.