From 55c04dac81f8275e7fac8c55d40a097153e1c344 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: Wed, 8 Mar 2023 15:06:20 +0100
Subject: [PATCH] Remove annotation removal scripts
---
build | 2 --
check | 6 ------
install | 10 ----------
macros.d/macros.fjava | 20 --------------------
4 files changed, 38 deletions(-)
diff --git a/build b/build
index 8e676f2d..172177a0 100755
--- a/build
+++ b/build
@@ -79,8 +79,6 @@ expand depgenerators/fileattrs/javadoc.attr
manpage abs2rel
manpage find-jar
manpage gradle_build
-manpage java_remove_annotations
-manpage java_remove_imports
manpage mvn_alias
manpage mvn_artifact
manpage mvn_build
diff --git a/check b/check
index 305257f9..2305307d 100755
--- a/check
+++ b/check
@@ -82,10 +82,4 @@ coverage combine
coverage xml
coverage report
-echo "Running Lua tests..."
-for test_file in ./test/*_test.lua; do
- echo "${test_file##*/}"
- LUA_PATH=java-utils/java_symbols_lib.lua lua ./"${test_file}"
-done
-
exit ${r1}
diff --git a/install b/install
index e80db4cf..ec6e72d0 100755
--- a/install
+++ b/install
@@ -188,16 +188,6 @@ inst_data target/pom_xpath_replace.7 "${mandir}/man7"
inst_data target/pom_xpath_set.7 "${mandir}/man7"
-exec >files-extra
-
-inst_exec java-utils/java_remove_symbols.lua "${javadir}-utils"
-inst_data java-utils/java_remove_symbols.rpm.lua "${javadir}-utils"
-inst_data java-utils/java_symbols_lib.lua "${javadir}-utils"
-
-inst_data target/java_remove_annotations.7 "${mandir}/man7"
-inst_data target/java_remove_imports.7 "${mandir}/man7"
-
-
exec >files-generators
dir "${rpmconfigdir}/fileattrs"
diff --git a/macros.d/macros.fjava b/macros.d/macros.fjava
index b1f92f90..50b83570 100644
--- a/macros.d/macros.fjava
+++ b/macros.d/macros.fjava
@@ -463,23 +463,3 @@ API documentation for %{name}. \
%exclude %dir %{_licensedir} \
%endif \
%endif
-
-
-#==============================================================================
-# java_remove_imports - remove import statements from Java source files
-#
-# Usage: *%java_remove_imports* [list of file paths]... [-n <list of class names>...] [-p <list of patterns>...]
-#
-# Removes import statements from Java source files by matching them against the
-# lists of simple class names and patterns.
-%java_remove_imports LUA_PATH=@{javadir}-utils/java_symbols_lib.lua /usr/bin/lua @{javadir}-utils/java_remove_symbols.lua
-
-
-# java_remove_annotations - remove imports and annotations from Java source
-# files
-#
-# Usage: *%java_remove_annotations* [list of file paths]... [-n <list of class names>...] [-p <list of patterns>...]
-#
-# Removes import statements as well as usage of annotations from Java source
-# files by matching them against the lists of simple class names and patterns.
-%java_remove_annotations LUA_PATH=@{javadir}-utils/java_symbols_lib.lua /usr/bin/lua @{javadir}-utils/java_remove_symbols.lua -a
--
2.39.1