Merge pull request #21 from eclipse/develop

Develop
eclipse-keyple · May 18, 2020 · e52fa1a · e52fa1a
2 parents 18a0d94 + 6177df6
commit e52fa1a
Show file tree

Hide file tree

Showing 196 changed files with 2,210 additions and 2,156 deletions.
diff --git a/CMakeSettings.json b/CMakeSettings.json
@@ -18,7 +18,8 @@
       ],
       "inheritEnvironments": [],
       "cmakeExecutable": "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Community\\Common7\\IDE\\CommonExtensions\\Microsoft\\CMake\\CMake\\bin\\",
-      "intelliSenseMode": "windows-msvc-x86"
+      "intelliSenseMode": "windows-msvc-x86",
+      "cmakeToolchain": "${projectDir}/toolchain/clang-windows.cmake"
     }
   ]
 }
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
@@ -0,0 +1,34 @@
+# Keyple - Release Notes
+
+Releases:
+ - Patch [Keyple Cpp 20/05](#patch---keyple-cpp-2005)
+ - Master [Keyple Cpp 20/05](#master---keyple-cpp-2005)
+
+
+## Patch - Keyple Cpp 20/05
+Release train components:
+ - keyple-common 0.8.1
+ - [keyple-core 0.8.1](#keyple-core-081)
+ - keyple-calypso 0.8.1
+ - keyple-plugin-pcsc 0.8.1
+ - keyple-plugin-stub 0.8.1
+
+### All components 0.8.1 
+- global update following the [Keyple Java 0.8.1 update](https://github.com/eclipse/keyple-java/tree/v0.8.1)
+
+### keyple-core 0.8.1
+- KCPP-1: fix duplicate SE_REMOVED events
+
+## Master - Keyple Cpp 20/05
+
+Release train components:
+ - keyple-common 0.8.0
+ - keyple-core 0.8.0
+ - keyple-calypso 0.8.0
+ - keyple-plugin-pcsc 0.8.0
+ - keyple-plugin-stub 0.8.0
+
+Initial release derived from [Keyple Java 0.8.0](https://github.com/eclipse/keyple-java/tree/v0.8.0)
+
+This preliminary version should not be used.
+
diff --git a/component/CMakeLists.txt b/component/CMakeLists.txt
@@ -13,6 +13,10 @@ EXECUTE_PROCESS(
     WORKING_DIRECTORY ${GOOGLETEST_DIRECTORY}/googletest-download
 )
 
+# Prevent overriding the parent project's compiler/linker
+# settings on Windows
+set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+
 IF(result)
     MESSAGE(FATAL_ERROR "CMake step for googletest failed: ${result}")
 ENDIF()

diff --git a/component/CMakeLists.txt.in b/component/CMakeLists.txt.in
@@ -13,7 +13,6 @@ project(googletest-download NONE)
 include(ExternalProject)
 ExternalProject_Add(googletest
     GIT_REPOSITORY    https://github.com/google/googletest.git
-    GIT_TAG           release-1.10.0
     SOURCE_DIR        "${GOOGLETEST_DIRECTORY}/googletest-src"
     BINARY_DIR        "${GOOGLETEST_DIRECTORY}/googletest-build"
     CONFIGURE_COMMAND ""

diff --git a/component/keyple-calypso/src/main/CMakeLists.txt b/component/keyple-calypso/src/main/CMakeLists.txt
@@ -10,8 +10,8 @@ PROJECT(KeypleCalypso C CXX)
 CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
 
 SET(VERSION_MAJOR "0")
-SET(VERSION_MINOR "1")
-SET(VERSION_PATCH "0")
+SET(VERSION_MINOR "8")
+SET(VERSION_PATCH "1")
 
 SET(VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
@@ -39,6 +39,7 @@ INCLUDE_DIRECTORIES(
 	${CMAKE_CURRENT_SOURCE_DIR}/command/sam/builder/security
 	${CMAKE_CURRENT_SOURCE_DIR}/command/sam/parser
 	${CMAKE_CURRENT_SOURCE_DIR}/command/sam/parser/security
+	${CMAKE_CURRENT_SOURCE_DIR}/exception
 	${CMAKE_CURRENT_SOURCE_DIR}/transaction
 	${CMAKE_CURRENT_SOURCE_DIR}/transaction/exception
 

diff --git a/component/keyple-calypso/src/main/command/po/AbstractPoCommandBuilder.h b/component/keyple-calypso/src/main/command/po/AbstractPoCommandBuilder.h
@@ -1,14 +1,16 @@
-/********************************************************************************
-* Copyright (c) 2018 Calypso Networks Association https://www.calypsonet-asso.org/
-*
-* See the NOTICE file(s) distributed with this work for additional information regarding copyright
-* ownership.
-*
-* This program and the accompanying materials are made available under the terms of the Eclipse
-* Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
-*
-* SPDX-License-Identifier: EPL-2.0
-********************************************************************************/
+/******************************************************************************
+ * Copyright (c) 2018 Calypso Networks Association                            *
+ * https://www.calypsonet-asso.org/                                           *
+ *                                                                            *
+ * See the NOTICE file(s) distributed with this work for additional           *
+ * information regarding copyright ownership.                                 *
+ *                                                                            *
+ * This program and the accompanying materials are made available under the   *
+ * terms of the Eclipse Public License 2.0 which is available at              *
+ * http://www.eclipse.org/legal/epl-2.0                                       *
+ *                                                                            *
+ * SPDX-License-Identifier: EPL-2.0                                           *
+ ******************************************************************************/
 
 #pragma once
 
@@ -33,7 +35,8 @@ using namespace keyple::core::seproxy::message;
  * Abstract class for all PO command builders.
  */
 template <typename T>
-class AbstractPoCommandBuilder : public AbstractIso7816CommandBuilder {
+class KEYPLECALYPSO_API AbstractPoCommandBuilder
+: public AbstractIso7816CommandBuilder {
 public:
     /*
     static_assert(std::is_base_of<AbstractApduResponseParser, T>::value, "T must inherit from org.eclipse.keyple.core.command.AbstractApduResponseParser");

diff --git a/component/keyple-calypso/src/main/command/po/CalypsoPoCommands.h b/component/keyple-calypso/src/main/command/po/CalypsoPoCommands.h
@@ -19,8 +19,9 @@
 #include "exceptionhelper.h"
 #include <memory>
 
-/* Core */
+/* Calypso */
 #include "CommandsTable.h"
+#include "KeypleCalypsoExport.h"
 #include "PoRevision.h"
 
 namespace keyple {
@@ -31,7 +32,7 @@ namespace po {
 using namespace keyple::core::command;
 using namespace keyple::calypso::command::po;
 
-class CalypsoPoCommands final : public CommandsTable {
+class KEYPLECALYPSO_API CalypsoPoCommands final : public CommandsTable {
 public:
     /** The po get data. */
     static CalypsoPoCommands GET_DATA_FCI;

diff --git a/component/keyple-calypso/src/main/command/po/PoBuilderParser.h b/component/keyple-calypso/src/main/command/po/PoBuilderParser.h
@@ -1,14 +1,16 @@
-/********************************************************************************
-* Copyright (c) 2019 Calypso Networks Association https://www.calypsonet-asso.org/
-*
-* See the NOTICE file(s) distributed with this work for additional information regarding copyright
-* ownership.
-*
-* This program and the accompanying materials are made available under the terms of the Eclipse
-* Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
-*
-* SPDX-License-Identifier: EPL-2.0
-********************************************************************************/
+/******************************************************************************
+ * Copyright (c) 2018 Calypso Networks Association                            *
+ * https://www.calypsonet-asso.org/                                           *
+ *                                                                            *
+ * See the NOTICE file(s) distributed with this work for additional           *
+ * information regarding copyright ownership.                                 *
+ *                                                                            *
+ * This program and the accompanying materials are made available under the   *
+ * terms of the Eclipse Public License 2.0 which is available at              *
+ * http://www.eclipse.org/legal/epl-2.0                                       *
+ *                                                                            *
+ * SPDX-License-Identifier: EPL-2.0                                           *
+ ******************************************************************************/
 
 #pragma once
 
@@ -26,12 +28,13 @@ namespace po {
 using namespace keyple::calypso::command;
 
 /**
- * The PoBuilderParser class contains the builder of a {@link PoSendableInSession} command
+ * The PoBuilderParser class contains the builder of a {@link
+ * PoSendableInSession} command
  * <p>
  * A setter allows to associate the parser object.
  */
 template <typename T>
-class PoBuilderParser
+class KEYPLECALYPSO_API PoBuilderParser
 : public std::enable_shared_from_this<PoBuilderParser<T>>,
   public CalypsoBuilderParser<T, AbstractPoResponseParser> {
 public:

diff --git a/component/keyple-calypso/src/main/command/po/PoRevision.h b/component/keyple-calypso/src/main/command/po/PoRevision.h
@@ -14,6 +14,10 @@
 
 #include <ostream>
 
+
+/* Calypso */
+#include "KeypleCalypsoExport.h"
+
 namespace keyple {
 namespace calypso {
 namespace command {
@@ -52,7 +56,8 @@ enum class PoRevision {
     REV3_2
 };
 
-std::ostream& operator<<(std::ostream& os, const PoRevision& pr);
+KEYPLECALYPSO_API std::ostream& operator<<(std::ostream& os,
+                                           const PoRevision& pr);
 
 }
 }

diff --git a/component/keyple-calypso/src/main/command/po/builder/AppendRecordCmdBuild.h b/component/keyple-calypso/src/main/command/po/builder/AppendRecordCmdBuild.h
@@ -37,11 +37,11 @@ using namespace keyple::core::seproxy::message;
 
 // TODO: Auto-generated Javadoc
 /**
-* The Class AppendRecordCmdBuild. This class provides the dedicated constructor
-* to build the Update Record APDU command.
-*
-*/
-class AppendRecordCmdBuild final
+ * The Class AppendRecordCmdBuild. This class provides the dedicated constructor
+ * to build the Update Record APDU command.
+ *
+ */
+class KEYPLECALYPSO_API AppendRecordCmdBuild final
 : public AbstractPoCommandBuilder<AppendRecordRespPars>,
   public PoSendableInSession,
   public PoModificationCommand {

diff --git a/component/keyple-calypso/src/main/command/po/builder/DecreaseCmdBuild.h b/component/keyple-calypso/src/main/command/po/builder/DecreaseCmdBuild.h
@@ -1,14 +1,16 @@
-/********************************************************************************
-* Copyright (c) 2018 Calypso Networks Association https://www.calypsonet-asso.org/
-*
-* See the NOTICE file(s) distributed with this work for additional information regarding copyright
-* ownership.
-*
-* This program and the accompanying materials are made available under the terms of the Eclipse
-* Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
-*
-* SPDX-License-Identifier: EPL-2.0
-********************************************************************************/
+/******************************************************************************
+ * Copyright (c) 2018 Calypso Networks Association                            *
+ * https://www.calypsonet-asso.org/                                           *
+ *                                                                            *
+ * See the NOTICE file(s) distributed with this work for additional           *
+ * information regarding copyright ownership.                                 *
+ *                                                                            *
+ * This program and the accompanying materials are made available under the   *
+ * terms of the Eclipse Public License 2.0 which is available at              *
+ * http://www.eclipse.org/legal/epl-2.0                                       *
+ *                                                                            *
+ * SPDX-License-Identifier: EPL-2.0                                           *
+ ******************************************************************************/
 
 #pragma once
 
@@ -36,11 +38,11 @@ using namespace keyple::calypso::command::po::parser;
 using namespace keyple::core::seproxy::message;
 
 /**
-* The Class DecreaseCmdBuild. This class provides the dedicated constructor to build the Decrease
-* APDU command.
-*
-*/
-class DecreaseCmdBuild final
+ * The Class DecreaseCmdBuild. This class provides the dedicated constructor to
+ * build the Decrease APDU command.
+ *
+ */
+class KEYPLECALYPSO_API DecreaseCmdBuild final
 : public AbstractPoCommandBuilder<DecreaseRespPars>,
   public PoSendableInSession,
   public PoModificationCommand {

diff --git a/component/keyple-calypso/src/main/command/po/builder/IncreaseCmdBuild.h b/component/keyple-calypso/src/main/command/po/builder/IncreaseCmdBuild.h
@@ -1,14 +1,16 @@
-/********************************************************************************
-* Copyright (c) 2018 Calypso Networks Association https://www.calypsonet-asso.org/
-*
-* See the NOTICE file(s) distributed with this work for additional information regarding copyright
-* ownership.
-*
-* This program and the accompanying materials are made available under the terms of the Eclipse
-* Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
-*
-* SPDX-License-Identifier: EPL-2.0
-********************************************************************************/
+/******************************************************************************
+ * Copyright (c) 2018 Calypso Networks Association                            *
+ * https://www.calypsonet-asso.org/                                           *
+ *                                                                            *
+ * See the NOTICE file(s) distributed with this work for additional           *
+ * information regarding copyright ownership.                                 *
+ *                                                                            *
+ * This program and the accompanying materials are made available under the   *
+ * terms of the Eclipse Public License 2.0 which is available at              *
+ * http://www.eclipse.org/legal/epl-2.0                                       *
+ *                                                                            *
+ * SPDX-License-Identifier: EPL-2.0                                           *
+ ******************************************************************************/
 
 #pragma once
 
@@ -36,11 +38,11 @@ using namespace keyple::calypso::command::po::parser;
 using namespace keyple::core::seproxy::message;
 
 /**
- * The Class IncreaseCmdBuild. This class provides the dedicated constructor to build the Increase
- * APDU command.
+ * The Class IncreaseCmdBuild. This class provides the dedicated constructor to
+ * build the Increase APDU command.
  *
  */
-class IncreaseCmdBuild final
+class KEYPLECALYPSO_API IncreaseCmdBuild final
 : public AbstractPoCommandBuilder<IncreaseRespPars>,
   public PoSendableInSession,
   public PoModificationCommand {

diff --git a/component/keyple-calypso/src/main/command/po/builder/ReadRecordsCmdBuild.h b/component/keyple-calypso/src/main/command/po/builder/ReadRecordsCmdBuild.h
@@ -1,14 +1,17 @@
-/********************************************************************************
-* Copyright (c) 2018 Calypso Networks Association https://www.calypsonet-asso.org/
-*
-* See the NOTICE file(s) distributed with this work for additional information regarding copyright
-* ownership.
-*
-* This program and the accompanying materials are made available under the terms of the Eclipse
-* Public License 2.0 which is available at http://www.eclipse.org/legal/epl-2.0
-*
-* SPDX-License-Identifier: EPL-2.0
-********************************************************************************/
+/******************************************************************************
+ * Copyright (c) 2018 Calypso Networks Association                            *
+ * https://www.calypsonet-asso.org/                                           *
+ *                                                                            *
+ * See the NOTICE file(s) distributed with this work for additional           *
+ * information regarding copyright ownership.                                 *
+ *                                                                            *
+ * This program and the accompanying materials are made available under the   *
+ * terms of the Eclipse Public License 2.0 which is available at              *
+ * http://www.eclipse.org/legal/epl-2.0                                       *
+ *                                                                            *
+ * SPDX-License-Identifier: EPL-2.0                                           *
+ ******************************************************************************/
+
 
 #pragma once
 
@@ -35,10 +38,10 @@ using namespace keyple::calypso::command::po::parser;
 using namespace keyple::core::seproxy::message;
 
 /**
- * The Class ReadRecordsCmdBuild. This class provides the dedicated constructor to build the Read
- * Records APDU command.
+ * The Class ReadRecordsCmdBuild. This class provides the dedicated constructor
+ * to build the Read Records APDU command.
  */
-class ReadRecordsCmdBuild final
+class KEYPLECALYPSO_API ReadRecordsCmdBuild final
 : public AbstractPoCommandBuilder<ReadRecordsRespPars>,
   public PoSendableInSession {
 private:

diff --git a/component/keyple-calypso/src/main/command/po/builder/SelectFileCmdBuild.h b/component/keyple-calypso/src/main/command/po/builder/SelectFileCmdBuild.h
@@ -41,7 +41,7 @@ using namespace keyple::core::seproxy::message;
  * commands.
  *
  */
-class SelectFileCmdBuild final
+class KEYPLECALYPSO_API SelectFileCmdBuild final
 : public AbstractPoCommandBuilder<SelectFileRespPars>,
   public PoSendableInSession {
 public:

diff --git a/component/keyple-calypso/src/main/command/po/builder/UpdateRecordCmdBuild.h b/component/keyple-calypso/src/main/command/po/builder/UpdateRecordCmdBuild.h
@@ -42,7 +42,7 @@ using namespace keyple::calypso::command::po::parser;
  * to build the Update Record APDU command.
  *
  */
-class UpdateRecordCmdBuild final
+class KEYPLECALYPSO_API UpdateRecordCmdBuild final
 : public AbstractPoCommandBuilder<UpdateRecordRespPars>,
   public PoSendableInSession,
   public PoModificationCommand {

diff --git a/component/keyple-calypso/src/main/command/po/builder/WriteRecordCmdBuild.h b/component/keyple-calypso/src/main/command/po/builder/WriteRecordCmdBuild.h
@@ -39,7 +39,7 @@ using namespace keyple::calypso::command::po::parser;
  * The Class WriteRecordCmdBuild. This class provides the dedicated constructor
  * to build the Write Record APDU command.
  */
-class WriteRecordCmdBuild
+class KEYPLECALYPSO_API WriteRecordCmdBuild
 : public AbstractPoCommandBuilder<WriteRecordRespPars>,
   public PoSendableInSession,
   public PoModificationCommand {

diff --git a/component/keyple-calypso/src/main/command/po/builder/security/ChangeKeyCmdBuild.h b/component/keyple-calypso/src/main/command/po/builder/security/ChangeKeyCmdBuild.h
@@ -35,7 +35,8 @@ using namespace keyple::calypso::command::po;
 using namespace keyple::calypso::command::po::parser::security;
 using namespace keyple::core::seproxy::message;
 
-class ChangeKeyCmdBuild : public AbstractPoCommandBuilder<ChangeKeyRespPars> {
+class KEYPLECALYPSO_API ChangeKeyCmdBuild
+: public AbstractPoCommandBuilder<ChangeKeyRespPars> {
 private:
     /**
      *