This is an automated email from the ASF dual-hosted git repository.
mseidel pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
The following commit(s) were added to refs/heads/trunk by this push:
new d8d58575de pre-commit(end-of-file-fixer): auto fix Makefiles (#300)
d8d58575de is described below
commit d8d58575de210847631502c7abe43d9a0df8d632
Author: John Bampton <[email protected]>
AuthorDate: Fri Feb 28 03:40:52 2025 +1000
pre-commit(end-of-file-fixer): auto fix Makefiles (#300)
---
.pre-commit-config.yaml | 2 +-
main/accessibility/workben/org/openoffice/accessibility/Makefile | 1 -
.../workben/org/openoffice/accessibility/awb/canvas/Makefile | 2 --
.../workben/org/openoffice/accessibility/awb/tree/Makefile | 2 --
main/odk/examples/CLI/CSharp/Spreadsheet/Makefile | 2 --
main/odk/examples/CLI/VB.NET/WriterDemo/Makefile | 1 -
main/odk/examples/DevelopersGuide/OfficeBean/Makefile | 1 -
main/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/Makefile | 1 -
.../examples/DevelopersGuide/ScriptingFramework/ScriptSelector/Makefile | 1 -
main/odk/examples/java/EmbedDocument/Container1/Makefile | 1 -
main/odk/examples/java/Storage/Makefile | 1 -
11 files changed, 1 insertion(+), 14 deletions(-)
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b1e6bcfd8e..74484a8c45 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -33,7 +33,7 @@ repos:
- id: check-merge-conflict
- id: check-vcs-permalinks
- id: end-of-file-fixer
- files:
\.(bat|c|dxp|h|hrc|hxx|idl|in|ini|java|md|mk|pl|pm|py|rc|sh|xcs|xdl|xhp|xmi|xsd|ya?ml)$|^ext_libraries/.*$|^test/.*$
+ files:
(m|M)akefile$|\.(bat|c|dxp|h|hrc|hxx|idl|in|ini|java|md|mk|pl|pm|py|rc|sh|xcs|xdl|xhp|xmi|xsd|ya?ml)$|^ext_libraries/.*$|^test/.*$
- id: mixed-line-ending
files: ^main/.*\.(c|h)xx$
- id: trailing-whitespace
diff --git a/main/accessibility/workben/org/openoffice/accessibility/Makefile
b/main/accessibility/workben/org/openoffice/accessibility/Makefile
index a620733b34..3748cf79eb 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/Makefile
+++ b/main/accessibility/workben/org/openoffice/accessibility/Makefile
@@ -23,4 +23,3 @@ all : subdirs
ROOT=../../../
SUBDIRS=misc awb
include $(ROOT)/makefile.in
-
diff --git
a/main/accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile
b/main/accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile
index afea82682e..788d862107 100644
---
a/main/accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile
+++
b/main/accessibility/workben/org/openoffice/accessibility/awb/canvas/Makefile
@@ -31,5 +31,3 @@ include $(ROOT)/makefile.in
package : $(CLASS_FILES)
-
-
diff --git
a/main/accessibility/workben/org/openoffice/accessibility/awb/tree/Makefile
b/main/accessibility/workben/org/openoffice/accessibility/awb/tree/Makefile
index f5e7459cc8..37c505d696 100644
--- a/main/accessibility/workben/org/openoffice/accessibility/awb/tree/Makefile
+++ b/main/accessibility/workben/org/openoffice/accessibility/awb/tree/Makefile
@@ -30,5 +30,3 @@ include $(ROOT)/makefile.in
package : $(CLASS_FILES)
-
-
diff --git a/main/odk/examples/CLI/CSharp/Spreadsheet/Makefile
b/main/odk/examples/CLI/CSharp/Spreadsheet/Makefile
index bb03ccda10..12fa0d7d4b 100644
--- a/main/odk/examples/CLI/CSharp/Spreadsheet/Makefile
+++ b/main/odk/examples/CLI/CSharp/Spreadsheet/Makefile
@@ -99,5 +99,3 @@ endif
.PHONY: clean
clean :
-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_BIN)/CSharp_SpreadsheetExamples)
-
-
diff --git a/main/odk/examples/CLI/VB.NET/WriterDemo/Makefile
b/main/odk/examples/CLI/VB.NET/WriterDemo/Makefile
index 41fcd16f44..634b72d12b 100644
--- a/main/odk/examples/CLI/VB.NET/WriterDemo/Makefile
+++ b/main/odk/examples/CLI/VB.NET/WriterDemo/Makefile
@@ -87,4 +87,3 @@ endif
.PHONY: clean
clean :
-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_BIN)/VB_dotNET_WriterDemo)
-
diff --git a/main/odk/examples/DevelopersGuide/OfficeBean/Makefile
b/main/odk/examples/DevelopersGuide/OfficeBean/Makefile
index 08f0f3fdd4..1ee36d98ee 100644
--- a/main/odk/examples/DevelopersGuide/OfficeBean/Makefile
+++ b/main/odk/examples/DevelopersGuide/OfficeBean/Makefile
@@ -73,4 +73,3 @@ OOoBeanViewer: $(CLASSFILES)
.PHONY: clean
clean :
-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_COMP_CLASS))
-
diff --git
a/main/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/Makefile
b/main/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/Makefile
index db65089856..69691bd115 100644
--- a/main/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/Makefile
+++ b/main/odk/examples/DevelopersGuide/ScriptingFramework/SayHello/Makefile
@@ -113,4 +113,3 @@ clean :
-$(DELRECURSIVE) $(subst /,$(PS),$(SAMPLE_CLASS_OUT))
-$(DELRECURSIVE) $(subst /,$(PS),$(SCRIPT_GEN_OUT))
-$(DEL) $(subst \\,\,$(subst /,$(PS),$(SCRIPT_PACKAGE_URL)))
-
diff --git
a/main/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/Makefile
b/main/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/Makefile
index e2dd96674e..b8e29238f7 100644
---
a/main/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/Makefile
+++
b/main/odk/examples/DevelopersGuide/ScriptingFramework/ScriptSelector/Makefile
@@ -115,4 +115,3 @@ clean :
-$(DELRECURSIVE) $(subst /,$(PS),$(SAMPLE_CLASS_OUT))
-$(DELRECURSIVE) $(subst /,$(PS),$(SCRIPT_GEN_OUT))
-$(DEL) $(subst \\,\,$(subst /,$(PS),$(SCRIPT_PACKAGE_URL)))
-
diff --git a/main/odk/examples/java/EmbedDocument/Container1/Makefile
b/main/odk/examples/java/EmbedDocument/Container1/Makefile
index 1c94ffdf77..4fd2d078f4 100644
--- a/main/odk/examples/java/EmbedDocument/Container1/Makefile
+++ b/main/odk/examples/java/EmbedDocument/Container1/Makefile
@@ -66,4 +66,3 @@ JavaStorageTestExample : $(CLASSFILES)
.PHONY: clean
clean :
-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_COMP_CLASS))
-
diff --git a/main/odk/examples/java/Storage/Makefile
b/main/odk/examples/java/Storage/Makefile
index c97ea19ad3..7842e1e286 100644
--- a/main/odk/examples/java/Storage/Makefile
+++ b/main/odk/examples/java/Storage/Makefile
@@ -76,4 +76,3 @@ JavaStorageTestExample : $(CLASSFILES)
.PHONY: clean
clean :
-$(DELRECURSIVE) $(subst /,$(PS),$(OUT_COMP_CLASS))
-
