diff options
| author |   Ole Troan <ot@cisco.com> | 2016-12-01 21:49:03 +0100 |
|---|---|---|
| committer |   Ole Trøan <otroan@employees.org> | 2016-12-02 09:11:11 +0000 |
| commit | f14e3bf7b297f3b9eea87af412929bb8f277b315 (patch) | |
| tree | cc9fc2313b79936b34bda0c01a354c0633834ba0 /vpp-api | |
| parent | 7be864ad0d8e3b139a277fb4a0234480f0cc3daa (diff) | |
API: Packaging of JSON files.
Change-Id: If041b6faf1a091d4758b514f0a8cd800ee0e6a89
Signed-off-by: Ole Troan <ot@cisco.com>
Signed-off-by: Ole Troan <otroan@ot-vpp.cisco.com>
Signed-off-by: Ole Troan <ot@cisco.com>
Diffstat (limited to 'vpp-api')
| -rw-r--r-- | vpp-api/Makefile.am | 15 | ||||
| -rw-r--r-- | vpp-api/java/Makefile.am | 6 | ||||
| -rw-r--r-- | vpp-api/python/Makefile.am | 17 |
3 files changed, 4 insertions, 34 deletions
diff --git a/vpp-api/Makefile.am b/vpp-api/Makefile.am index 310bd2321eb..1812b63765c 100644 --- a/vpp-api/Makefile.am +++ b/vpp-api/Makefile.am @@ -1,17 +1,2 @@ AUTOMAKE_OPTIONS = foreign SUBDIRS = python java - -api_json_dir = $(abs_builddir)/vpp-api -api_srcs:=$(shell find $(prefix)/../ -name '*.api') -api_json:=$(patsubst %.api,$(api_json_dir)/%.api.json,$(notdir $(api_srcs))) - -define define_compile_rules -$(api_json_dir)/%.api.json: $(1)%.api - @echo " + Generating '$$<'" - @mkdir -p $$(@D) - $(CC) $$(CPPFLAGS) -E -P -C -x c $$< | vppapigen --input - --json $$@ -endef - -$(foreach directory,$(dir $(api_srcs)),$(eval $(call define_compile_rules,$(directory)))) - -BUILT_SOURCES = $(api_json) diff --git a/vpp-api/java/Makefile.am b/vpp-api/java/Makefile.am index af4c3f31923..f2f5fbe5b2a 100644 --- a/vpp-api/java/Makefile.am +++ b/vpp-api/java/Makefile.am @@ -83,14 +83,14 @@ packagedir_jvpp_core = io/fd/vpp/jvpp/core BUILT_SOURCES += jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h -jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h: jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h $(abs_builddir)/../vpp-api/vpe.api.json +jvpp-core/io_fd_vpp_jvpp_core_JVppCoreImpl.h: jvpp-registry/io_fd_vpp_jvpp_VppJNIConnection.h $(prefix)/../vpp/vpp-api/vpe.api.json cp -rf @srcdir@/jvpp-core/* -t jvpp-core/ mkdir -p jvpp-core/target cd jvpp-core \ && mkdir -p types dto future callfacade callback notification \ && @srcdir@/jvpp/gen/jvpp_gen.py --plugin_name core \ - -i $(abs_builddir)/../vpp-api/vpe.api.json \ - $(abs_builddir)/../vpp-api/interface.api.json \ + -i $(prefix)/../vpp/vpp-api/vpe.api.json \ + $(prefix)/../vnet/vnet/interface.api.json \ && cp -rf types dto future callfacade callback notification *.java -t $(packagedir_jvpp_core) \ && rm -rf types dto future callfacade callback notification *.java diff --git a/vpp-api/python/Makefile.am b/vpp-api/python/Makefile.am index d2c3fb5dd4e..2a578464d0f 100644 --- a/vpp-api/python/Makefile.am +++ b/vpp-api/python/Makefile.am @@ -32,23 +32,8 @@ libpneum_la_LIBADD = -lvlibmemoryclient -lvlibapi -lsvm -lvppinfra -lpthread \ libpneum_la_LDFLAGS = -module libpneum_la_CPPFLAGS = -# -# Core VPP API -# -$(srcdir)/vpp_papi/vpe.py: $(prefix)/../vpp/vpp-api/vpe.api - $(info Creating Python binding for $@) - $(CC) $(CPPFLAGS) -E -P -C -x c $< \ - | vppapigen --input - --python - \ - | pyvppapigen.py --input - > $(srcdir)/vpp_papi/$(notdir $@) - -$(srcdir)/vpp_papi/memclnt.py: $(prefix)/../vlib-api/vlibmemory/memclnt.api - $(info Creating Python binding for $@) - $(CC) $(CPPFLAGS) -E -P -C -x c $< \ - | vppapigen --input - --python - \ - | pyvppapigen.py --input - > $(srcdir)/vpp_papi/$(notdir $@) - # TODO: Support both Python 2 and 3. -install-exec-local: $(srcdir)/vpp_papi/vpe.py $(srcdir)/vpp_papi/memclnt.py +install-exec-local: cd $(srcdir); \ mkdir -p $(prefix)/lib/python2.7/site-packages; \ PYTHONUSERBASE=$(prefix) \ |