Skip to content

Commit ed542ac

Browse files
committed
fixes #1345 Restructure the source tree
This is not quite complete, but it sets the stage for other protocols (such as zmq or mqtt) to be added to the project.
1 parent 1413b24 commit ed542ac

Some content is hidden

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

87 files changed

+82
-65
lines changed

CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2020 Staysail Systems, Inc. <[email protected]>
2+
# Copyright 2021 Staysail Systems, Inc. <[email protected]>
33
# Copyright (c) 2012 Martin Sustrik All rights reserved.
44
# Copyright (c) 2013 GoPivotal, Inc. All rights reserved.
55
# Copyright (c) 2015-2016 Jack R. Dunaway. All rights reserved.
@@ -253,15 +253,10 @@ add_subdirectory(src)
253253

254254
if (NNG_TESTS)
255255
add_subdirectory(tests)
256-
add_subdirectory(perf)
257256
endif ()
258257

259258
# Build the tools
260259

261-
if (NNG_ENABLE_NNGCAT)
262-
add_subdirectory(tools/nngcat)
263-
endif ()
264-
265260
add_subdirectory(docs/man)
266261

267262
set(CPACK_PACKAGE_NAME ${PROJECT_NAME})

LICENSE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License
22

3-
Copyright 2020 Staysail Systems, Inc. <[email protected]>
3+
Copyright 2021 Staysail Systems, Inc. <[email protected]>
44
Copyright 2018 Capitar IT Group BV <[email protected]>
55

66
Permission is hereby granted, free of charge, to any person obtaining a copy

etc/README.adoc

Lines changed: 14 additions & 42 deletions

src/CMakeLists.txt

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright 2020 Staysail Systems, Inc. <[email protected]>
2+
# Copyright 2021 Staysail Systems, Inc. <[email protected]>
33
# Copyright 2018 Capitar IT Group BV <[email protected]>
44
#
55
# This software is supplied under the terms of the MIT License, a
@@ -15,20 +15,11 @@ target_include_directories(nng PRIVATE ${PROJECT_SOURCE_DIR}/src)
1515
target_include_directories(nng_testing PRIVATE ${PROJECT_SOURCE_DIR}/src)
1616

1717
add_subdirectory(core)
18-
1918
add_subdirectory(platform)
20-
add_subdirectory(compat/nanomsg)
21-
22-
add_subdirectory(protocol)
23-
add_subdirectory(transport)
24-
25-
add_subdirectory(supplemental/base64)
26-
add_subdirectory(supplemental/http)
27-
add_subdirectory(supplemental/sha1)
28-
add_subdirectory(supplemental/tls)
29-
add_subdirectory(supplemental/util)
30-
add_subdirectory(supplemental/websocket)
31-
19+
add_subdirectory(compat)
20+
add_subdirectory(sp)
21+
add_subdirectory(supplemental)
22+
add_subdirectory(tools)
3223
add_subdirectory(testing)
3324

3425
# When building shared libraries we prefer to suppress default symbol

src/compat/CMakeLists.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#
2+
# Copyright 2021 Staysail Systems, Inc. <[email protected]>
3+
#
4+
# This software is supplied under the terms of the MIT License, a
5+
# copy of which should be located in the distribution where this
6+
# file was obtained (LICENSE.txt). A copy of the license may also be
7+
# found online at https://opensource.org/licenses/MIT.
8+
#
9+
10+
nng_directory(compat)
11+
12+
add_subdirectory(nanomsg)

src/sp/CMakeLists.txt

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#
2+
# Copyright 2021 Staysail Systems, Inc. <[email protected]>
3+
#
4+
# This software is supplied under the terms of the MIT License, a
5+
# copy of which should be located in the distribution where this
6+
# file was obtained (LICENSE.txt). A copy of the license may also be
7+
# found online at https://opensource.org/licenses/MIT.
8+
#
9+
10+
nng_directory(sp)
11+
12+
add_subdirectory(protocol)
13+
add_subdirectory(transport)

0 commit comments

Comments
 (0)