Changeset 3578 for trunk/LMDZ.COMMON/makelmdz_fcm

Timestamp:

Jan 15, 2025, 1:42:03 PM (8 days ago)

Author:

jbclement

Message:

COMMON:
Follow-up of r3576:

• Status result is added to the file "version_stat-diff.txt", previously called "version_diff.txt";
• Addition of the functionnality for the program 'Reshape' dedicated to the PEM;
• Improvements of the visualization format.

JBC

File:

• trunk/LMDZ.COMMON/makelmdz_fcm (modified) (6 diffs)

trunk/LMDZ.COMMON/makelmdz_fcm

@@ -603 +603 @@
 
 # Path and name of the file containing the difference result
-diff_file="version_diff.txt"
+res_file="version_stat-diff.txt"
 
 # Get the current date
@@ -611 +611 @@
 vcs_info=""
 vcs_diff=""
+vcs_status=""
 for dir in "$LMDGCM/.."/*; do
     # Skip if it is not a directory or the name contains "git" or "svn"
@@ -618 +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 $dir ===\n$(svn info "$dir")\n"
-        vcs_diff+="\n=== SVN Diff for $dir ===\n$(svn diff "$dir")\n"
+        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_status+="\n=== SVN Status for $(basename "$dir") ===\n$(svn status "$dir")\n"
     elif command -v git > /dev/null && git -C "$dir" rev-parse --is-inside-work-tree > /dev/null 2>&1; then # Git
-        vcs_info+="\n=== Git Information for $dir ===\n$(git -C "$dir" log -1 --pretty=format:"%H%n%an%n%ad%n%s")\n"
-        vcs_diff+="\n=== Git Diff for $dir ===\n$(git -C "$dir" diff)\n"
+        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_status+="\n=== Git Status for $(basename "$dir") ===\n$(git -C "$dir" status --short)\n"
     else # None
-        vcs_info+="\n=== No version control system for $dir ===\n"
+        vcs_info+="\n=== No version control system for $(basename "$dir") ===\n"
     fi
 done
@@ -635 +638 @@
 ! DESCRIPTION:
 !    The subroutine 'print_version_info' prints compilation details, the
-!    version control information (SVN or Git) and the diff result if
-!    applicable.
+!    version control information (SVN or Git), the status and the diff
+!    result if applicable.
 !
 ! PARAMETERS:
@@ -655 +658 @@
 SUBROUTINE print_version_info()
 
-    write(*,'(A)') '======= Compilation details ======='
-    write(*,'(A)') 'Date: ${current_date}'
-    write(*,'(A)') 'Command: ${compilation_command}'
-    write(*,*)
+write(*,'(a)') '======= Compilation details ======='
+write(*,'(a)') '> Date: ${current_date}'
+write(*,'(a)') '> Command: ${compilation_command}'
+write(*,*)
 EOF
 
 if [ -n "$vcs_info" ]; then
-    echo "    write(*,'(A)') '=== Version Control Information ==='" >> "$info_file"
+    echo "write(*,'(a)') '=== Version Control Information ==='" >> "$info_file"
     while IFS= read -r line; do
-        echo "    write(*,'(A)') '${line//\'/\'\'}'" >> "$info_file"
+        echo "write(*,'(a)') '${line//\'/\'\'}'" >> "$info_file"
     done <<< "$(echo -e "$vcs_info")"
+else
+    echo "write(*,'(a)') '=== No version control system ==='" >> "$info_file"
+fi
+
+if [ -n "$vcs_status" ]; then
+    echo "write(*,*)" >> "$info_file"
+    echo "write(*,'(a)') '=== Version Control Status ==='" >> "$info_file"
+    echo "write(*,'(a)') '> Writing status result to the file \"${res_file}\".'" >> "$info_file"
+    echo "open(unit = 1, file = \"${res_file}\",status = 'replace',action = 'write')" >> "$info_file"
+    while IFS= read -r line; do
+        echo "write(1,'(a)') '${line//\'/\'\'}'" >> "$info_file"
+    done <<< "$(echo -e "$vcs_status")"
+    echo "close(1)" >> "$info_file"
 fi
 
 if [ -n "$vcs_diff" ]; then
-    echo "    write(*,*)" >> "$info_file"
-    echo "    write(*,'(A)') '====== Version Control Diff ======='" >> "$info_file"
-    echo "    write(*,'(A)') 'Writing diff to file: ${diff_file}'" >> "$info_file"
-    echo "    open(unit = 1, file = \"${diff_file}\", status = 'replace', action = 'write')" >> "$info_file"
+    echo "write(*,*)" >> "$info_file"
+    echo "write(*,'(a)') '====== Version Control Diff ======='" >> "$info_file"
+    echo "write(*,'(a)') '> Writing diff result to the file \"${res_file}\".'" >> "$info_file"
+    echo "open(unit = 1, file = \"${res_file}\",status = 'unknown',position = 'append',action = 'write')" >> "$info_file"
     while IFS= read -r line; do
-        echo "    write(1,'(A)') '${line//\'/\'\'}'" >> "$info_file"
+        echo "write(1,'(a)') '${line//\'/\'\'}'" >> "$info_file"
     done <<< "$(echo -e "$vcs_diff")"
-    echo "    close(1)" >> "$info_file"
+    echo "close(1)" >> "$info_file"
 fi
 
 cat << EOF >> "$info_file"
-    write(*,'(A)') '==================================='
+write(*,'(a)') '==================================='
 
 END SUBROUTINE print_version_info
@@ -688 +704 @@
 
 # Termination message
-echo "'$info_file' has been successfully generated."
+echo "'$info_file' has been generated successfully."