From 1892e8007a3f68b5b1703311ffb80abdc03383a5 Mon Sep 17 00:00:00 2001
From: Brendan Moran <brendan.moran@arm.com>
Date: Thu, 13 Aug 2015 13:26:24 +0100
Subject: [PATCH 1/2] Split the SAL into two modules One module contains the
 SAL and the other contains target dependencies. This eliminates
 definition-based circular dependencies from the SAL.

---
 module.json => sal-td/module.json             | 21 +++++----------
 .../mbed-net-socket-abstract}/socket_api.h    |  0
 .../mbed-net-socket-abstract}/socket_types.h  |  0
 .../test/ctest_env.h                          |  0
 .../test/sal_test_api.h                       |  0
 sal/module.json                               | 26 +++++++++++++++++++
 {source => sal/source}/socket_abstract.c      |  0
 .../source}/test/socket_abstract_test.cpp     |  0
 {test => sal/test}/stack-registry/main.cpp    |  0
 9 files changed, 33 insertions(+), 14 deletions(-)
 rename module.json => sal-td/module.json (52%)
 rename {mbed-net-socket-abstract => sal/mbed-net-socket-abstract}/socket_api.h (100%)
 rename {mbed-net-socket-abstract => sal/mbed-net-socket-abstract}/socket_types.h (100%)
 rename {mbed-net-socket-abstract => sal/mbed-net-socket-abstract}/test/ctest_env.h (100%)
 rename {mbed-net-socket-abstract => sal/mbed-net-socket-abstract}/test/sal_test_api.h (100%)
 create mode 100644 sal/module.json
 rename {source => sal/source}/socket_abstract.c (100%)
 rename {source => sal/source}/test/socket_abstract_test.cpp (100%)
 rename {test => sal/test}/stack-registry/main.cpp (100%)

diff --git a/module.json b/sal-td/module.json
similarity index 52%
rename from module.json
rename to sal-td/module.json
index f194f1e..4008a6d 100644
--- a/module.json
+++ b/sal-td/module.json
@@ -1,25 +1,18 @@
 {
-  "name": "sal",
-  "version": "0.2.1",
-  "description": "C Socket abstraction layer",
+  "name": "sal-td",
+  "version": "0.2.2",
+  "description": "C Socket abstraction layer (targetDependencies)",
   "private": true,
   "keywords": [],
   "author": "Brendan Moran <brendan.moran@arm.com>",
   "repository": {
-    "url": "git@github.com:ARMmbed/mbed-net-socket-abstract.git",
+    "url": "git@github.com:ARMmbed/sal.git",
     "type": "git"
   },
-  "homepage": "https://github.com/ARMmbed/mbed-net-socket-abstract",
+  "homepage": "https://github.com/ARMmbed/sal",
   "license": "Apache-2",
-  "dependencies": {},
-  "scripts": {
-    "testReporter": [
-      "mbedgt",
-      "--digest",
-      "stdin",
-      "-v",
-      "-V"
-    ]
+  "dependencies": {
+      "sal":"~0.2.2"
   },
   "targetDependencies": {
     "lwip": {
diff --git a/mbed-net-socket-abstract/socket_api.h b/sal/mbed-net-socket-abstract/socket_api.h
similarity index 100%
rename from mbed-net-socket-abstract/socket_api.h
rename to sal/mbed-net-socket-abstract/socket_api.h
diff --git a/mbed-net-socket-abstract/socket_types.h b/sal/mbed-net-socket-abstract/socket_types.h
similarity index 100%
rename from mbed-net-socket-abstract/socket_types.h
rename to sal/mbed-net-socket-abstract/socket_types.h
diff --git a/mbed-net-socket-abstract/test/ctest_env.h b/sal/mbed-net-socket-abstract/test/ctest_env.h
similarity index 100%
rename from mbed-net-socket-abstract/test/ctest_env.h
rename to sal/mbed-net-socket-abstract/test/ctest_env.h
diff --git a/mbed-net-socket-abstract/test/sal_test_api.h b/sal/mbed-net-socket-abstract/test/sal_test_api.h
similarity index 100%
rename from mbed-net-socket-abstract/test/sal_test_api.h
rename to sal/mbed-net-socket-abstract/test/sal_test_api.h
diff --git a/sal/module.json b/sal/module.json
new file mode 100644
index 0000000..e8e8bf9
--- /dev/null
+++ b/sal/module.json
@@ -0,0 +1,26 @@
+{
+  "name": "sal",
+  "version": "0.2.2",
+  "description": "C Socket abstraction layer",
+  "private": true,
+  "keywords": [],
+  "author": "Brendan Moran <brendan.moran@arm.com>",
+  "repository": {
+    "url": "git@github.com:ARMmbed/sal.git",
+    "type": "git"
+  },
+  "homepage": "https://github.com/ARMmbed/sal",
+  "license": "Apache-2",
+  "dependencies": {
+      "mbed-drivers" : "~0.6.3"
+  },
+  "scripts": {
+    "testReporter": [
+      "mbedgt",
+      "--digest",
+      "stdin",
+      "-v",
+      "-V"
+    ]
+  }
+}
diff --git a/source/socket_abstract.c b/sal/source/socket_abstract.c
similarity index 100%
rename from source/socket_abstract.c
rename to sal/source/socket_abstract.c
diff --git a/source/test/socket_abstract_test.cpp b/sal/source/test/socket_abstract_test.cpp
similarity index 100%
rename from source/test/socket_abstract_test.cpp
rename to sal/source/test/socket_abstract_test.cpp
diff --git a/test/stack-registry/main.cpp b/sal/test/stack-registry/main.cpp
similarity index 100%
rename from test/stack-registry/main.cpp
rename to sal/test/stack-registry/main.cpp

From 8f876b0a642a189d57cc82cb46511dc2e88c54bb Mon Sep 17 00:00:00 2001
From: Brendan Moran <brendan.moran@arm.com>
Date: Thu, 13 Aug 2015 13:27:23 +0100
Subject: [PATCH 2/2] Change dependencies to test dependencies.

---
 sal/module.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sal/module.json b/sal/module.json
index e8e8bf9..1d6ea0a 100644
--- a/sal/module.json
+++ b/sal/module.json
@@ -11,7 +11,7 @@
   },
   "homepage": "https://github.com/ARMmbed/sal",
   "license": "Apache-2",
-  "dependencies": {
+  "testDependencies": {
       "mbed-drivers" : "~0.6.3"
   },
   "scripts": {