From 8b27415a857f59da47b376d73ac0998c4c9c600d Mon Sep 17 00:00:00 2001
From: Allan Blanchard <allan.blanchard@cea.fr>
Date: Thu, 16 Jun 2022 09:52:13 +0200
Subject: [PATCH] [Lint] changes UTF8 check
---
share/Makefile.linting | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/share/Makefile.linting b/share/Makefile.linting
index d1713c83864..a642d5931e7 100644
--- a/share/Makefile.linting
+++ b/share/Makefile.linting
@@ -35,8 +35,8 @@
################################
## Default variables
-IS_UTF8 ?= iconv -f UTF-8
-TO_UTF8 ?= iconv -t UTF-8
+IS_UTF8 ?= iconv -f UTF-8 -t UTF-8
+TO_UTF8 ?= iconv -f <NAME> -t UTF-8
OCP_INDENT ?= ocp-indent
# Default values necessary for
@@ -55,7 +55,7 @@ TOUCH ?= touch
# Can be set to the path of that makefile
LINT_MAKEFILE ?=
-# Can be set to a sub-directory to restrict the checking
+# Can be set to a sub-directory to restrict the checking
LINT_DIR ?= .
################################
@@ -204,7 +204,8 @@ $(LINT_FILE.check-utf8): .lint/%.check-utf8: %
if ! $(IS_UTF8) $< > /dev/null; \
then \
echo "File $< uses an invalid UTF-8 encoding."; \
- echo "Please fixe it manually, pearhaps with: $(TO_UTF8) --from-code=<NAME> $<";\
+ echo "Please fixe it manually, pearhaps with:"; \
+ echo " $(TO_UTF8) --from-code=<NAME> $< -o fixed ; mv fixed $<";\
echo "The next command may help you to find that <NAME>: file $<";\
exit 1; \
fi
--
GitLab