Just extraction #818

davidhyman · 2017-09-15T10:54:46Z

Adds a '-x', '--export' option to Yotta
Salient points:

find/replace: top level module directories are renamed on export, I've given them a variable and called them 'vendor_*' when exporting
find/replace: yotta module build directory likewise (ym -> modules)
export copies & renames cached module source directories if possible
find/replace: to allow the export to work, now use relative paths throughout
also used explicit iteration in the templates where possible, rather than a mix. allows common use of filter function (self.relative)
need to template the yotta header file as file path needs setting at CMake run time

1. use common variable for module & target caches 2. change cache directories if exporting 3. export entire built directory to destination 4. missing relative 'include_directories' fixed

e.g. simplelog wayyyy too much copypaste

there are zero references to the project directory worth trying on ci

This reverts commit afc8202.

thegecko · 2017-09-15T11:03:56Z

docs/tutorial/yotta_link.md

-[1/3] Building C object ym/simplelog/source/CMakeFiles/simplelog.dir/path/to/helloyotta/yotta_modules/simplelog/source/simplelog.c.o
-FAILED: /usr/bin/cc -I/path/to/helloyotta -I/path/to/helloyotta/yotta_modules/simplelog -I/path/to/helloyotta/yotta_modules/simplelog/source -O2 -g -DNDEBUG   -include "/path/to/helloyotta/build/x86-osx-native/yotta_config.h" -MMD -MT ym/simplelog/source/CMakeFiles/simplelog.dir/path/to/helloyotta/yotta_modules/simplelog/source/simplelog.c.o -MF ym/simplelog/source/CMakeFiles/simplelog.dir/path/to/helloyotta/yotta_modules/simplelog/source/simplelog.c.o.d -o ym/simplelog/source/CMakeFiles/simplelog.dir/path/to/helloyotta/yotta_modules/simplelog/source/simplelog.c.o   -c /path/to/helloyotta/yotta_modules/simplelog/source/simplelog.c
+[1/3] Building C object modules/simplelog/source/CMakeFiles/simplelog.dir/path/to/helloyotta/yotta_modules/simplelog/source/simplelog.c.o
+FAILED: /usr/bin/cc -I/path/to/helloyotta -I/path/to/helloyotta/yotta_modules/simplelog -I/path/to/helloyotta/yotta_modules/simplelog/source -O2 -g -DNDEBUG   -include "/path/to/helloyotta/build/x86-osx-native/yotta_config.h" -MMD -MT modules/simplelog/source/CMakeFiles/simplelog.dir/path/to/helloyotta/yotta_modules/simplelog/source/simplelog.c.o -MF modules/simplelog/source/CMakeFiles/simplelog.dir/path/to/helloyotta/yotta_modules/simplelog/source/simplelog.c.o.d -o modules/simplelog/source/CMakeFiles/simplelog.dir/path/to/helloyotta/yotta_modules/simplelog/source/simplelog.c.o   -c /path/to/helloyotta/yotta_modules/simplelog/source/simplelog.c


I think this should still say ym not modules

thegecko · 2017-09-15T11:04:13Z

docs/tutorial/yotta_link.md

@@ -64,14 +64,14 @@ error: command ['ninja'] failed
 Here we can see that the file that was being built when the error occurred was:

 ```
-[1/3] Building C object ym/simplelog/source/CMakeFiles/simplelog.dir/path/to/helloyotta/yotta_modules/simplelog/source/simplelog.c.o
+[1/3] Building C object modules/simplelog/source/CMakeFiles/simplelog.dir/path/to/helloyotta/yotta_modules/simplelog/source/simplelog.c.o


thegecko · 2017-09-15T11:04:20Z

docs/tutorial/yotta_link.md

 object would belong to the top-level module/app being built). So from
-`/ym/simplelog/...` we can tell that the failed file is in the `simplelog`


thegecko · 2017-09-15T11:06:08Z

yotta/build.py

+    parser.add_argument('-x', '--export', dest='export',
+        default=False, const=True, nargs='?',
+        help=(
+            'Export mode. If flag is set, generates builds without reference to Yotta.'


yotta not Yotta, or perhaps remove this comment? e.g. Export mode. If flag is set, generates a buildable folder structure in the specified folder.

thegecko · 2017-09-15T11:08:10Z

yotta/test_subcommand.py

@@ -73,15 +74,15 @@ def moduleFromDirname(build_subdir, all_modules, toplevel_module):
    modtop = True
    submod = False
    module = toplevel_module
-    # <topdir> /ym/<submod>/ym/<submod2>/somedir/somedir --> submod2
+    # <topdir> /modules/<submod>/modules/<submod2>/somedir/somedir --> submod2


@sami

Add changes from @sami Haapakoski

thegecko and others added 30 commits August 21, 2017 19:38

output folder WiP

c71736a

gitignore idea

37a8d3a

common path manipulation tools

79d208f

use the generator rather than assertions

b36dcb7

unused variables

97b8d0f

relative paths for CMakeLists

e6ed1f6

protect paths code from argparser Namespace missing keys

1826a31

tidy up installAndBuild

abfeeb2

explicit flag for performing a full export (?)

403d6aa

print debug traceback on exception

e5e503c

'export mode' added (but broken)

d317d59

1. use common variable for module & target caches 2. change cache directories if exporting 3. export entire built directory to destination 4. missing relative 'include_directories' fixed

works for very simple examples.

78fbe0b

e.g. simplelog wayyyy too much copypaste

successfully builds ble + deps

75792e9

there are zero references to the project directory worth trying on ci

stop using args namespaces (some more)

56c3f9b

use unittest assertions properly, update for ym->modules

0fdbef4

update docs

8bb65d6

toolchain path, build cli clarification

7cc282f

debugging circle using print statements. great.

3ce22b2

in toolchain, force a string replace on toolchain include files

0f3e277

...

f5fbca1

toolchain with absolute paths?

afc8202

Revert "toolchain with absolute paths?"

fa11631

This reverts commit afc8202.

add a dockerfile for testing

e9d0423

Templated replacement for yotta header files

7309123

yotta self reference

a4e1722

test_debug relpath

b494095

tweak template comments

fae3e20

dockerfile updates

f4098b2

Fixes test_testCustomCMake

4f18ae3

unicode is bad for the environment

a394342

davidhyman and others added 18 commits September 14, 2017 11:45

tweaks for dev docker

baecb75

clarify depend_subdirs

f4530a8

fix add_own_subdirs

efb829f

improve tempfile handling

d90625c

add a test for export behaviour

066b164

python3 print statement

71d683d

inconsistent docs

ce7e458

remove paths & dockerfile for this branch

4da9861

circleci: give tox more time

c235600

fix for noop test for relative/non-relative paths

398dbb0

re-add ym as a default for backwards-compatibility

2942916

timeouts on test export subprocess commands

28e046e

speculative grep fix

9b61e1a

fix test_test_subcommand

ba14037

remove the subprocess32 stuff

bed35b8

oops, need that bit

0557159

unused imports

da8f188

drop tox timeout

b87ac7f

davidhyman requested review from thegecko and bogdanm September 15, 2017 10:56

thegecko suggested changes Sep 15, 2017

View reviewed changes

davidhyman and others added 8 commits September 15, 2017 12:18

revert references to ym

a5bed51

tweak export helpstring

0313a51

Merge branch 'master' into just_extraction

6784962

Add a couple of references to export in the docs

caff88d

'vendor_modules' -> 'modules' + black->white list

e42079f

i) tidy up after exporting ii) builddir for export closer to top level

09cc9a3

Fix for extraneous quotes

e1f1399

Add changes from @sami Haapakoski

update from master (0.18.4) - cryptography install fixes

e5e112f

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Just extraction #818

Just extraction #818

davidhyman commented Sep 15, 2017

thegecko Sep 15, 2017

thegecko Sep 15, 2017

thegecko Sep 15, 2017

thegecko Sep 15, 2017 •

edited

Loading

thegecko Sep 15, 2017

		object would belong to the top-level module/app being built). So from
		`/ym/simplelog/...` we can tell that the failed file is in the `simplelog`

Just extraction #818

Are you sure you want to change the base?

Just extraction #818

Conversation

davidhyman commented Sep 15, 2017

thegecko Sep 15, 2017

Choose a reason for hiding this comment

thegecko Sep 15, 2017

Choose a reason for hiding this comment

thegecko Sep 15, 2017

Choose a reason for hiding this comment

thegecko Sep 15, 2017 • edited Loading

Choose a reason for hiding this comment

thegecko Sep 15, 2017

Choose a reason for hiding this comment

thegecko Sep 15, 2017 •

edited

Loading