Changeset 12415


Ignore:
Timestamp:
2020-02-19T21:29:26+01:00 (10 months ago)
Author:
smueller
Message:

Reintegration of 2019 development branch /utils/build_MERGE_2019 into the build directory (/utils/build)

Location:
utils/build
Files:
2 deleted
2 edited
1 copied

Legend:

Unmodified
Added
Removed
  • utils/build/maketools

    r11926 r12415  
    145145[ "${CMP_NAM}" ==  help ] && . ${COMPIL_DIR}/Flist_archfile.sh all && exit 
    146146 
    147 #- When used for the first time, choose a compiler --- 
    148 . ${COMPIL_DIR}/Fcheck_archfile.sh arch_tools.fcm cpp.fcm ${CMP_NAM} || exit 
    149  
    150147#- Choose a default tool if needed --- 
    151148#- REBUILD or last one used --- 
     
    156153 
    157154#- Make the building directory 
    158 . ${COMPIL_DIR}/Fmake_bld.sh ${TOOLS_DIR} ${NEW_CONF} ${NEMO_TDIR} || exit 
     155. ${COMPIL_DIR}/Fmake_tools_bld.sh ${TOOLS_DIR} ${NEW_CONF} ${NEMO_TDIR} || exit 
     156 
     157#- At this stage cpp keys have been updated. we can check the arch file 
     158#- When used for the first time, choose a compiler --- 
     159. ${COMPIL_DIR}/Fcheck_archfile.sh arch_tools.fcm cpp_tools.fcm ${CMP_NAM} || exit 
    159160 
    160161#- 
  • utils/build/mk/bld_tools.cfg

    r10620 r12415  
    99 
    1010inc $COMPIL_DIR/arch_tools.fcm 
     11inc $COMPIL_DIR/cpp_tools.fcm 
    1112 
    1213search_src           1 
    1314 
    14 src::nemo                 $TOOLS_DIR/$NEW_CONF/src 
     15src::nemo            $TOOLS_DIR/$NEW_CONF/src 
    1516 
    16 dir::root            $NEMO_TDIR/$NEW_CONF/BLD 
     17dir::root            $TOOLS_DIR/$NEW_CONF/BLD 
    1718 
    1819bld::tool::cpp       %CPP 
     
    2526bld::tool::arflags   %ARFLAGS 
    2627bld::tool::make      %MK 
     28 
     29# Pre-process code before analysing dependencies 
     30bld::pp::nemo     1 
     31bld::tool::fppflags::nemo      %FPPFLAGS -I$TOOLS_DIR/$NEW_CONF/NEMOFILES/inc 
    2732 
    2833# Ignore the following dependencies 
     
    4146# Allow ".h90" as an extension for CPP include files 
    4247bld::infile_ext::h90  CPP::INCLUDE 
     48bld::infile_ext::f90  FPP::FPP9X::SOURCE 
    4349 
    4450# extension for module output 
    4551bld::outfile_ext::mod .mod 
    46  
    47 # rename executable to nemo.exe 
    48 bld::exe_name::model  nemo.exe 
Note: See TracChangeset for help on using the changeset viewer.