Changeset 13057

Timestamp:

2020-06-07T19:57:15+02:00 (3 years ago)

Author:

rblod

Message:

ticket #2129 : End of tools compilation with key_agrif

Location:

utils

Files:

• build/makenemo (modified) (1 diff)
• build/mk/Fprep_agrif.sh (modified) (1 diff)
• build/mk/conv.cfg (modified) (1 diff)
• tools/maketools (modified) (2 diffs)

utils/build/makenemo

@@ -352 +352 @@
 #- We look after agrif
 grep key_agrif ${COMPIL_DIR}/cpp.fcm && export AGRIFUSE=1 && export USEBLD=${USEBLD/xag/}
-. ${COMPIL_DIR}/Fprep_agrif.sh ${NEW_CONF} ${NEMO_TDIR} || exit 3
+. ${COMPIL_DIR}/Fprep_agrif.sh ${NEW_CONF} ${NEMO_TDIR} arch_nemo.fcm || exit 3
 
 #-

utils/build/mk/Fprep_agrif.sh

@@ -65 +65 @@
 
  #- CONV
+export MYARCH=$3
 fcm build ${COMPIL_DIR}/conv.cfg || exit 1
 #C_COMPILER=${CC-cc}

utils/build/mk/conv.cfg

@@ -8 +8 @@
 # Build information
 # ------------------------------------------------------------------------------
-inc $COMPIL_DIR/arch_nemo.fcm
+inc $COMPIL_DIR/$MYARCH
 
 bld::tool::cc        %CC

utils/tools/maketools

@@ -159 +159 @@
 . ${COMPIL_DIR}/Fcheck_archfile.sh arch_tools.fcm cpp_tools.fcm ${CMP_NAM} || exit
 
+#- At this stage the configuration has beeen chosen
+#- We coose the default light file
+export USEBLD=bldxag_tools.cfg
+
+#- We look after agrif
+grep key_agrif ${COMPIL_DIR}/cpp_tools.fcm && export AGRIFUSE=1 && export USEBLD=${USEBLD/xag/}
+
+. ${COMPIL_DIR}/Fprep_agrif.sh ${NEW_CONF} ${TOOLS_DIR} || exit 3
+
+
 #-
 #_ END OF CONFIGURATION PHASE
@@ -167 +177 @@
 
 if [ "${NBR_PRC}" -gt 0 ]; then
-cd ${NEMO_TDIR}/${NEW_CONF} || cd -
-
-fcm build ${x_c} --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/bld_tools.cfg || cd -
-if [ -n "$(ls ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/*.exe)" ]; then
-for i in `ls ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/*.exe`
-   do
-      ln -sf ${i}  ${TOOLS_DIR}/${NEW_CONF}/.
-   done
-fi
+cd ${TOOLS_DIR}/${NEW_CONF} || cd -
+
+   ## if AGRIF we do a first preprocessing
+   if [[ ${#x_c} -eq 0 && "$AGRIFUSE" -eq 1 ]]; then
+      fcm build --ignore-lock -j 1 ${COMPIL_DIR}/bld_preproagr_tools.cfg ||{ cd - ; exit 1 ;}
+      echo ''
+      echo "---------------------------------"
+      echo "CONV preprocessing successfull !!"
+      echo "---------------------------------"
+      echo ''
+   fi
+
+   fcm build ${x_c} --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/${USEBLD} || cd -
+   if [ -n "$(ls ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/*.exe)" ]; then
+      for i in `ls ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/*.exe`
+      do
+         ln -sf ${i}  ${TOOLS_DIR}/${NEW_CONF}/.
+      done
+   fi
 fi
 #-