Restructure directory layout #2878

geky · 2016-09-30T22:28:36Z

Continued from #2266

This diff is annoyingly large, it may be better to look at the repo overview:
https://github.com/geky/mbed/tree/restructure

Target layout:

mbed
|- mbed.h
|- docs
|- drivers
|- features
|- hal
|- platform
|- rtos
|- events
|- targets
|- TESTS
`- tools

Directory moves:

hal/{api,common} -> drivers
hal/{api,common} -> platform
hal/hal          -> hal
hal/targets      -> targets
libraries        -> features/unsupported

The mbed.h file has been moved to the top-level directory to act as a single entry point:

hal/mbed.h -> mbed.h

Things are about to get messy
cc @sg-, @bridadan, @theotherjimmy

bridadan · 2016-09-30T22:36:55Z

I noticed that wait_api.h is in the platform folder. Is this on purpose? Or should it be in the hal folder like the rest of the *_api.h files?

geky · 2016-09-30T22:46:41Z

Yep, the wait set of functions are built on top of the ticker api and rtos api, there is no hardware involved.

bridadan · 2016-09-30T22:47:41Z

Makes sense to me! Thanks for clarifying

geky · 2016-09-30T23:44:56Z

/morph test

mbed-bot · 2016-09-30T23:46:59Z

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test

geky · 2016-09-30T23:48:50Z

/morph test

mbed-bot · 2016-09-30T23:59:04Z

Result: ABORTED

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 1022

Build failed!

hal/targets -> targets hal/targets.json -> targets/targets.json

hal/common/AnalogIn.cpp -> drivers/AnalogIn.cpp hal/api/AnalogIn.h -> drivers/AnalogIn.h hal/api/AnalogOut.h -> drivers/AnalogOut.h hal/common/BusIn.cpp -> drivers/BusIn.cpp hal/api/BusIn.h -> drivers/BusIn.h hal/common/BusInOut.cpp -> drivers/BusInOut.cpp hal/api/BusInOut.h -> drivers/BusInOut.h hal/common/BusOut.cpp -> drivers/BusOut.cpp hal/api/BusOut.h -> drivers/BusOut.h hal/common/CAN.cpp -> drivers/CAN.cpp hal/api/CAN.h -> drivers/CAN.h hal/api/CircularBuffer.h -> drivers/CircularBuffer.h hal/api/DigitalIn.h -> drivers/DigitalIn.h hal/api/DigitalInOut.h -> drivers/DigitalInOut.h hal/api/DigitalOut.h -> drivers/DigitalOut.h hal/api/DirHandle.h -> drivers/DirHandle.h hal/common/Ethernet.cpp -> drivers/Ethernet.cpp hal/api/Ethernet.h -> drivers/Ethernet.h hal/common/FileBase.cpp -> drivers/FileBase.cpp hal/api/FileBase.h -> drivers/FileBase.h hal/api/FileHandle.h -> drivers/FileHandle.h hal/common/FileLike.cpp -> drivers/FileLike.cpp hal/api/FileLike.h -> drivers/FileLike.h hal/common/FilePath.cpp -> drivers/FilePath.cpp hal/api/FilePath.h -> drivers/FilePath.h hal/common/FileSystemLike.cpp -> drivers/FileSystemLike.cpp hal/api/FileSystemLike.h -> drivers/FileSystemLike.h hal/common/I2C.cpp -> drivers/I2C.cpp hal/api/I2C.h -> drivers/I2C.h hal/common/I2CSlave.cpp -> drivers/I2CSlave.cpp hal/api/I2CSlave.h -> drivers/I2CSlave.h hal/common/InterruptIn.cpp -> drivers/InterruptIn.cpp hal/api/InterruptIn.h -> drivers/InterruptIn.h hal/common/InterruptManager.cpp -> drivers/InterruptManager.cpp hal/api/InterruptManager.h -> drivers/InterruptManager.h hal/common/LocalFileSystem.cpp -> drivers/LocalFileSystem.cpp hal/api/LocalFileSystem.h -> drivers/LocalFileSystem.h hal/api/LowPowerTicker.h -> drivers/LowPowerTicker.h hal/api/LowPowerTimeout.h -> drivers/LowPowerTimeout.h hal/api/LowPowerTimer.h -> drivers/LowPowerTimer.h hal/api/PortIn.h -> drivers/PortIn.h hal/api/PortInOut.h -> drivers/PortInOut.h hal/api/PortOut.h -> drivers/PortOut.h hal/api/PwmOut.h -> drivers/PwmOut.h hal/common/RawSerial.cpp -> drivers/RawSerial.cpp hal/api/RawSerial.h -> drivers/RawSerial.h hal/common/SPI.cpp -> drivers/SPI.cpp hal/api/SPI.h -> drivers/SPI.h hal/common/SPISlave.cpp -> drivers/SPISlave.cpp hal/api/SPISlave.h -> drivers/SPISlave.h hal/common/Serial.cpp -> drivers/Serial.cpp hal/api/Serial.h -> drivers/Serial.h hal/common/SerialBase.cpp -> drivers/SerialBase.cpp hal/api/SerialBase.h -> drivers/SerialBase.h hal/common/Stream.cpp -> drivers/Stream.cpp hal/api/Stream.h -> drivers/Stream.h hal/common/Ticker.cpp -> drivers/Ticker.cpp hal/api/Ticker.h -> drivers/Ticker.h hal/common/Timeout.cpp -> drivers/Timeout.cpp hal/api/Timeout.h -> drivers/Timeout.h hal/common/Timer.cpp -> drivers/Timer.cpp hal/api/Timer.h -> drivers/Timer.h hal/common/TimerEvent.cpp -> drivers/TimerEvent.cpp hal/api/TimerEvent.h -> drivers/TimerEvent.h hal/api/Transaction.h -> drivers/Transaction.h hal/api/can_helper.h -> drivers/can_helper.h hal/.yotta_ignore hal/CMakeLists.txt hal/hal/analogin_api.h -> hal/analogin_api.h hal/hal/analogout_api.h -> hal/analogout_api.h hal/hal/buffer.h -> hal/buffer.h hal/hal/can_api.h -> hal/can_api.h hal/hal/dma_api.h -> hal/dma_api.h hal/hal/ethernet_api.h -> hal/ethernet_api.h hal/hal/gpio_api.h -> hal/gpio_api.h hal/hal/gpio_irq_api.h -> hal/gpio_irq_api.h hal/hal/i2c_api.h -> hal/i2c_api.h hal/hal/lp_ticker_api.h -> hal/lp_ticker_api.h hal/common/mbed_gpio.c -> hal/mbed_gpio.c hal/common/mbed_lp_ticker_api.c -> hal/mbed_lp_ticker_api.c hal/common/mbed_pinmap_common.c -> hal/mbed_pinmap_common.c hal/common/mbed_ticker_api.c -> hal/mbed_ticker_api.c hal/common/mbed_us_ticker_api.c -> hal/mbed_us_ticker_api.c hal/module.json hal/hal/pinmap.h -> hal/pinmap.h hal/hal/port_api.h -> hal/port_api.h hal/hal/pwmout_api.h -> hal/pwmout_api.h hal/hal/rtc_api.h -> hal/rtc_api.h hal/hal/serial_api.h -> hal/serial_api.h hal/hal/sleep_api.h -> hal/sleep_api.h hal/hal/spi_api.h -> hal/spi_api.h hal/hal/storage_abstraction/Driver_Common.h -> hal/storage_abstraction/Driver_Common.h hal/hal/storage_abstraction/Driver_Storage.h -> hal/storage_abstraction/Driver_Storage.h hal/hal/ticker_api.h -> hal/ticker_api.h hal/hal/trng_api.h -> hal/trng_api.h hal/hal/us_ticker_api.h -> hal/us_ticker_api.h hal/api/mbed.h -> mbed.h hal/api/CThunk.h -> platform/CThunk.h hal/common/CallChain.cpp -> platform/CallChain.cpp hal/api/CallChain.h -> platform/CallChain.h hal/api/Callback.h -> platform/Callback.h hal/api/FunctionPointer.h -> platform/FunctionPointer.h hal/api/PlatformMutex.h -> platform/PlatformMutex.h hal/api/SingletonPtr.h -> platform/SingletonPtr.h hal/api/critical.h -> platform/critical.h hal/common/mbed_alloc_wrappers.cpp -> platform/mbed_alloc_wrappers.cpp hal/common/mbed_assert.c -> platform/mbed_assert.c hal/api/mbed_assert.h -> platform/mbed_assert.h hal/common/mbed_board.c -> platform/mbed_board.c hal/common/mbed_critical.c -> platform/mbed_critical.c hal/api/mbed_debug.h -> platform/mbed_debug.h hal/common/mbed_error.c -> platform/mbed_error.c hal/api/mbed_error.h -> platform/mbed_error.h hal/common/mbed_interface.c -> platform/mbed_interface.c hal/api/mbed_interface.h -> platform/mbed_interface.h hal/common/mbed_mem_trace.c -> platform/mbed_mem_trace.c hal/api/mbed_mem_trace.h -> platform/mbed_mem_trace.h hal/common/mbed_rtc_time.cpp -> platform/mbed_rtc_time.cpp hal/common/mbed_semihost_api.c -> platform/mbed_semihost_api.c hal/api/mbed_stats.h -> platform/mbed_stats.h hal/common/mbed_wait_api_no_rtos.c -> platform/mbed_wait_api_no_rtos.c hal/common/mbed_wait_api_rtos.cpp -> platform/mbed_wait_api_rtos.cpp hal/api/platform.h -> platform/platform.h hal/common/retarget.cpp -> platform/retarget.cpp hal/api/rtc_time.h -> platform/rtc_time.h hal/api/semihost_api.h -> platform/semihost_api.h hal/api/toolchain.h -> platform/toolchain.h hal/api/wait_api.h -> platform/wait_api.h

libraries -> features/unsupported

time.h brings in struct timeval lwip defines custom struct timeval resolved through disabling lwip's struct timeval

features/net/network-socket -> features/netsocket features/net/FEATURE_IPV4 -> features/FEATURE_LWIP features/net/nanostack-binaries -> features/nanostack features/net/FEATURE_NANOSTACK -> features/nanostack/FEATURE_NANOSTACK

MBED_HAL /hal/hal x MBED_API /hal/api x MBED_COMMON /hal/common x MBED_TARGETS /hal/targets -> /targets MBED_DRIVERS + /drivers MBED_PLATFORM + /platform MBED_HEADER + /mbed.h

- Reverted requirements.txt for external dependency in mbed CLI - Fixed MBED_CONFIG_FILE in paths.py - Fixed MBED_LIBRARIES in paths.py - Decreased include namespace for rtos.h

geky · 2016-10-01T00:20:48Z

/morph test-nightly

bridadan · 2016-10-01T00:21:17Z

@mbed-bot: TEST

HOST_OSES=ALL
BUILD_TOOLCHAINS=ALL
TARGETS=ALL

mbed-bot · 2016-10-01T00:56:45Z

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test-nightly

Output

mbed Build Number: 1023

Build failed!

mbed-bot · 2016-10-01T02:32:57Z

[Build 1012]
SUCCESS: Building succeeded and tests were run! Be sure to check the test results

sg- · 2016-10-01T07:30:51Z

mbed 2 builds now fail due to flat directory structure and use of path/file 👎

/morph test-nightly

mbed-bot · 2016-10-01T11:15:23Z

Result: FAILURE

Your command has finished executing! Here's what you wrote!

/morph test-nightly

Output

mbed Build Number: 1025

Test failed!

geky · 2016-10-01T18:41:32Z

Thanks for prefixing everything 👍

Added rough two-layer directory structure support to the mbed 2 builds. The legacy build now just duplicates the library header files during precompile.

geky · 2016-10-01T19:15:39Z

It looks like the mbed 2 builds are now stalling in travis?? I can't reproduce this locally.

Added single-nested include directories to libraries built with the legacy build_lib function. Unfortunately, to get this working without a significant rewrite of the legacy build tools, library header files are just duplicated in the precompile stage.

geky · 2016-10-01T20:39:05Z

Travis looks good except for the issue here: #2879 👍

sg- · 2016-10-01T23:31:26Z

/morph test

mbed-bot · 2016-10-02T00:50:33Z

Result: SUCCESS

Your command has finished executing! Here's what you wrote!

/morph test

Output

mbed Build Number: 1027

All builds and test passed!

SeppoTakalo · 2016-10-03T08:09:43Z

Please, when you do this kind of restructures, it would be nice to notify developers. We need to update our build scripts to match this new structure.

SeppoTakalo · 2016-10-03T11:36:09Z

This restructure broke at least:

ESP8266 Wifi driver

/esp8266-driver/ESP8266Interface.cpp:18:0:
./esp8266-driver/ESP8266Interface.h:20:41: fatal error: network-socket/NetworkStack.h: No such file or directory
 #include "network-socket/NetworkStack.h"

All our build scripts (The ones that replace Nanostack binaries with sources)
Building of Nanostack binary

We'll handle those build scripts but who is going to update ESP driver?

jeromecoutant · 2016-10-03T12:17:20Z

Agree with @SeppoTakalo
Quite big changes during the week end without any notification...

About this change: libraries -> features/unsupported
What's the meaning of this "unsupported" ?

yogpan01 · 2016-10-03T12:55:32Z

This restructure broke mbed-client build jobs which are testing against master and used for preparing release candidate
[ERROR] ./pal/Source/Port/Reference-Impl/mbedOS/Networking/pal_plat_network.cpp:23:39: fatal error: net/network-socket/Socket.h: No such file or directory

sg- · 2016-10-03T15:49:39Z

What's the meaning of this "unsupported" ?

This is code that needs updates (thread safety, refactor, etc.) before being a first class feature again

geky force-pushed the restructure branch 2 times, most recently from 9f247f0 to c49f670 Compare September 30, 2016 23:35

geky force-pushed the restructure branch 2 times, most recently from ef1eb6f to 133d723 Compare October 1, 2016 00:16

geky added 12 commits September 30, 2016 19:18

restructure - Moved targets out to top level

0bad622

hal/targets -> targets hal/targets.json -> targets/targets.json

restructure - Moved stdio-config into platform

8ad8327

restructure - Moved libraries to features/unsupported

bf643bc

libraries -> features/unsupported

restructure - Fixed include bug in features/unsupported/net/lwip

175ae6b

time.h brings in struct timeval lwip defines custom struct timeval resolved through disabling lwip's struct timeval

restructure - Removed misplaced metadata from top-level directory

c0ffbc1

restructure - Restructured rtos directory

2dd90bb

restructure - Restructured features/net directory

ba99a1f

features/net/network-socket -> features/netsocket features/net/FEATURE_IPV4 -> features/FEATURE_LWIP features/net/nanostack-binaries -> features/nanostack features/net/FEATURE_NANOSTACK -> features/nanostack/FEATURE_NANOSTACK

restructure - Updated tools to point to restructured modules

960d69f

MBED_HAL /hal/hal x MBED_API /hal/api x MBED_COMMON /hal/common x MBED_TARGETS /hal/targets -> /targets MBED_DRIVERS + /drivers MBED_PLATFORM + /platform MBED_HEADER + /mbed.h

restructure - Fixed include paths damaged by the restructure

c2d9fc2

restructure - Added FEATURE_LWIP to __allowed_features

03bbc86

restructure - Reverted move of requirements.txt

e35050d

- Reverted requirements.txt for external dependency in mbed CLI - Fixed MBED_CONFIG_FILE in paths.py - Fixed MBED_LIBRARIES in paths.py - Decreased include namespace for rtos.h

geky force-pushed the restructure branch from 133d723 to e35050d Compare October 1, 2016 00:18

geky added needs: CI needs: review labels Oct 1, 2016

geky force-pushed the restructure branch from 3f85d3b to afcdfd1 Compare October 1, 2016 18:35

geky force-pushed the restructure branch from 7d168a5 to c9e37c1 Compare October 1, 2016 19:22

geky force-pushed the restructure branch from c9e37c1 to a7ddc46 Compare October 1, 2016 19:58

restructure - Changed legacy build_lib to respect lib name in path

b8fb7a6

geky force-pushed the restructure branch from cf75bd2 to b8fb7a6 Compare October 2, 2016 02:21

geky added ready for merge and removed needs: CI needs: review labels Oct 2, 2016

sg- merged commit 646cc89 into ARMmbed:master Oct 2, 2016

sg- added release-version: 5.2.0 and removed ready for merge labels Oct 2, 2016

LMESTM mentioned this pull request Oct 3, 2016

Dev spi asynch stm #2888

Merged

2 tasks

sg- mentioned this pull request Oct 3, 2016

Restructure directory layout to better match emerging structure #2266

Closed

bridadan mentioned this pull request Oct 3, 2016

[Exporters] Resolving Python errors and uVision build issues #2895

Merged

3 tasks

geky mentioned this pull request Oct 3, 2016

restructure - Restructure cmsis directory #2896

Merged

7 tasks

geky mentioned this pull request Jul 21, 2017

RTOS: Rework directory structure #4786

Closed

geky mentioned this pull request Feb 26, 2018

Add AStyle definition file and travis astyle check #6014

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Restructure directory layout #2878

Restructure directory layout #2878

geky commented Sep 30, 2016

bridadan commented Sep 30, 2016 •

edited

Loading

geky commented Sep 30, 2016

bridadan commented Sep 30, 2016

geky commented Sep 30, 2016

mbed-bot commented Sep 30, 2016

geky commented Sep 30, 2016

mbed-bot commented Sep 30, 2016

geky commented Oct 1, 2016

bridadan commented Oct 1, 2016

mbed-bot commented Oct 1, 2016

mbed-bot commented Oct 1, 2016

sg- commented Oct 1, 2016 •

edited

Loading

mbed-bot commented Oct 1, 2016

geky commented Oct 1, 2016 •

edited

Loading

geky commented Oct 1, 2016

geky commented Oct 1, 2016 •

edited

Loading

sg- commented Oct 1, 2016

mbed-bot commented Oct 2, 2016

SeppoTakalo commented Oct 3, 2016

SeppoTakalo commented Oct 3, 2016

jeromecoutant commented Oct 3, 2016

yogpan01 commented Oct 3, 2016

sg- commented Oct 3, 2016

Restructure directory layout #2878

Restructure directory layout #2878

Conversation

geky commented Sep 30, 2016

bridadan commented Sep 30, 2016 • edited Loading

geky commented Sep 30, 2016

bridadan commented Sep 30, 2016

geky commented Sep 30, 2016

mbed-bot commented Sep 30, 2016

Result: FAILURE

geky commented Sep 30, 2016

mbed-bot commented Sep 30, 2016

Result: ABORTED

Output

geky commented Oct 1, 2016

bridadan commented Oct 1, 2016

mbed-bot commented Oct 1, 2016

Result: FAILURE

Output

mbed-bot commented Oct 1, 2016

sg- commented Oct 1, 2016 • edited Loading

mbed-bot commented Oct 1, 2016

Result: FAILURE

Output

geky commented Oct 1, 2016 • edited Loading

geky commented Oct 1, 2016

geky commented Oct 1, 2016 • edited Loading

sg- commented Oct 1, 2016

mbed-bot commented Oct 2, 2016

Result: SUCCESS

Output

SeppoTakalo commented Oct 3, 2016

SeppoTakalo commented Oct 3, 2016

jeromecoutant commented Oct 3, 2016

yogpan01 commented Oct 3, 2016

sg- commented Oct 3, 2016

bridadan commented Sep 30, 2016 •

edited

Loading

sg- commented Oct 1, 2016 •

edited

Loading

geky commented Oct 1, 2016 •

edited

Loading

geky commented Oct 1, 2016 •

edited

Loading