diff options
| author |   Paul Vinciguerra <pvinci@vinciconsulting.com> | 2018-09-12 13:40:13 -0700 |
|---|---|---|
| committer |   Damjan Marion <dmarion@me.com> | 2018-09-13 00:32:35 +0000 |
| commit | 9ce6a21aaa76cd40c95ebbcb5fc6e48a8f5dfdb9 (patch) | |
| tree | 5656afec4a81b93dcda22b5af8b41c051f246bd8 /src | |
| parent | b1232555e91b286feab5667b5a22f29aa8e96626 (diff) | |
Fix: vppapigen make build fails on fresh install
Steps to reproduce:
vagrant@localhost:/vagrant$ build-root/vagrant/build.sh
...
@@@@ Building vpp in /vagrant/build-root/build-vpp-native/vpp @@@@
[51/1169] Generating API header /vagrant/build-root/build-vpp-native/vpp/vlibmemory/memclnt.api.json
FAILED: cd /vagrant/build-root/build-vpp-native/vpp/vlibmemory && mkdir -p /vagrant/build-root/build-vpp-native/vpp/vlibmemory && /vagrant/src/tools/vppapigen/vppapigen --includedir /vagrant/src --input /vagrant/src/vlibmemory/memclnt.api JSON --output /vagrant/build-root/build-vpp-native/vpp/vlibmemory/memclnt.api.json
AttributeError: 'module' object has no attribute 'dumps'
This seems to be due to JSON.py namespace colliding with the standard lib json.py
Change-Id: If389e4e05ef0c166b0c2b3bef7ec0185298679a8
Signed-off-by: Paul Vinciguerra <pvinci@vinciconsulting.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/vppapigen/CMakeLists.txt | 2 | ||||
| -rwxr-xr-x | src/tools/vppapigen/vppapigen.py | 4 | ||||
| -rw-r--r-- | src/tools/vppapigen/vppapigen_c.py (renamed from src/tools/vppapigen/C.py) | 0 | ||||
| -rw-r--r-- | src/tools/vppapigen/vppapigen_json.py (renamed from src/tools/vppapigen/JSON.py) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/vppapigen/CMakeLists.txt b/src/tools/vppapigen/CMakeLists.txt index 0d982fe29f8..ce25cb0c9e7 100644 --- a/src/tools/vppapigen/CMakeLists.txt +++ b/src/tools/vppapigen/CMakeLists.txt @@ -21,4 +21,4 @@ install( COMPONENT vpp-dev ) -install(FILES C.py JSON.py DESTINATION share/vpp COMPONENT vpp-dev) +install(FILES vppapigen_c.py vppapigen_json.py DESTINATION share/vpp COMPONENT vpp-dev) diff --git a/src/tools/vppapigen/vppapigen.py b/src/tools/vppapigen/vppapigen.py index f3094ec0a84..9d04ec24cfc 100755 --- a/src/tools/vppapigen/vppapigen.py +++ b/src/tools/vppapigen/vppapigen.py @@ -785,14 +785,14 @@ def main(): '/../share/vpp/') for c in cand: c += '/' - if os.path.isfile(c + args.output_module + '.py'): + if os.path.isfile('{}vppapigen_{}.py'.format(c, args.output_module.lower())): pluginpath = c break else: pluginpath = args.pluginpath + '/' if pluginpath == '': raise Exception('Output plugin not found') - module_path = pluginpath + args.output_module + '.py' + module_path = '{}vppapigen_{}.py'.format(pluginpath, args.output_module.lower()) try: plugin = imp.load_source(args.output_module, module_path) diff --git a/src/tools/vppapigen/C.py b/src/tools/vppapigen/vppapigen_c.py index b56e0722122..b56e0722122 100644 --- a/src/tools/vppapigen/C.py +++ b/src/tools/vppapigen/vppapigen_c.py diff --git a/src/tools/vppapigen/JSON.py b/src/tools/vppapigen/vppapigen_json.py index 2991bec57ac..2991bec57ac 100644 --- a/src/tools/vppapigen/JSON.py +++ b/src/tools/vppapigen/vppapigen_json.py |