Changeset 13055 for utils/build

Timestamp:

2020-06-07T12:44:20+02:00 (4 years ago)

Author:

rblod

Message:

ticket #2129 : capability to compile tools (domaincfg) with key_agrif

Location:

utils/build/mk

Files:

• agrifpp.sh (modified) (1 diff)
• bld_preproagr.cfg (modified) (1 diff)
• bld_preproagr_tools.cfg (added)
• bld_tools.cfg (modified) (3 diffs)
• bldxag_tools.cfg (added)

utils/build/mk/agrifpp.sh

@@ -55 +55 @@
 #
 #-
-MYFILE=$(basename "$1")
+MYDIR=$1
+MYFILE=$(basename "$2")
 if [ "$MYFILE" == "agrif2model.f90" ];then
-   \cp ${NEMO_TDIR}/${NEW_CONF}/WORK/${MYFILE/.f90/.F90} ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES/obj/$MYFILE
+   if [ -d ${MYDIR}/${NEW_CONF}/WORK ]; then
+      \cp ${MYDIR}/${NEW_CONF}/WORK/${MYFILE/.f90/.F90} ${MYDIR}/${NEW_CONF}/NEMOFILES/obj/$MYFILE
+   else
+      \cp ${MYDIR}/${NEW_CONF}/src/${MYFILE/.f90/.F90} ${MYDIR}/${NEW_CONF}/NEMOFILES/obj/$MYFILE
+   fi   
 else
-cd ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES/ppsrc/nemo ; ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES/conv ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES/agrif_oce.in -rm -incdir ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES/inc -comdirout ${NEMO_TDIR}/${NEW_CONF}/NEMOFILES/obj -convfile ${MYFILE} > /dev/null 
+cd ${MYDIR}/${NEW_CONF}/NEMOFILES/ppsrc/nemo ; ${MYDIR}/${NEW_CONF}/NEMOFILES/conv ${MYDIR}/${NEW_CONF}/NEMOFILES/agrif_oce.in -rm -incdir ${MYDIR}/${NEW_CONF}/NEMOFILES/inc -comdirout ${MYDIR}/${NEW_CONF}/NEMOFILES/obj -convfile ${MYFILE} > /dev/null 
 fi

utils/build/mk/bld_preproagr.cfg

@@ -21 +21 @@
 bld::tool::fc_compile
 bld::tool::fc_include
-bld::tool::fc        $COMPIL_DIR/agrifpp.sh 
+bld::tool::fc        $COMPIL_DIR/agrifpp.sh ${NEMO_TDIR}
 bld::tool::fflags    
 bld::tool::ld       

utils/build/mk/bld_tools.cfg

@@ -13 +13 @@
 search_src           1
 
-src::nemo            $TOOLS_DIR/$NEW_CONF/src
+src::agrif           $MAIN_DIR/ext/AGRIF/AGRIF_FILES
+src::nemo            $TOOLS_DIR/$NEW_CONF/NEMOFILES/obj
+
+
+bld::target  make_domain_cfg.exe
+bld::exe_dep
+
 
 dir::root            $TOOLS_DIR/$NEW_CONF/BLD
+
 
 bld::tool::cpp       %CPP
@@ -29 +36 @@
 # Pre-process code before analysing dependencies
 bld::pp::nemo     1
+bld::pp::agrif    1
 bld::tool::fppflags::nemo      %FPPFLAGS -I$TOOLS_DIR/$NEW_CONF/NEMOFILES/inc
+bld::tool::fppflags::agrif     %FPPFLAGS -include ${MAIN_DIR}/ext/AGRIF/nemo_mpi.h
+
+
+
 
 # Ignore the following dependencies
@@ -41 +53 @@
 bld::excl_dep        use::mod_oasis
 
+
+
 # Don't generate interface files
 bld::tool::geninterface none