Changeset 3595

Timestamp:

Jan 22, 2025, 2:14:44 PM (11 days ago)

Author:

jbclement

Message:

COMMON:
Making the Fortran file automatically generated at compilation more robust regarding the character encoding format.
JBC

File:

• trunk/LMDZ.COMMON/makelmdz_fcm (modified) (1 diff)

trunk/LMDZ.COMMON/makelmdz_fcm

@@ -619 +619 @@
     # Determine the version control system for each subdirectory
     if command -v svn > /dev/null && svn info "$dir" > /dev/null 2>&1; then # SVN
-        vcs_info+="\n-> SVN Information for \"$(basename "$dir")\"\n$(svn info "$dir")\n"
-        vcs_diff+="\n-> SVN Diff for \"$(basename "$dir")\"\n$(svn diff "$dir")\n"
-        vcs_stat+="\n-> SVN Status for \"$(basename "$dir")\"\n$(svn status "$dir")\n"
+        vcs_info+="\n-> SVN Information for \"$(basename "$dir")\"\n$(svn info "$dir" | iconv -f "$(locale charmap)" -t UTF-8//IGNORE)\n"
+        vcs_diff+="\n-> SVN Diff for \"$(basename "$dir")\"\n$(svn diff "$dir" | iconv -f "$(locale charmap)" -t UTF-8//IGNORE)\n"
+        vcs_stat+="\n-> SVN Status for \"$(basename "$dir")\"\n$(svn status "$dir" | iconv -f "$(locale charmap)" -t UTF-8//IGNORE)\n"
     elif command -v git > /dev/null && git -C "$dir" rev-parse --is-inside-work-tree > /dev/null 2>&1; then # Git
-        vcs_info+="-> Git Information for \"$(basename "$dir")\"\n$(git -C "$dir" log -1 --pretty=format:"%H%n%an%n%ad%n%s")\n"
-        vcs_diff+="\n-> Git Diff for \"$(basename "$dir")\"\n$(git -C "$dir" diff)\n"
-        vcs_stat+="\n-> Git Status for \"$(basename "$dir")\"\n$(git -C "$dir" status --short)\n"
+        vcs_info+="-> Git Information for \"$(basename "$dir")\"\n$(git -C "$dir" log -1 --pretty=format:"%H%n%an%n%ad%n%s" | iconv -f "$(locale charmap)" -t UTF-8//IGNORE)\n"
+        vcs_diff+="\n-> Git Diff for \"$(basename "$dir")\"\n$(git -C "$dir" diff | iconv -f "$(locale charmap)" -t UTF-8//IGNORE)\n"
+        vcs_stat+="\n-> Git Status for \"$(basename "$dir")\"\n$(git -C "$dir" status --short | iconv -f "$(locale charmap)" -t UTF-8//IGNORE)\n"
     else # None
         vcs_info+="\n-> No version control system for \"$(basename "$dir")\"\n"