Skip to content

Commit 2eb940b

Browse files
committed
Merge pull request ARMmbed#1427 from justbuchanan/add-rpc-build
Added option to build rpc library. closes ARMmbed#1426
2 parents 1adf494 + 58d0861 commit 2eb940b

File tree

4 files changed

+24
-0
lines changed

4 files changed

+24
-0
lines changed

workspace_tools/build.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,12 @@
4949
default=False,
5050
help="Compile the rtos")
5151

52+
parser.add_option("--rpc",
53+
action="store_true",
54+
dest="rpc",
55+
default=False,
56+
help="Compile the rpc library")
57+
5258
parser.add_option("-e", "--eth",
5359
action="store_true", dest="eth",
5460
default=False,
@@ -168,6 +174,8 @@
168174
# Additional Libraries
169175
if options.rtos:
170176
libraries.extend(["rtx", "rtos"])
177+
if options.rpc:
178+
libraries.extend(["rpc"])
171179
if options.eth:
172180
libraries.append("eth")
173181
if options.usb:

workspace_tools/libraries.py

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,14 @@
3434
"dependencies": [MBED_LIBRARIES, MBED_RTX],
3535
},
3636

37+
# RPC
38+
{
39+
"id": "rpc",
40+
"source_dir": MBED_RPC,
41+
"build_dir": RPC_LIBRARY,
42+
"dependencies": [MBED_LIBRARIES],
43+
},
44+
3745
# USB Device libraries
3846
{
3947
"id": "usb",

workspace_tools/make.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
from workspace_tools.utils import args_error
3131
from workspace_tools.paths import BUILD_DIR
3232
from workspace_tools.paths import RTOS_LIBRARIES
33+
from workspace_tools.paths import RPC_LIBRARY
3334
from workspace_tools.paths import ETH_LIBRARY
3435
from workspace_tools.paths import USB_HOST_LIBRARIES, USB_LIBRARIES
3536
from workspace_tools.paths import DSP_LIBRARIES
@@ -113,6 +114,10 @@
113114
action="store_true", dest="rtos",
114115
default=False, help="Link with RTOS library")
115116

117+
parser.add_option("--rpc",
118+
action="store_true", dest="rpc",
119+
default=False, help="Link with RPC library")
120+
116121
parser.add_option("--eth",
117122
action="store_true", dest="eth",
118123
default=False,
@@ -218,6 +223,7 @@
218223

219224
# Linking with extra libraries
220225
if options.rtos: test.dependencies.append(RTOS_LIBRARIES)
226+
if options.rpc: test.dependencies.append(RPC_LIBRARY)
221227
if options.eth: test.dependencies.append(ETH_LIBRARY)
222228
if options.usb_host: test.dependencies.append(USB_HOST_LIBRARIES)
223229
if options.usb: test.dependencies.append(USB_LIBRARIES)

workspace_tools/paths.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,8 @@
4747
# mbed RPC
4848
MBED_RPC = join(LIB_DIR, "rpc")
4949

50+
RPC_LIBRARY = join(BUILD_DIR, "rpc")
51+
5052
# mbed RTOS
5153
RTOS = join(LIB_DIR, "rtos")
5254
MBED_RTX = join(RTOS, "rtx")

0 commit comments

Comments
 (0)