From 27f0306ff96f062a53b41a1eff12d687adec7315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20V=C3=A1rady?= Date: Tue, 21 May 2024 19:27:52 +0200 Subject: [PATCH] plugin-skeleton-creator: move under scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: László Várady --- Makefile.am | 1 - dev-utils/plugin_skeleton_creator/Makefile.am | 9 --------- scripts/Makefile.am | 3 +++ scripts/plugin-skeleton-creator/Makefile.am | 9 +++++++++ .../plugin-skeleton-creator}/create_plugin.sh | 0 .../plugin_template_CMakeLists.txt | 0 .../plugin-skeleton-creator}/plugin_template_Makefile.am | 0 .../plugin-skeleton-creator}/plugin_template_grammar.ym | 0 .../plugin-skeleton-creator}/plugin_template_parser.c | 0 .../plugin-skeleton-creator}/plugin_template_parser.h | 0 .../plugin-skeleton-creator}/plugin_template_plugin.c | 0 tests/copyright/policy | 4 ++-- 12 files changed, 14 insertions(+), 12 deletions(-) delete mode 100644 dev-utils/plugin_skeleton_creator/Makefile.am create mode 100644 scripts/plugin-skeleton-creator/Makefile.am rename {dev-utils/plugin_skeleton_creator => scripts/plugin-skeleton-creator}/create_plugin.sh (100%) rename {dev-utils/plugin_skeleton_creator => scripts/plugin-skeleton-creator}/plugin_template_CMakeLists.txt (100%) rename {dev-utils/plugin_skeleton_creator => scripts/plugin-skeleton-creator}/plugin_template_Makefile.am (100%) rename {dev-utils/plugin_skeleton_creator => scripts/plugin-skeleton-creator}/plugin_template_grammar.ym (100%) rename {dev-utils/plugin_skeleton_creator => scripts/plugin-skeleton-creator}/plugin_template_parser.c (100%) rename {dev-utils/plugin_skeleton_creator => scripts/plugin-skeleton-creator}/plugin_template_parser.h (100%) rename {dev-utils/plugin_skeleton_creator => scripts/plugin-skeleton-creator}/plugin_template_plugin.c (100%) diff --git a/Makefile.am b/Makefile.am index 1c465d51b5..137aff091a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -268,7 +268,6 @@ include scl/Makefile.am include packaging/Makefile.am include dbld/Makefile.am include cmake/Makefile.am -include dev-utils/plugin_skeleton_creator/Makefile.am include persist-tool/Makefile.am TEST_EXTENSIONS = .sh diff --git a/dev-utils/plugin_skeleton_creator/Makefile.am b/dev-utils/plugin_skeleton_creator/Makefile.am deleted file mode 100644 index 12289c9f92..0000000000 --- a/dev-utils/plugin_skeleton_creator/Makefile.am +++ /dev/null @@ -1,9 +0,0 @@ -EXTRA_DIST += \ - dev-utils/plugin_skeleton_creator \ - dev-utils/plugin_skeleton_creator/create_plugin.sh \ - dev-utils/plugin_skeleton_creator/plugin_template_CMakeLists.txt \ - dev-utils/plugin_skeleton_creator/plugin_template_grammar.ym \ - dev-utils/plugin_skeleton_creator/plugin_template_Makefile.am \ - dev-utils/plugin_skeleton_creator/plugin_template_parser.c \ - dev-utils/plugin_skeleton_creator/plugin_template_parser.h \ - dev-utils/plugin_skeleton_creator/plugin_template_plugin.c diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 4a6066fc2b..99661f474b 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -13,3 +13,6 @@ EXTRA_DIST += scripts/update-patterndb.in \ install-exec-local: $(mkinstalldirs) $(DESTDIR)/$(sysconfdir)/patterndb.d + + +include scripts/plugin-skeleton-creator/Makefile.am diff --git a/scripts/plugin-skeleton-creator/Makefile.am b/scripts/plugin-skeleton-creator/Makefile.am new file mode 100644 index 0000000000..06bce6ea85 --- /dev/null +++ b/scripts/plugin-skeleton-creator/Makefile.am @@ -0,0 +1,9 @@ +EXTRA_DIST += \ + scripts/plugin-skeleton-creator \ + scripts/plugin-skeleton-creator/create_plugin.sh \ + scripts/plugin-skeleton-creator/plugin_template_CMakeLists.txt \ + scripts/plugin-skeleton-creator/plugin_template_grammar.ym \ + scripts/plugin-skeleton-creator/plugin_template_Makefile.am \ + scripts/plugin-skeleton-creator/plugin_template_parser.c \ + scripts/plugin-skeleton-creator/plugin_template_parser.h \ + scripts/plugin-skeleton-creator/plugin_template_plugin.c diff --git a/dev-utils/plugin_skeleton_creator/create_plugin.sh b/scripts/plugin-skeleton-creator/create_plugin.sh similarity index 100% rename from dev-utils/plugin_skeleton_creator/create_plugin.sh rename to scripts/plugin-skeleton-creator/create_plugin.sh diff --git a/dev-utils/plugin_skeleton_creator/plugin_template_CMakeLists.txt b/scripts/plugin-skeleton-creator/plugin_template_CMakeLists.txt similarity index 100% rename from dev-utils/plugin_skeleton_creator/plugin_template_CMakeLists.txt rename to scripts/plugin-skeleton-creator/plugin_template_CMakeLists.txt diff --git a/dev-utils/plugin_skeleton_creator/plugin_template_Makefile.am b/scripts/plugin-skeleton-creator/plugin_template_Makefile.am similarity index 100% rename from dev-utils/plugin_skeleton_creator/plugin_template_Makefile.am rename to scripts/plugin-skeleton-creator/plugin_template_Makefile.am diff --git a/dev-utils/plugin_skeleton_creator/plugin_template_grammar.ym b/scripts/plugin-skeleton-creator/plugin_template_grammar.ym similarity index 100% rename from dev-utils/plugin_skeleton_creator/plugin_template_grammar.ym rename to scripts/plugin-skeleton-creator/plugin_template_grammar.ym diff --git a/dev-utils/plugin_skeleton_creator/plugin_template_parser.c b/scripts/plugin-skeleton-creator/plugin_template_parser.c similarity index 100% rename from dev-utils/plugin_skeleton_creator/plugin_template_parser.c rename to scripts/plugin-skeleton-creator/plugin_template_parser.c diff --git a/dev-utils/plugin_skeleton_creator/plugin_template_parser.h b/scripts/plugin-skeleton-creator/plugin_template_parser.h similarity index 100% rename from dev-utils/plugin_skeleton_creator/plugin_template_parser.h rename to scripts/plugin-skeleton-creator/plugin_template_parser.h diff --git a/dev-utils/plugin_skeleton_creator/plugin_template_plugin.c b/scripts/plugin-skeleton-creator/plugin_template_plugin.c similarity index 100% rename from dev-utils/plugin_skeleton_creator/plugin_template_plugin.c rename to scripts/plugin-skeleton-creator/plugin_template_plugin.c diff --git a/tests/copyright/policy b/tests/copyright/policy index ccc6148240..999a50192e 100644 --- a/tests/copyright/policy +++ b/tests/copyright/policy @@ -19,7 +19,7 @@ modules/grpc/protos/opentelemetry-proto modules/grpc/protos/grafana-loki modules/grpc/protos/googleapis-proto modules/cloud-auth/jwt-cpp -dev-utils/plugin_skeleton_creator/plugin_template.* +scripts/plugin-skeleton-creator/plugin_template.* (lib|modules)/.*\.conf$ dist\.conf$ .*/\.gradle @@ -283,7 +283,7 @@ packaging/package-indexer/cdn/cloudflare_cdn.py news/create-newsfile.py news/next-pr-id.py -dev-utils/plugin_skeleton_creator/create_plugin.sh +scripts/plugin-skeleton-creator/create_plugin.sh tests/functional tests/unit tests/valgrind