Skip to content

Commit abffd5c

Browse files
muneebahmed10muneebahmed10
authored
Update version and add C++ guards (#56)
* Update version numbers for release * Add guards for C++ linkage * Add update none to git submodules * Link to memory size table from README * Make possibe to override cmake C standard * Update CHANGELOG.md * Update coreMQTT submodule
1 parent 5cb2bc2 commit abffd5c

File tree

57 files changed

+106
-57
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+106
-57
lines changed

Diff for: ‎.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,4 +104,4 @@ jobs:
104104
uses: FreeRTOS/CI-CD-Github-Actions/memory_statistics@main
105105
with:
106106
config: .github/memory_statistics_config.json
107-
check_against: docs/doxygen/include/size_table.html
107+
check_against: docs/doxygen/include/size_table.md

Diff for: ‎.github/workflows/memory_statistics.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,4 @@ jobs:
1919
uses: actions/upload-artifact@v2
2020
with:
2121
name: size_table
22-
path: size_table.html
22+
path: size_table.md

Diff for: ‎.gitmodules

+3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,12 @@
44
[submodule "test/unit-test/CMock"]
55
path = test/unit-test/CMock
66
url = https://github.com/ThrowTheSwitch/CMock.git
7+
update = none
78
[submodule "test/cbmc/aws-templates-for-cbmc-proofs"]
89
path = test/cbmc/aws-templates-for-cbmc-proofs
910
url = https://github.com/awslabs/aws-templates-for-cbmc-proofs.git
11+
update = none
1012
[submodule "test/cbmc/litani"]
1113
path = test/cbmc/litani
1214
url = https://github.com/awslabs/aws-build-accumulator
15+
update = none

Diff for: ‎CHANGELOG.md

+5

Diff for: ‎README.md

+2-2

Diff for: ‎docs/doxygen/config.doxyfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "coreMQTT Agent"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = "v1.0.0"
41+
PROJECT_NUMBER = "v1.0.1"
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

Diff for: ‎docs/doxygen/include/size_table.html renamed to ‎docs/doxygen/include/size_table.md

Diff for: ‎docs/doxygen/pages.dox

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ The coreMQTT Agent is a thread-safe library to serialize calls to coreMQTT, to b
1111
@section core_mqtt_agent_memory_requirements Memory Requirements
1212
@brief Memory requirements of the MQTT Agent library, including the coreMQTT library.
1313

14-
@include{doc} size_table.html
14+
@include{doc} size_table.md
1515
*/
1616

1717
/**

Diff for: ‎lexicon.txt

+1
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@ logwarn
105105
lwt
106106
mainpage
107107
malloc
108+
md
108109
memset
109110
messagecontext
110111
messageinterface

Diff for: ‎manifest.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name : "coreMQTT Agent"
2-
version: "v1.0.0"
2+
version: "v1.0.1"
33
description: |
44
"Agent for thread-safe use of coreMQTT.\n"
55
dependencies:
66
- name : "coreMQTT"
7-
version: "v1.1.0"
7+
version: "v1.1.2"
88
repository:
99
type: "git"
1010
url: "https://github.com/FreeRTOS/coreMQTT/"

Diff for: ‎source/core_mqtt_agent.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎source/core_mqtt_agent_command_functions.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎source/dependency/coreMQTT

Submodule coreMQTT updated 73 files

Diff for: ‎source/include/core_mqtt_agent.h

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -27,6 +27,12 @@
2727
#ifndef CORE_MQTT_AGENT_H
2828
#define CORE_MQTT_AGENT_H
2929

30+
/* *INDENT-OFF* */
31+
#ifdef __cplusplus
32+
extern "C" {
33+
#endif
34+
/* *INDENT-ON* */
35+
3036
/* MQTT library includes. */
3137
#include "core_mqtt.h"
3238
#include "core_mqtt_state.h"
@@ -949,4 +955,10 @@ MQTTStatus_t MQTTAgent_Terminate( const MQTTAgentContext_t * pMqttAgentContext,
949955
const MQTTAgentCommandInfo_t * pCommandInfo );
950956
/* @[declare_mqtt_agent_terminate] */
951957

958+
/* *INDENT-OFF* */
959+
#ifdef __cplusplus
960+
}
961+
#endif
962+
/* *INDENT-ON* */
963+
952964
#endif /* CORE_MQTT_AGENT_H */

Diff for: ‎source/include/core_mqtt_agent_command_functions.h

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -27,6 +27,12 @@
2727
#ifndef CORE_MQTT_AGENT_COMMAND_FUNCTIONS_H
2828
#define CORE_MQTT_AGENT_COMMAND_FUNCTIONS_H
2929

30+
/* *INDENT-OFF* */
31+
#ifdef __cplusplus
32+
extern "C" {
33+
#endif
34+
/* *INDENT-ON* */
35+
3036
/* MQTT Agent include. */
3137
#include "core_mqtt_agent.h"
3238

@@ -254,4 +260,10 @@ MQTTStatus_t MQTTAgentCommand_Terminate( MQTTAgentContext_t * pMqttAgentContext,
254260
void * pUnusedArg,
255261
MQTTAgentCommandFuncReturns_t * pReturnFlags );
256262

263+
/* *INDENT-OFF* */
264+
#ifdef __cplusplus
265+
}
266+
#endif
267+
/* *INDENT-ON* */
268+
257269
#endif /* CORE_MQTT_AGENT_COMMAND_FUNCTIONS_H */

Diff for: ‎source/include/core_mqtt_agent_message_interface.h

+13-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of
@@ -31,6 +31,12 @@
3131
#include <stdint.h>
3232
#include <stdbool.h>
3333

34+
/* *INDENT-OFF* */
35+
#ifdef __cplusplus
36+
extern "C" {
37+
#endif
38+
/* *INDENT-ON* */
39+
3440
/* Declare here so interface functions can use. */
3541
struct MQTTAgentCommand;
3642
struct MQTTAgentMessageContext;
@@ -133,4 +139,10 @@ typedef struct MQTTAgentMessageInterface
133139
} MQTTAgentMessageInterface_t;
134140
/* @[define_messageinterface] */
135141

142+
/* *INDENT-OFF* */
143+
#ifdef __cplusplus
144+
}
145+
#endif
146+
/* *INDENT-ON* */
147+
136148
#endif /* CORE_MQTT_AGENT_MESSAGE_INTERFACE_H */

Diff for: ‎test/CMakeLists.txt

+7-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,13 @@ project ( "MQTTAgent unit test"
66
# Allow the project to be organized into folders.
77
set_property( GLOBAL PROPERTY USE_FOLDERS ON )
88

9-
# Use C90.
10-
set( CMAKE_C_STANDARD 90 )
11-
set( CMAKE_C_STANDARD_REQUIRED ON )
9+
# Use C90 if not specified.
10+
if( NOT DEFINED CMAKE_C_STANDARD )
11+
set( CMAKE_C_STANDARD 90 )
12+
endif()
13+
if( NOT DEFINED CMAKE_C_STANDARD_REQUIRED )
14+
set( CMAKE_C_STANDARD_REQUIRED ON )
15+
endif()
1216

1317
# Do not allow in-source build.
1418
if( ${PROJECT_SOURCE_DIR} STREQUAL ${PROJECT_BINARY_DIR} )

Diff for: ‎test/cbmc/include/agent_command_pool_stubs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/include/agent_message_stubs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/include/core_mqtt_config.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/include/get_time_stub.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/include/incoming_publish_callback_stub.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/include/mqtt_agent_cbmc_state.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/include/network_interface_stubs.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/proofs/MQTTAgentCommand_Connect/MQTTAgentCommand_Connect_harness.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/proofs/MQTTAgentCommand_Disconnect/MQTTAgentCommand_Disconnect_harness.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/proofs/MQTTAgentCommand_Ping/MQTTAgentCommand_Ping_harness.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/proofs/MQTTAgentCommand_ProcessLoop/MQTTAgentCommand_ProcessLoop_harness.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/proofs/MQTTAgentCommand_Publish/MQTTAgentCommand_Publish_harness.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/proofs/MQTTAgentCommand_Subscribe/MQTTAgentCommand_Subscribe_harness.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/proofs/MQTTAgentCommand_Terminate/MQTTAgentCommand_Terminate_harness.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/proofs/MQTTAgentCommand_Unsubscribe/MQTTAgentCommand_Unsubscribe_harness.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/proofs/MQTTAgent_CancelAll/MQTTAgent_CancelAll_harness.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/proofs/MQTTAgent_CommandLoop/MQTTAgent_CommandLoop_harness.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/proofs/MQTTAgent_Connect/MQTTAgent_Connect_harness.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/proofs/MQTTAgent_Disconnect/MQTTAgent_Disconnect_harness.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/proofs/MQTTAgent_Init/MQTTAgent_Init_harness.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/proofs/MQTTAgent_Ping/MQTTAgent_Ping_harness.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/proofs/MQTTAgent_ProcessLoop/MQTTAgent_ProcessLoop_harness.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/proofs/MQTTAgent_Publish/MQTTAgent_Publish_harness.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/proofs/MQTTAgent_ResumeSession/MQTTAgent_ResumeSession_harness.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

Diff for: ‎test/cbmc/proofs/MQTTAgent_Subscribe/MQTTAgent_Subscribe_harness.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* coreMQTT Agent v1.0.0
2+
* coreMQTT Agent v1.0.1
33
* Copyright (C) 2021 Amazon.com, Inc. or its affiliates. All Rights Reserved.
44
*
55
* Permission is hereby granted, free of charge, to any person obtaining a copy of

0 commit comments

Comments
 (0)