--- MITgcm/tools/genmake2 2004/07/20 19:43:45 1.88 +++ MITgcm/tools/genmake2 2004/09/07 21:28:47 1.98 @@ -1,6 +1,6 @@ #! /usr/bin/env bash # -# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.88 2004/07/20 19:43:45 edhill Exp $ +# $Header: /home/ubuntu/mnt/e9_copy/MITgcm/tools/genmake2,v 1.98 2004/09/07 21:28:47 edhill Exp $ # # Makefile generator for MITgcm UV codes # created by cnh 03/98 @@ -195,30 +195,48 @@ echo " a system-default makedepend was not found." # Try to build the cyrus implementation - rm -f ./genmake_cy_md - ( - cd $ROOTDIR/tools/cyrus-imapd-makedepend \ - && ./configure > /dev/null 2>&1 \ - && make > /dev/null 2>&1 - if test -x ./makedepend.exe ; then - $LN ./makedepend.exe ./makedepend - fi - ./makedepend ifparser.c > /dev/null 2>&1 \ - && echo "true" - ) > ./genmake_cy_md - grep true ./genmake_cy_md > /dev/null 2>&1 + build_cyrus_makedepend RETVAL=$? - if test "x$RETVAL" = x0 ; then - MAKEDEPEND='$(TOOLSDIR)/cyrus-imapd-makedepend/makedepend' - else + if test "x$RETVAL" != x0 ; then MAKEDEPEND='$(TOOLSDIR)/xmakedepend' fi rm -f ./genmake_cy_md fi + else + # echo "MAKEDEPEND=${MAKEDEPEND}" + echo "${MAKEDEPEND}" | grep -i cyrus > /dev/null 2>&1 + RETVAL=$? + if test x"$RETVAL" = x0 ; then + build_cyrus_makedepend + fi fi } +build_cyrus_makedepend() { + rm -f ./genmake_cy_md + ( + cd $ROOTDIR/tools/cyrus-imapd-makedepend \ + && ./configure > /dev/null 2>&1 \ + && make > /dev/null 2>&1 + if test -x ./makedepend.exe ; then + $LN ./makedepend.exe ./makedepend + fi + ./makedepend ifparser.c > /dev/null 2>&1 \ + && echo "true" + ) > ./genmake_cy_md + grep true ./genmake_cy_md > /dev/null 2>&1 + RETVAL=$? + rm -f ./genmake_cy_md + if test "x$RETVAL" = x0 ; then + MAKEDEPEND='$(TOOLSDIR)/cyrus-imapd-makedepend/makedepend' + return 0 + else + echo "WARNING: unable to build cyrus-imapd-makedepend" + return 1 + fi +} + # Guess possible config options for this host find_possible_configs() { @@ -251,7 +269,47 @@ look_for_makedepend - # look for possible fortran compilers + #================================================================ + # look for possible C compilers + tmp="$MITGCM_CC $CC gcc c89 cc c99 mpicc" + p_CC= + for c in $tmp ; do + rm -f ./genmake_hello.c ./genmake_hello + cat >> genmake_hello.c << EOF +#include +int main(int argc, char **argv) { + printf("Hello!\n"); + return 0; +} +EOF + $c -o genmake_hello genmake_hello.c > /dev/null 2>&1 + RETVAL=$? + if test "x${RETVAL}" = x0 ; then + p_CC="$p_CC $c" + fi + done + rm -f ./genmake_hello.c ./genmake_hello + if test "x${p_CC}" = x ; then + cat 1>&2 < genmake_test.c </dev/null | grep 'T ' | grep tcall | cut -d ' ' -f 3` RETVAL=$? if test "x$RETVAL" != x0 ; then FC_NAMEMANGLE=$default_nm @@ -530,7 +599,7 @@ EOF return 1 fi - f_tcall=`nm genmake_tcomp.o | grep 'T ' | grep tcall | cut -d ' ' -f 3` + f_tcall=`nm genmake_tcomp.o 2>/dev/null | grep 'T ' | grep tcall | cut -d ' ' -f 3` RETVAL=$? if test "x$RETVAL" != x0 ; then FC_NAMEMANGLE=$default_nm @@ -607,6 +676,7 @@ check_netcdf_libs() { + echo "" > genmake_tnc.log cat < genmake_tnc.for program fgennc #include "netcdf.inc" @@ -619,8 +689,12 @@ IF (iret .NE. NF_NOERR) write(*,*) NF_STRERROR(iret) end EOF - $CPP genmake_tnc.for > genmake_tnc.f \ - && $FC $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.f $LIBS >> genmake_tnc.log 2>&1 + #echo "$CPP $DEFINES $INCLUDES genmake_tnc.for > genmake_tnc.f" + #echo "$FC $FFLAGS $FOPTIM -c genmake_tnc.f" + #echo "$LINK -o genmake_tnc.o $LIBS" + $CPP $DEFINES $INCLUDES genmake_tnc.for > genmake_tnc.f 2>/dev/null \ + && $FC $FFLAGS $FOPTIM -c genmake_tnc.f \ + && $LINK -o genmake_tnc genmake_tnc.o $LIBS >> genmake_tnc.log 2>&1 RET_COMPILE=$? test -x ./genmake_tnc && ./genmake_tnc >> genmake_tnc.log 2>&1 RETVAL=$? @@ -628,7 +702,7 @@ HAVE_NETCDF=t else # try again with "-lnetcdf" added to the libs - $CPP genmake_tnc.for > genmake_tnc.f \ + $CPP $DEFINES $INCLUDES genmake_tnc.for > genmake_tnc.f 2>/dev/null \ && $FC $FFLAGS $FOPTIM -o genmake_tnc genmake_tnc.f \ $LIBS -lnetcdf >> genmake_tnc_2.log 2>&1 RET_COMPILE=$? @@ -658,6 +732,7 @@ S64= KPP= FC= +#CC=gcc CPP= LINK= DEFINES= @@ -665,7 +740,7 @@ ENABLE= DISABLE= MAKEFILE= -MAKEDEPEND= +#MAKEDEPEND= PDEPEND= DUMPSTATE=t PDEFAULT= @@ -703,9 +778,11 @@ PWD=`pwd` MAKE=make AWK=awk -THISHOSTNAME=`hostname` +THISHOST=`hostname` THISCWD=`pwd` THISDATE=`date` +THISUSER=`echo $USER` +THISVER= MACHINE=`uname -a` EXECUTABLE= EXEHOOK= @@ -739,7 +816,7 @@ # The following state is not directly set by command-line switches gm_s3="LN S64 KPP LINK PACKAGES MAKEDEPEND PDEPEND PDEFAULT INCLUDES FFLAGS FOPTIM " gm_s4="CFLAGS KFLAGS1 KFLAGS2 LIBS KPPFILES NOOPTFILES NOOPTFLAGS" -gm_s5="TOOLSDIR SOURCEDIRS INCLUDEDIRS PWD MAKE THISHOSTNAME THISDATE MACHINE" +gm_s5="TOOLSDIR SOURCEDIRS INCLUDEDIRS PWD MAKE THISHOST THISUSER THISDATE THISVER MACHINE" gm_s6="EXECUTABLE EXEHOOK EXEDIR PACKAGES_CONF" gm_s7="HAVE_SYSTEM HAVE_FDATE FC_NAMEMANGLE HAVE_ETIME" @@ -888,7 +965,12 @@ # ac_prev=cpp ;; # -cpp=* | --cpp=*) # CPP=$ac_optarg ;; - + + -cc | --cc) + ac_prev=CC ;; + -cc=* | --cc=*) + CC=$ac_optarg ;; + -fortran | --fortran | -fc | --fc) ac_prev=FC ;; -fc=* | --fc=*) @@ -959,6 +1041,7 @@ echo fi +# Find the MITgcm ${ROOTDIR} if test "x${ROOTDIR}" = x ; then tmp=`echo $PWD | sed -e 's/\// /g' | awk '{print $NR}'` if test "x$tmp" = "xbin" -a -d ../model -a -d ../eesup -a -d ../pkg ; then @@ -985,6 +1068,11 @@ exit 1 fi +# Find the MITgcm ${THISVER} +if test -f "${ROOTDIR}/doc/tag-index" ; then + THISVER=`grep checkpoint ${ROOTDIR}/doc/tag-index | head -1` +fi + echo " getting OPTFILE information: " if test "x${OPTFILE}" = x ; then if test "x$MITGCM_OF" = x ; then @@ -1044,7 +1132,7 @@ fi fi -# Check that FC, LINK, CPP, S64, LN, and MAKE are defined. If not, +# Check that FC, CC, LINK, CPP, S64, LN, and MAKE are defined. If not, # either set defaults or complain and abort! if test ! "x$BASH" = x ; then # add a trailing space so that it works within the Makefile syntax (see below) @@ -1060,6 +1148,16 @@ EOF exit 1 fi +if test "x$CC" = x ; then + CC=cc +# cat <&2 +# Error: no C compiler: please specify using one of the following: +# 1) within the options file ("CC=...") as specified by "-of=OPTFILE" +# 2) the "-cc=XXX" command-line option +# 3) the "./genmake_local" file +# EOF +# exit 1 +fi if test "x$LINK" = x ; then LINK=$FC fi @@ -1645,6 +1743,8 @@ ;; ./FC_NAMEMANGLE.h) ;; + ./BUILD_INFO.h) + ;; *) touch .links.tmp/$sf deplist="$deplist $sf" @@ -1701,7 +1801,7 @@ echo "# by the command:" >> $MAKEFILE echo "# $0 $G2ARGS" >> $MAKEFILE echo "# executed by:" >> $MAKEFILE -echo "# $USER@${THISHOSTNAME}:${THISCWD}" >> $MAKEFILE +echo "# ${THISUSER}@${THISHOST}:${THISCWD}" >> $MAKEFILE EXE_AD=$EXECUTABLE"_ad" EXE_FTL=$EXECUTABLE"_ftl" @@ -1747,7 +1847,7 @@ DISABLED_PACKAGES = ${DISABLED_PACKAGES} # These files are created by Makefile -SPECIAL_FILES = ${PACKAGES_DOT_H} AD_CONFIG.h FC_NAMEMANGLE.h +SPECIAL_FILES = ${PACKAGES_DOT_H} AD_CONFIG.h FC_NAMEMANGLE.h BUILD_INFO.h EOF @@ -1766,6 +1866,8 @@ FC = ${FC} # Fortran compiler F90C = ${F90C} +# C compiler +CC = ${CC} # Link editor LINK = ${LINK} ${LDADD} @@ -1849,7 +1951,7 @@ cleanlinks: -find . -type l -exec rm {} \; -# Special targets ($SPECIAL_FILES) which are create by make +# Special targets (SPECIAL_FILES) which are create by make ${PACKAGES_DOT_H}: @echo Creating \$@ ... @$BASH\$(TOOLSDIR)/convert_cpp_cmd2defines "Warning - this file is automatically generated - do NOT edit" -bPACKAGES_CONFIG_H "Disabled packages:" \$(DISABLED_PACKAGES) " " "Enabled packages:" \$(ENABLED_PACKAGES) > \$@ @@ -1860,6 +1962,17 @@ @echo Creating \$@ ... echo "$FC_NAMEMANGLE" > \$@ +BUILD_INFO.h: + @echo Creating \$@ ... +EOF + +test ! "x$THISVER" = x && echo " -echo \"#define THISVER '$THISVER'\" > \$@" >> $MAKEFILE +test ! "x$THISUSER" = x && echo " -echo \"#define THISUSER '$THISUSER'\" >> \$@" >> $MAKEFILE +test ! "x$THISDATE" = x && echo " -echo \"#define THISDATE '$THISDATE'\" >> \$@" >> $MAKEFILE +test ! "x$THISHOST" = x && echo " -echo \"#define THISHOST '$THISHOST'\" >> \$@" >> $MAKEFILE + +cat >>$MAKEFILE <