From patchwork Fri Jan 27 17:37:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ferruh Yigit X-Patchwork-Id: 20053 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 05FCF2B83; Fri, 27 Jan 2017 18:37:37 +0100 (CET) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by dpdk.org (Postfix) with ESMTP id 252E928FD for ; Fri, 27 Jan 2017 18:37:33 +0100 (CET) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga105.fm.intel.com with ESMTP; 27 Jan 2017 09:37:31 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="5.33,296,1477983600"; d="scan'208"; a="1118734094" Received: from sivswdev02.ir.intel.com ([10.237.217.46]) by fmsmga002.fm.intel.com with ESMTP; 27 Jan 2017 09:37:29 -0800 From: Ferruh Yigit To: John McNamara , Thomas Monjalon Cc: dev@dpdk.org, Ferruh Yigit Date: Fri, 27 Jan 2017 17:37:28 +0000 Message-Id: <20170127173728.21618-1-ferruh.yigit@intel.com> X-Mailer: git-send-email 2.8.4 In-Reply-To: <2081164.5ClB4gsZ3F@xps13> References: <2081164.5ClB4gsZ3F@xps13> Subject: [dpdk-dev] [PATCH v2] doc: automate examples file list for API doc X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" These files are linked to API documentation as usage samples, list of files created automatically during doc creation. Remove manually updated old one. Signed-off-by: Ferruh Yigit --- doc/api/doxy-api.conf | 1 - doc/api/examples.dox | 115 -------------------------------------------------- mk/rte.sdkdoc.mk | 14 +++++- 3 files changed, 13 insertions(+), 117 deletions(-) delete mode 100644 doc/api/examples.dox diff --git a/doc/api/doxy-api.conf b/doc/api/doxy-api.conf index 6892315..a92dd3c 100644 --- a/doc/api/doxy-api.conf +++ b/doc/api/doxy-api.conf @@ -30,7 +30,6 @@ PROJECT_NAME = DPDK INPUT = doc/api/doxy-api-index.md \ - doc/api/examples.dox \ drivers/net/bonding \ lib/librte_eal/common/include \ lib/librte_eal/common/include/generic \ diff --git a/doc/api/examples.dox b/doc/api/examples.dox deleted file mode 100644 index c13e574..0000000 --- a/doc/api/examples.dox +++ /dev/null @@ -1,115 +0,0 @@ -/** -@page examples DPDK Example Programs - -@example bond/main.c -@example cmdline/commands.c -@example cmdline/main.c -@example cmdline/parse_obj_list.c -@example distributor/main.c -@example dpdk_qat/crypto.c -@example dpdk_qat/main.c -@example ethtool/ethtool-app/ethapp.c -@example ethtool/ethtool-app/main.c -@example ethtool/lib/rte_ethtool.c -@example exception_path/main.c -@example helloworld/main.c -@example ip_fragmentation/main.c -@example ip_pipeline/config_check.c -@example ip_pipeline/config_parse.c -@example ip_pipeline/config_parse_tm.c -@example ip_pipeline/cpu_core_map.c -@example ip_pipeline/init.c -@example ip_pipeline/main.c -@example ip_pipeline/pipeline/pipeline_common_be.c -@example ip_pipeline/pipeline/pipeline_common_fe.c -@example ip_pipeline/pipeline/pipeline_firewall_be.c -@example ip_pipeline/pipeline/pipeline_firewall.c -@example ip_pipeline/pipeline/pipeline_flow_actions_be.c -@example ip_pipeline/pipeline/pipeline_flow_actions.c -@example ip_pipeline/pipeline/pipeline_flow_classification_be.c -@example ip_pipeline/pipeline/pipeline_flow_classification.c -@example ip_pipeline/pipeline/pipeline_master_be.c -@example ip_pipeline/pipeline/pipeline_master.c -@example ip_pipeline/pipeline/pipeline_passthrough_be.c -@example ip_pipeline/pipeline/pipeline_passthrough.c -@example ip_pipeline/pipeline/pipeline_routing_be.c -@example ip_pipeline/pipeline/pipeline_routing.c -@example ip_pipeline/thread.c -@example ip_pipeline/thread_fe.c -@example ip_reassembly/main.c -@example ipv4_multicast/main.c -@example kni/main.c -@example l2fwd-crypto/main.c -@example l2fwd-jobstats/main.c -@example l2fwd-keepalive/main.c -@example l2fwd/main.c -@example l3fwd-acl/main.c -@example l3fwd/main.c -@example l3fwd-power/main.c -@example l3fwd-vf/main.c -@example link_status_interrupt/main.c -@example load_balancer/config.c -@example load_balancer/init.c -@example load_balancer/main.c -@example load_balancer/runtime.c -@example flow_distributor/distributor/args.c -@example flow_distributor/distributor/init.c -@example flow_distributor/distributor/main.c -@example flow_distributor/node/node.c -@example multi_process/client_server_mp/mp_client/client.c -@example multi_process/client_server_mp/mp_server/args.c -@example multi_process/client_server_mp/mp_server/init.c -@example multi_process/client_server_mp/mp_server/main.c -@example multi_process/l2fwd_fork/flib.c -@example multi_process/l2fwd_fork/main.c -@example multi_process/simple_mp/main.c -@example multi_process/simple_mp/mp_commands.c -@example multi_process/symmetric_mp/main.c -@example netmap_compat/bridge/bridge.c -@example netmap_compat/lib/compat_netmap.c -@example packet_ordering/main.c -@example performance-thread/common/arch/x86/ctx.c -@example performance-thread/common/lthread.c -@example performance-thread/common/lthread_cond.c -@example performance-thread/common/lthread_diag.c -@example performance-thread/common/lthread_mutex.c -@example performance-thread/common/lthread_sched.c -@example performance-thread/common/lthread_tls.c -@example performance-thread/l3fwd-thread/main.c -@example performance-thread/pthread_shim/main.c -@example performance-thread/pthread_shim/pthread_shim.c -@example ptpclient/ptpclient.c -@example qos_meter/main.c -@example qos_meter/rte_policer.c -@example qos_sched/app_thread.c -@example qos_sched/args.c -@example qos_sched/cfg_file.c -@example qos_sched/cmdline.c -@example qos_sched/init.c -@example qos_sched/main.c -@example qos_sched/stats.c -@example quota_watermark/qw/args.c -@example quota_watermark/qwctl/commands.c -@example quota_watermark/qwctl/qwctl.c -@example quota_watermark/qw/init.c -@example quota_watermark/qw/main.c -@example rxtx_callbacks/main.c -@example skeleton/basicfwd.c -@example tep_termination/main.c -@example tep_termination/vxlan.c -@example tep_termination/vxlan_setup.c -@example timer/main.c -@example vhost/main.c -@example vhost_xen/main.c -@example vhost_xen/vhost_monitor.c -@example vhost_xen/xenstore_parse.c -@example vmdq_dcb/main.c -@example vmdq/main.c -@example vm_power_manager/channel_manager.c -@example vm_power_manager/channel_monitor.c -@example vm_power_manager/guest_cli/main.c -@example vm_power_manager/guest_cli/vm_power_cli_guest.c -@example vm_power_manager/main.c -@example vm_power_manager/power_manager.c -@example vm_power_manager/vm_power_cli.c -*/ diff --git a/mk/rte.sdkdoc.mk b/mk/rte.sdkdoc.mk index 21d9bdf..8156e86 100644 --- a/mk/rte.sdkdoc.mk +++ b/mk/rte.sdkdoc.mk @@ -54,6 +54,8 @@ RTE_PDF_DPI ?= 300 RTE_GUIDES := $(filter %/, $(wildcard $(RTE_SDK)/doc/guides/*/)) +API_EXAMPLES := $(RTE_OUTPUT)/doc/html/examples.dox + .PHONY: help help: @cat $(RTE_SDK)/doc/build-sdk-quick.txt @@ -66,10 +68,11 @@ all: api-html guides-html guides-pdf clean: api-html-clean guides-html-clean guides-pdf-clean guides-man-clean .PHONY: api-html -api-html: api-html-clean +api-html: api-html-clean $(API_EXAMPLES) @echo 'doxygen for API...' $(Q)mkdir -p $(RTE_OUTPUT)/doc/html $(Q)(cat $(RTE_SDK)/doc/api/doxy-api.conf && \ + echo INPUT += $(API_EXAMPLES) && \ printf 'PROJECT_NUMBER = ' && \ $(MAKE) -rR showversion && \ echo OUTPUT_DIRECTORY = $(RTE_OUTPUT)/doc && \ @@ -83,8 +86,17 @@ api-html: api-html-clean .PHONY: api-html-clean api-html-clean: $(Q)rm -f $(RTE_OUTPUT)/doc/html/api/* + $(Q)rm -f $(API_EXAMPLES) $(Q)rmdir -p --ignore-fail-on-non-empty $(RTE_OUTPUT)/doc/html/api 2>&- || true +$(API_EXAMPLES): + $(Q)mkdir -p $(RTE_OUTPUT)/doc/html + @echo "/**" > $(API_EXAMPLES) + @echo "@page examples DPDK Example Programs" >> $(API_EXAMPLES) + @echo "" >> $(API_EXAMPLES) + @find examples -type f -name "*.c" | awk '{ print "@example", $$0 }' >> $(API_EXAMPLES) + @echo "*/" >> $(API_EXAMPLES) + guides-pdf-clean: guides-pdf-img-clean guides-pdf-img-clean: $(Q)rm -f $(RTE_SDK)/doc/guides/*/img/*.pdf