Merge lp:~kissiel/checkbox/provider-supplied-libs into lp:checkbox

Proposed by Maciej Kisielewski
Status: Merged
Approved by: Paul Larson
Approved revision: 4372
Merged at revision: 4374
Proposed branch: lp:~kissiel/checkbox/provider-supplied-libs
Merge into: lp:checkbox
Diff against target: 25 lines (+8/-0)
1 file modified
checkbox-touch/build-me (+8/-0)
To merge this branch: bzr merge lp:~kissiel/checkbox/provider-supplied-libs
Reviewer Review Type Date Requested Status
Paul Larson Approve
Review via email: mp+295446@code.launchpad.net

Description of the change

This MR makes build-me copy over all libs provided by the provider.

To test it, use a provider that has some custom libs. I.e. contains a populatd lib/ directory. E.g. Shenzen provider.

To post a comment you must log in.
Revision history for this message
Maciej Kisielewski (kissiel) wrote :

Ugh. borked rebase, hold on!

Revision history for this message
Maciej Kisielewski (kissiel) wrote :

> Ugh. borked rebase, hold on!
Now it's right!

Revision history for this message
Paul Larson (pwlars) wrote :

A couple of small questions

review: Needs Information
Revision history for this message
Maciej Kisielewski (kissiel) wrote :

My line of defense inline :)

Revision history for this message
Paul Larson (pwlars) wrote :

Makes sense, thanks for explaining! +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'checkbox-touch/build-me'
2--- checkbox-touch/build-me 2016-05-19 04:13:40 +0000
3+++ checkbox-touch/build-me 2016-05-23 10:58:33 +0000
4@@ -185,6 +185,7 @@
5 if not validate_providers():
6 sys.exit('Provider validation failed.')
7 extract_dependencies()
8+ copy_provider_libs()
9
10 current_manifest = json.loads(open('manifest.json', 'rt').read())
11 check_versions_match(current_manifest)
12@@ -304,6 +305,13 @@
13 if os.path.exists(lib_path):
14 rsync_tree(lib_path, 'lib', preserve_symlinks=1)
15
16+def copy_provider_libs():
17+ print("Copy over provider-supplied libs")
18+ for provider_dir in os.listdir('providers'):
19+ prov_lib = os.path.join('providers', provider_dir, 'lib')
20+ if os.path.exists(prov_lib):
21+ rsync_tree(prov_lib, 'lib')
22+
23
24 def generate_desktop_file():
25 template = textwrap.dedent("""

Subscribers

People subscribed via source and target branches