Changeset 13057


Ignore:
Timestamp:
2020-06-07T19:57:15+02:00 (14 months ago)
Author:
rblod
Message:

ticket #2129 : End of tools compilation with key_agrif

Location:
utils
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • utils/build/makenemo

    r12415 r13057  
    352352#- We look after agrif 
    353353grep key_agrif ${COMPIL_DIR}/cpp.fcm && export AGRIFUSE=1 && export USEBLD=${USEBLD/xag/} 
    354 . ${COMPIL_DIR}/Fprep_agrif.sh ${NEW_CONF} ${NEMO_TDIR} || exit 3 
     354. ${COMPIL_DIR}/Fprep_agrif.sh ${NEW_CONF} ${NEMO_TDIR} arch_nemo.fcm || exit 3 
    355355 
    356356#- 
  • utils/build/mk/Fprep_agrif.sh

    r9598 r13057  
    6565 
    6666 #- CONV 
     67export MYARCH=$3 
    6768fcm build ${COMPIL_DIR}/conv.cfg || exit 1 
    6869#C_COMPILER=${CC-cc} 
  • utils/build/mk/conv.cfg

    r9598 r13057  
    88# Build information 
    99# ------------------------------------------------------------------------------ 
    10 inc $COMPIL_DIR/arch_nemo.fcm 
     10inc $COMPIL_DIR/$MYARCH 
    1111 
    1212bld::tool::cc        %CC 
  • utils/tools/maketools

    r12681 r13057  
    159159. ${COMPIL_DIR}/Fcheck_archfile.sh arch_tools.fcm cpp_tools.fcm ${CMP_NAM} || exit 
    160160 
     161#- At this stage the configuration has beeen chosen 
     162#- We coose the default light file 
     163export USEBLD=bldxag_tools.cfg 
     164 
     165#- We look after agrif 
     166grep key_agrif ${COMPIL_DIR}/cpp_tools.fcm && export AGRIFUSE=1 && export USEBLD=${USEBLD/xag/} 
     167 
     168. ${COMPIL_DIR}/Fprep_agrif.sh ${NEW_CONF} ${TOOLS_DIR} || exit 3 
     169 
     170 
    161171#- 
    162172#_ END OF CONFIGURATION PHASE 
     
    167177 
    168178if [ "${NBR_PRC}" -gt 0 ]; then 
    169 cd ${NEMO_TDIR}/${NEW_CONF} || cd - 
    170  
    171 fcm build ${x_c} --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/bld_tools.cfg || cd - 
    172 if [ -n "$(ls ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/*.exe)" ]; then 
    173 for i in `ls ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/*.exe` 
    174    do 
    175       ln -sf ${i}  ${TOOLS_DIR}/${NEW_CONF}/. 
    176    done 
    177 fi 
     179cd ${TOOLS_DIR}/${NEW_CONF} || cd - 
     180 
     181   ## if AGRIF we do a first preprocessing 
     182   if [[ ${#x_c} -eq 0 && "$AGRIFUSE" -eq 1 ]]; then 
     183      fcm build --ignore-lock -j 1 ${COMPIL_DIR}/bld_preproagr_tools.cfg ||{ cd - ; exit 1 ;} 
     184      echo '' 
     185      echo "---------------------------------" 
     186      echo "CONV preprocessing successfull !!" 
     187      echo "---------------------------------" 
     188      echo '' 
     189   fi 
     190 
     191   fcm build ${x_c} --ignore-lock -v 1 -j ${NBR_PRC} ${COMPIL_DIR}/${USEBLD} || cd - 
     192   if [ -n "$(ls ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/*.exe)" ]; then 
     193      for i in `ls ${NEMO_TDIR}/${NEW_CONF}/BLD/bin/*.exe` 
     194      do 
     195         ln -sf ${i}  ${TOOLS_DIR}/${NEW_CONF}/. 
     196      done 
     197   fi 
    178198fi 
    179199#- 
Note: See TracChangeset for help on using the changeset viewer.