Changeset 2435 for LMDZ5/branches/testing/tools

Timestamp:

Jan 28, 2016, 5:02:13 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2396:2434 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• tools/compare_real.py (modified) (1 diff)
• tools/diffdef.sh (modified) (5 diffs)

LMDZ5/branches/testing/tools/compare_real.py

@@ -1 @@
-#!/usr/bin/env python
+"""This script should be called by "diffdef.sh". It operates on
+different lines with common variables. It requires version 2.7 or
+higher of Python (it also works with Python 3).
 
-# Author: Lionel GUEZ
-
-# This script should be called by "diffdef.sh". It operates on
-# different lines with common variables. It requires version 2.7 or
-# higher of Python (it also works with Python 3).
+Author: Lionel GUEZ"""
 
 import sys, os.path

LMDZ5/branches/testing/tools/diffdef.sh

@@ -2 +2 @@
 # Author: Lionel GUEZ
 
-# This script compares files "*.def" other than "traceur.def" and
-# "out.def" in two directories. The script uses GNU versions of the
-# utilities cut, sort and uniq.
+# This script compares files "*.def" other than "*traceur.def" and
+# "out.def" in two directories.
+
+# This script uses GNU versions of the utilities cut, sort and uniq,
+# and calls a Python script.
 
 # See guide:
@@ -18 +20 @@
 
 ##set -x
+
+type python3 >/dev/null 2>&1
+if (($? == 0))
+then
+    my_python=python3
+else
+    my_python=python
+fi
+
 set -e
 
@@ -33 +44 @@
   rm -f all.def
   echo "def files in $my_directory:"
-  ls !(traceur|out).def
+  ls !(*traceur|out).def
 
   # Concatenate and format the def files:
-  cat !(traceur|out).def | tr -d " " | grep -v -E '(^#|^!|INCLUDEDEF|^$)' \
+  cat !(*traceur|out).def | tr '\r' '\n' | tr -d " " \
+      | grep -v -E '(^#|^!|INCLUDEDEF|^$)' \
       | tr '[:lower:]' '[:upper:]' | sed 's/=[NF]$/=FALSE/' \
       | sed 's/=[YT]$/=TRUE/' | sort >all.def
@@ -51 +63 @@
       cat plouf_$$
       rm plouf_$$
+      rm all.def
       exit 1
   fi
@@ -81 +94 @@
 done
 
-$script_dir/compare_real.py $*
+$my_python $script_dir/compare_real.py $*
 sort common_lines --output=common_lines # was modified by the Python script
 echo "Created files \"./common_lines\" and \"./uniq_val\"."