Changeset 14947
- Timestamp:
- 2021-06-04T16:09:44+02:00 (3 years ago)
- Location:
- utils/build
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
utils/build/makenemo
r14198 r14947 277 277 278 278 export NEMO_TDIR=${x_t:-$CONFIG_DIR} 279 export $NEM_SUBDIR $NEW_CONF 279 280 280 281 ## Save new configuration with sub-components set in work_cfgs.txt … … 300 301 #- Clean links and librairies --- 301 302 #- Creating the good links, at first on OCE --- 302 . ${COMPIL_DIR}/Fmake_WORK.sh ${x_e } ${NEW_CONF} ${NEM_SUBDIR} || exit 3303 . ${COMPIL_DIR}/Fmake_WORK.sh ${x_e[@]} || exit 3 303 304 304 305 . ${COMPIL_DIR}/Fmake_bld.sh ${CONFIG_DIR} ${NEW_CONF} ${NEMO_TDIR} || exit 3 -
utils/build/mk/Fmake_WORK.sh
r14228 r14947 64 64 # 65 65 #- 66 declare ZSRC=$ 1 ; shift67 declare ZCONF=$1 ; shift 68 ZTAB= ( $@ )66 declare ZSRC=${@} 67 ZCONF=${NEW_CONF} 68 ZTAB=${NEM_SUBDIR[@]} 69 69 declare i=0 ; declare NDIR=${#ZTAB[@]} 70 70 … … 74 74 [ -d ${ZCONF}/WORK ] || \mkdir ${ZCONF}/WORK 75 75 76 if [ "${ZSRC}" != 'none' ] ; then77 78 if [ -d ${ZSRC} ] ; then79 ln -sf ${ZSRC}/*.[Ffh]90 ${ZCONF}/MY_SRC/.80 echo 'MY_SRC content is linked to '${ZSRC}81 else82 echo 'External directory for MY_SRC does not exist. Using default.'83 fi84 85 else86 echo 'MY_SRC directory is : '${ZCONF}'/MY_SRC'87 fi88 89 #\rm -f ../${1}/WORK/*90 91 76 for comp in ${ZTAB[*]}; do 92 77 find ${NEMO_DIR}/$comp -name *.[Ffh]90 -exec ln -sf {} ${ZCONF}/WORK \; 93 78 done 94 79 95 for i in `(find ${ZCONF}/MY_SRC -name *.[Ffh]90 2>/dev/null ) `; do 96 [ -f $i ] && ln -sf $PWD/${i} ${ZCONF}/WORK/. 80 for ZDIR in ${ZSRC[@]}; do 81 if [ -d ${ZDIR} ] ; then 82 ln -sf ${ZDIR}/*.[Ffh]90 ${ZCONF}/WORK/. 83 echo ${ZDIR}' content is linked to '${ZCONF}/WORK 84 elif [ -d ${ZCONF}/${ZDIR} ] ; then 85 ln -rsf ${ZCONF}/${ZDIR}/*.[Ffh]90 ${ZCONF}/WORK/. 86 echo ${ZDIR}' content is linked to '${ZCONF}/WORK 87 else 88 ln -rsf ${ZCONF}/MY_SRC/*.[Ffh]90 ${ZCONF}/WORK/. 89 echo 'External directory for MY_SRC does not exist. Using default.' 90 echo 'MY_SRC content is linked to '${ZCONF}/WORK 91 fi 97 92 done 98 93
Note: See TracChangeset
for help on using the changeset viewer.