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 /build-data | |
| 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 'build-data')
| -rw-r--r-- | build-data/platforms.mk | 10 | ||||
| -rw-r--r-- | build-data/suffix-rules.mk | 6 |
2 files changed, 13 insertions, 3 deletions
diff --git a/build-data/platforms.mk b/build-data/platforms.mk index 16e61e3f..a568c7a0 100644 --- a/build-data/platforms.mk +++ b/build-data/platforms.mk @@ -28,6 +28,10 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES)) | sed -e 's:.*:../& /usr/bin:' \ > deb/debian/vpp.install ; \ \ + : core api definitions ; \ + ./scripts/find-api-core-contents $(INSTALL_PREFIX)$(ARCH) \ + deb/debian/vpp.install ; \ + \ : need symbolic links in the lib pkg ; \ find $(INSTALL_PREFIX)$(ARCH)/*/lib* \( -type f -o -type l \) \ -print | egrep -e '*\.so\.*\.*\.*' \ @@ -35,6 +39,10 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES)) | sed -e 's:.*:../& /usr/lib/x86_64-linux-gnu:' \ > deb/debian/vpp-lib.install ; \ \ + : vnet api definitions ; \ + ./scripts/find-api-lib-contents $(INSTALL_PREFIX)$(ARCH) \ + deb/debian/vpp-lib.install ; \ + \ : dev package ; \ ./scripts/find-dev-contents $(INSTALL_PREFIX)$(ARCH) \ deb/debian/vpp-dev.install ; \ @@ -62,8 +70,6 @@ install-deb: $(patsubst %,%-find-source,$(ROOT_PACKAGES)) : dev package needs a couple of additions ; \ echo ../build-tool-native/vppapigen/vppapigen /usr/bin \ >> deb/debian/vpp-dev.install ; \ - echo ../../vppapigen/pyvppapigen.py /usr/bin \ - >> deb/debian/vpp-dev.install ; \ echo ../../vpp-api/java/jvpp/gen/jvpp_gen.py /usr/bin \ >> deb/debian/vpp-dev.install ; \ for i in $$(ls ../vpp-api/java/jvpp/gen/jvppgen/*.py); do \ diff --git a/build-data/suffix-rules.mk b/build-data/suffix-rules.mk index 95069297..e3eeb922 100644 --- a/build-data/suffix-rules.mk +++ b/build-data/suffix-rules.mk @@ -20,4 +20,8 @@ $(CC) $(CPPFLAGS) -E -P -C -x c $^ \ | vppapigen --input - --output $@ --show-name $@ - +%.api.json: %.api + @echo " JSON APIGEN " $@ ; \ + mkdir -p `dirname $@` ; \ + $(CC) $(CPPFLAGS) -E -P -C -x c $^ \ + | vppapigen --input - --json $@ |