From f1606dfd3de6a7734c4193e59aab23a275aa41cc Mon Sep 17 00:00:00 2001
From: SarenaAWS <6563840+sarenameas@users.noreply.github.com>
Date: Wed, 28 Oct 2020 14:55:55 -0700
Subject: [PATCH] Move transport_interface.h from portable/ to interface/ (#49)

* Move transport_interface.h to interface/ folder.

* Change all paths from portable to interface.
---
 .github/workflows/ci.yml                             | 4 ++--
 docs/doxygen/config.doxyfile                         | 2 +-
 httpFilePaths.cmake                                  | 2 +-
 source/{portable => interface}/transport_interface.h | 0
 test/cbmc/proofs/Makefile-project-defines            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)
 rename source/{portable => interface}/transport_interface.h (100%)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 54f76163..3ed28e62 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -125,8 +125,8 @@ jobs:
           path: ssot
       - name: Check transport_interface.h
         run: |
-          SSOT_FILE="ssot/source/portable/transport_interface.h"
-          CURRENT_FILE="current/source/portable/transport_interface.h"
+          SSOT_FILE="ssot/source/interface/transport_interface.h"
+          CURRENT_FILE="current/source/interface/transport_interface.h"
           diff <(tail -n +3 $SSOT_FILE) <(tail -n +3 $CURRENT_FILE)
           if [ "$?" -ne "0" ]; then
             echo "transport_interface.h differs from coreMQTT."
diff --git a/docs/doxygen/config.doxyfile b/docs/doxygen/config.doxyfile
index 08c9dd49..b8bc343d 100644
--- a/docs/doxygen/config.doxyfile
+++ b/docs/doxygen/config.doxyfile
@@ -847,7 +847,7 @@ WARN_LOGFILE           =
 INPUT                  = ./docs/doxygen \
                          ./source \
                          ./source/include \
-                         ./source/portable
+                         ./source/interface
 
 # This tag can be used to specify the character encoding of the source files
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
diff --git a/httpFilePaths.cmake b/httpFilePaths.cmake
index 48d93c56..588200d0 100644
--- a/httpFilePaths.cmake
+++ b/httpFilePaths.cmake
@@ -13,5 +13,5 @@ set( HTTP_SOURCES
 # HTTP library public include directories.
 set( HTTP_INCLUDE_PUBLIC_DIRS
      ${CMAKE_CURRENT_LIST_DIR}/source/include
-     ${CMAKE_CURRENT_LIST_DIR}/source/portable
+     ${CMAKE_CURRENT_LIST_DIR}/source/interface
      ${CMAKE_CURRENT_LIST_DIR}/source/third-party/http_parser )
diff --git a/source/portable/transport_interface.h b/source/interface/transport_interface.h
similarity index 100%
rename from source/portable/transport_interface.h
rename to source/interface/transport_interface.h
diff --git a/test/cbmc/proofs/Makefile-project-defines b/test/cbmc/proofs/Makefile-project-defines
index ce7051cc..a2fc5a56 100644
--- a/test/cbmc/proofs/Makefile-project-defines
+++ b/test/cbmc/proofs/Makefile-project-defines
@@ -24,7 +24,7 @@ PROJECT_NAME = "FreeRTOS coreHTTP"
 # Preprocessor include paths -I...
 INCLUDES += -I$(SRCDIR)/test/cbmc/include
 INCLUDES += -I$(SRCDIR)/source/include
-INCLUDES += -I$(SRCDIR)/source/portable
+INCLUDES += -I$(SRCDIR)/source/interface
 INCLUDES += -I$(SRCDIR)/source
 INCLUDES += -I$(SRCDIR)/source/third-party/http_parser