Changeset 4125

Timestamp:

2013-10-24T18:32:38+02:00 (11 years ago)

Author:

andrewryan

Message:

picked up changes from trunk which fix OBSTOOLS build with maketools

Location:

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/TOOLS

Files:

• COMPILE/Fcheck_archfile.sh (modified) (6 diffs)
• maketools (modified) (1 diff)

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/TOOLS/COMPILE/Fcheck_archfile.sh

@@ -40 +40 @@
 # ::
 #
-#  $ ./Fcheck_archfile.sh ARCHFILE COMPILER
+#  $ ./Fcheck_archfile.sh ARCHFILE CPPFILE COMPILER
 #
 #
@@ -94 +94 @@
    else
        if [ -f ${COMPIL_DIR}/$1 ]; then
-      # has the cpp keys file been changed since we copied the arch file in ${COMPIL_DIR}?
-      mycpp=$( ls -l ${COMPIL_DIR}/$2 | sed -e "s/.* -> //" )
-      if [ "$mycpp" != "$( cat ${COMPIL_DIR}/cpp.history )" ]; then
-          echo $mycpp > ${COMPIL_DIR}/cpp.history
-          cpeval ${myarch} ${COMPIL_DIR}/$1
+      if [ "$2" != "nocpp" ] 
+      then
+          # has the cpp keys file been changed since we copied the arch file in ${COMPIL_DIR}?
+          mycpp=$( ls -l ${COMPIL_DIR}/$2 | sed -e "s/.* -> //" )
+          if [ "$mycpp" != "$( cat ${COMPIL_DIR}/cpp.history )" ]; then
+         echo $mycpp > ${COMPIL_DIR}/cpp.history
+         cpeval ${myarch} ${COMPIL_DIR}/$1
+          fi
+          # has the cpp keys file been updated since we copied the arch file in ${COMPIL_DIR}?
+          mycpp=$( find -L ${COMPIL_DIR} -cnewer ${COMPIL_DIR}/$1 -name $2 -print )
+          [ ${#mycpp} -ne 0 ] && cpeval ${myarch} ${COMPIL_DIR}/$1
       fi
-      # has the cpp keys file been updated since we copied the arch file in ${COMPIL_DIR}?
-      mycpp=$( find -L ${COMPIL_DIR} -cnewer ${COMPIL_DIR}/$1 -name $2 -print )
-      [ ${#mycpp} -ne 0 ] && cpeval ${myarch} ${COMPIL_DIR}/$1
       # has myarch file been updated since we copied it in ${COMPIL_DIR}?
       myarchdir=$( dirname ${myarch} )
@@ -134 +137 @@
     if [ "$myarch" == "$( cat ${COMPIL_DIR}/arch.history )" ]; then 
    if [ -f ${COMPIL_DIR}/$1 ]; then
-       # has the cpp keys file been changed since we copied the arch file in ${COMPIL_DIR}?
-       mycpp=$( ls -l ${COMPIL_DIR}/$2 | sed -e "s/.* -> //" )
-       if [ "$mycpp" != "$( cat ${COMPIL_DIR}/cpp.history )" ]; then
-      echo $mycpp > ${COMPIL_DIR}/cpp.history
-      cpeval ${myarch} ${COMPIL_DIR}/$1
+       if [ "$2" != "nocpp" ] 
+       then
+      # has the cpp keys file been changed since we copied the arch file in ${COMPIL_DIR}?
+      mycpp=$( ls -l ${COMPIL_DIR}/$2 | sed -e "s/.* -> //" )
+      if [ "$mycpp" != "$( cat ${COMPIL_DIR}/cpp.history )" ]; then
+          echo $mycpp > ${COMPIL_DIR}/cpp.history
+          cpeval ${myarch} ${COMPIL_DIR}/$1
+      fi
+      # has the cpp keys file been updated since we copied the arch file in ${COMPIL_DIR}?
+      mycpp=$( find -L ${COMPIL_DIR} -cnewer ${COMPIL_DIR}/$1 -name $2 -print )
+      [ ${#mycpp} -ne 0 ] && cpeval ${myarch} ${COMPIL_DIR}/$1
        fi
-       # has the cpp keys file been updated since we copied the arch file in ${COMPIL_DIR}?
-       mycpp=$( find -L ${COMPIL_DIR} -cnewer ${COMPIL_DIR}/$1 -name $2 -print )
-       [ ${#mycpp} -ne 0 ] && cpeval ${myarch} ${COMPIL_DIR}/$1
        # has myarch file been updated since we copied it in ${COMPIL_DIR}?
        myarch=$( find -L ${MAIN_DIR}/ARCH -cnewer ${COMPIL_DIR}/$1 -name arch-${3}.fcm -print )
@@ -150 +156 @@
    fi
     else
-   ls -l ${COMPIL_DIR}/$2 | sed -e "s/.* -> //" > ${COMPIL_DIR}/cpp.history
+   if [ "$2" != "nocpp" ] 
+   then
+       ls -l ${COMPIL_DIR}/$2 | sed -e "s/.* -> //" > ${COMPIL_DIR}/cpp.history
+   fi
    echo ${myarch} > ${COMPIL_DIR}/arch.history
    cpeval ${myarch} ${COMPIL_DIR}/$1
@@ -157 +166 @@
 
 #- do we need xios library?
-use_iom=$( sed -e "s/#.*$//" ${COMPIL_DIR}/$2 | grep -c key_iomput )
+if [ "$2" != "nocpp" ] 
+then
+    use_iom=$( sed -e "s/#.*$//" ${COMPIL_DIR}/$2 | grep -c key_iomput )
+else
+    use_iom=0
+fi
 have_lxios=$( sed -e "s/#.*$//" ${COMPIL_DIR}/$1 | grep -c "\-lxios" )
 if [[ ( $use_iom -eq 0 ) && ( $have_lxios -ge 1 ) ]]
@@ -166 +180 @@
 
 #- do we need oasis libraries?
-use_oasis=$( sed -e "s/#.*$//" ${COMPIL_DIR}/$2 | grep -c key_oasis3 )
+if [ "$2" != "nocpp" ] 
+then
+    use_oasis=$( sed -e "s/#.*$//" ${COMPIL_DIR}/$2 | grep -c key_oasis3 )
+else
+    use_oasis=0
+fi
 for liboa in psmile.MPI1 mct mpeu scrip mpp_io
 do

branches/2013/dev_r3987_UKMO4_OBS/NEMOGCM/TOOLS/maketools

@@ -146 +146 @@
 
 #- When used for the first time, choose a compiler ---
-. ${COMPIL_DIR}/Fcheck_archfile.sh arch_tools.fcm ${CMP_NAM} || exit
+. ${COMPIL_DIR}/Fcheck_archfile.sh arch_tools.fcm nocpp ${CMP_NAM} || exit
 
 #- Choose a default tool if needed ---