From: Dave Barach Date: Mon, 2 Jan 2017 17:22:48 +0000 (-0500) Subject: Update emacs plugin generator skeleton X-Git-Tag: v17.04-rc1~445 X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=605c63678272af5caeee1d309de6319eb0ac69b0;p=vpp.git Update emacs plugin generator skeleton Generated code compiles with the new build scheme, works, etc. Change-Id: I147aa5fa580a71ef25615b02277870867e475042 Signed-off-by: Dave Barach --- diff --git a/build-root/emacs-lisp/all-skel.el b/build-root/emacs-lisp/all-skel.el index 2bf15b240f1..f0cc9fe382c 100644 --- a/build-root/emacs-lisp/all-skel.el +++ b/build-root/emacs-lisp/all-skel.el @@ -23,11 +23,10 @@ (load-file "./periodic-skel.el") (load-file "./pipe-skel.el") (load-file "./plugin-all-apih-skel.el") +(load-file "./plugin-am-skel.el") (load-file "./plugin-api-skel.el") -(load-file "./plugin-configure-skel.el") (load-file "./plugin-h-skel.el") (load-file "./plugin-main-skel.el") -(load-file "./plugin-makefile-skel.el") (load-file "./plugin-msg-enum-skel.el") (load-file "./plugin-node-skel.el") (load-file "./plugin-test-skel.el") diff --git a/build-root/emacs-lisp/plugin-makefile-skel.el b/build-root/emacs-lisp/plugin-am-skel.el similarity index 52% rename from build-root/emacs-lisp/plugin-makefile-skel.el rename to build-root/emacs-lisp/plugin-am-skel.el index 7cb6cbfd5e3..5a082b4c002 100644 --- a/build-root/emacs-lisp/plugin-makefile-skel.el +++ b/build-root/emacs-lisp/plugin-am-skel.el @@ -1,4 +1,4 @@ -;;; plugin-makefile-skel.el - vpp engine plug-in "main.c" skeleton +;;; plugin-am-skel.el - vpp engine plug-in foo.am skeleton ;;; ;;; Copyright (c) 2016 Cisco and/or its affiliates. ;;; Licensed under the Apache License, Version 2.0 (the "License"); @@ -15,8 +15,8 @@ (require 'skeleton) -(define-skeleton skel-plugin-makefile -"Insert a plug-in 'Makefile.am' skeleton " +(define-skeleton skel-plugin-makefile-am-fragment +"Insert a plug-in 'foo.am' skeleton " nil '(if (not (boundp 'plugin-name)) (setq plugin-name (read-string "Plugin name: "))) @@ -35,41 +35,26 @@ nil # See the License for the specific language governing permissions and # limitations under the License. -AUTOMAKE_OPTIONS = foreign subdir-objects +vppapitestplugins_LTLIBRARIES += " plugin-name "_test_plugin.la +vppplugins_LTLIBRARIES += " plugin-name "_plugin.la -AM_CFLAGS = -Wall -AM_LDFLAGS = -module -shared -avoid-version +" plugin-name "_plugin_la_SOURCES = \\ + " plugin-name "/node.c \\ + " plugin-name "/" plugin-name ".c \\ + " plugin-name "/" plugin-name ".h \\ + " plugin-name "/" plugin-name "_all_api_h.h \\ + " plugin-name "/" plugin-name "_msg_enum.h -vppapitestpluginsdir = ${libdir}/vpp_api_test_plugins -vpppluginsdir = ${libdir}/vpp_plugins +API_FILES += " plugin-name "/" plugin-name ".api -vppplugins_LTLIBRARIES = " plugin-name "_plugin.la -vppapitestplugins_LTLIBRARIES = " plugin-name "_test_plugin.la - -" plugin-name "_plugin_la_SOURCES = " plugin-name "/" plugin-name ".c \\ - " plugin-name "/node.c \\ - " plugin-name "/" plugin-name "_plugin.api.h -" plugin-name "_plugin_la_LDFLAGS = -module - -BUILT_SOURCES = " plugin-name "/" plugin-name ".api.h - -SUFFIXES = .api.h .api - -%.api.h: %.api - mkdir -p `dirname $@` ; \\ - $(CC) $(CPPFLAGS) -E -P -C -x c $^ \\ - | vppapigen --input - --output $@ --show-name $@ - -noinst_HEADERS = \\ - " plugin-name "/" plugin-name "_all_api_h.h \\ - " plugin-name "/" plugin-name "_msg_enum.h \\ - " plugin-name "/" plugin-name ".api.h +nobase_apiinclude_HEADERS += \\ + " plugin-name "/" plugin-name "_all_api_h.h \\ + " plugin-name "/" plugin-name "_msg_enum.h \\ + " plugin-name "/" plugin-name ".api.h " plugin-name "_test_plugin_la_SOURCES = \\ - " plugin-name "/" plugin-name "_test.c " plugin-name "/" plugin-name "_plugin.api.h + " plugin-name "/" plugin-name "_test.c \\ + " plugin-name "/" plugin-name ".api.h -# Remove *.la files -install-data-hook: - @(cd $(vpppluginsdir) && $(RM) $(vppplugins_LTLIBRARIES)) - @(cd $(vppapitestpluginsdir) && $(RM) $(vppapitestplugins_LTLIBRARIES)) +# vi:syntax=automake ") diff --git a/build-root/emacs-lisp/plugin-configure-skel.el b/build-root/emacs-lisp/plugin-configure-skel.el deleted file mode 100644 index ebf0bf69e89..00000000000 --- a/build-root/emacs-lisp/plugin-configure-skel.el +++ /dev/null @@ -1,33 +0,0 @@ -;;; plugin-configure-skel.el - vpp engine plug-in "main.c" skeleton -;;; -;;; Copyright (c) 2016 Cisco and/or its affiliates. -;;; Licensed under the Apache License, Version 2.0 (the "License"); -;;; you may not use this file except in compliance with the License. -;;; You may obtain a copy of the License at: -;;; -;;; http://www.apache.org/licenses/LICENSE-2.0 -;;; -;;; Unless required by applicable law or agreed to in writing, software -;;; distributed under the License is distributed on an "AS IS" BASIS, -;;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -;;; See the License for the specific language governing permissions and -;;; limitations under the License. - -(require 'skeleton) - -(define-skeleton skel-plugin-configure -"Insert a plug-in 'configure.ac' skeleton " -nil -'(if (not (boundp 'plugin-name)) - (setq plugin-name (read-string "Plugin name: "))) -'(setq PLUGIN-NAME (upcase plugin-name)) -" -AC_INIT(" plugin-name "_plugin, 1.0) -AM_INIT_AUTOMAKE -AM_SILENT_RULES([yes]) - -AC_PROG_LIBTOOL -AC_PROG_CC - -AC_OUTPUT([Makefile]) -") diff --git a/build-root/emacs-lisp/plugin-main-skel.el b/build-root/emacs-lisp/plugin-main-skel.el index 47240695d4f..90b98949e83 100644 --- a/build-root/emacs-lisp/plugin-main-skel.el +++ b/build-root/emacs-lisp/plugin-main-skel.el @@ -258,6 +258,9 @@ static clib_error_t * " plugin-name "_init (vlib_main_t * vm) error = " plugin-name "_plugin_api_hookup (vm); + /* Add our API messages to the global name_crc hash table */ + setup_message_id_table (sm, &api_main); + vec_free(name); return error; diff --git a/build-root/emacs-lisp/plugin.el b/build-root/emacs-lisp/plugin.el index 006ae54dc11..4f1361a32f2 100644 --- a/build-root/emacs-lisp/plugin.el +++ b/build-root/emacs-lisp/plugin.el @@ -8,15 +8,12 @@ (makunbound 'PLUGIN-NAME) (setq plugin-name (read-string "Plugin name: ")) (setq PLUGIN-NAME (upcase plugin-name)) - (setq cmd-args (concat "mkdir -p " plugin-name "-plugin/" plugin-name)) + (find-file (concat plugin-name ".am")) + (skel-plugin-makefile-am-fragment) + (setq cmd-args (concat "mkdir -p " plugin-name)) (shell-command cmd-args) - (setq cd-args (concat start-dir plugin-name "-plugin")) + (setq cd-args (concat start-dir "/" plugin-name)) (setq default-directory cd-args) - (find-file "Makefile.am") - (skel-plugin-makefile) - (find-file "configure.ac") - (skel-plugin-configure) - (setq default-directory (concat cd-args "/" plugin-name)) (find-file (concat plugin-name ".api")) (skel-plugin-api) (find-file (concat plugin-name "_all_api_h.h"))