/[MITgcm]/MITgcm/tools/genmake2

Diff of /MITgcm/tools/genmake2

Parent Directory | Revision Log | View Revision Graph Revision Graph | View Patch Patch

-revision 1.1 by edhill,
Sat Aug 16 14:01:08 2003 UTC
+revision 1.11.2.2 by edhill,
Wed Oct  1 19:33:01 2003 UTC
 Line 8
  #   modified by aja 01/00
  #   rewritten in bash by eh3 08/03
+ # Search for particular CPP #cmds associated with packages
+ # usage: test_for_package_in_cpp_options CPP_file package_name
+ test_for_package_in_cpp_options() {
+     cpp_options=$1
+     pkg=$2
+     grep -i "#define.*ALLOW_$pkg" $cpp_options > /dev/null 2>&1
+     RETVAL=$?
+     if test "x${RETVAL}" = x0 ; then
+         echo "Error: In $cpp_options there is an illegal line: #define ALLOW_$pkg"
+         exit 99
+     fi
+     grep -i "#undef.*ALLOW_$pkg" $cpp_options > /dev/null 2>&1
+     RETVAL=$?
+     if test "x${RETVAL}" = x0 ; then
+         echo "Error: In $cpp_options there is an illegal line: #undef ALLOW_$pkg"
+         exit 99
+     fi
+     grep -i "#define.*DISABLE_$pkg" $cpp_options > /dev/null 2>&1
+     RETVAL=$?
+     if test "x${RETVAL}" = x0 ; then
+         echo "Error: In $cpp_options there is an illegal line: #define DISABLE_$pkg"
+         exit 99
+     fi
+     grep -i "#undef.*DISABLE_$pkg" $cpp_options > /dev/null 2>&1
+     RETVAL=$?
+     if test "x${RETVAL}" = x0 ; then
+         echo "Error: In $cpp_options there is an illegal line: #undef DISABLE_$pkg"
+         exit 99
+    fi
+ }
  # Guess possible config options for this host
  find_possible_configs()  {
-     p_PLATFORM=`uname`"-"`uname -m`
+     tmp1=`uname`"_"`uname -m`
-     echo "The platform appears to be:"
+     tmp2=`echo $tmp1 | sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
-     echo "  "$p_PLATFORM
+     PLATFORM=`echo $tmp2 | sed -e 's/i[3-6]86/ia32/'`
+     OFLIST=`(cd $ROOTDIR/tools/build_options; ls | grep "^$PLATFORM")`
-     p_LN=
+     echo "  The platform appears to be:  $PLATFORM"
+ #     if test "x$OFLIST" = x ; then
+ #       echo "  No pre-defined options files were found matching this platform"
+ #       echo "  but examples for other platforms can be found in:"
+ #       echo "    $ROOTDIR/tools/build_options"
+ #     else
+ #       echo "  Options files (located in $ROOTDIR/tools/build_options) that"
+ #       echo "  may work with this machine are:"
+ #       for i in $OFLIST ; do
+ #           echo "    $i"
+ #       done
+ #     fi
      echo "test" > test
      ln -s ./test link
      RETVAL=$?
      if test "x${RETVAL}" = x0 ; then
-         p_LN="ln -s"
+         LN="ln -s"
+     else
+         echo "Error: \"ln -s\" does not appear to work on this system!"
+         echo "  For help, please contact <MITgcm-support@mitgcm.org>."
+         exit 1
      fi
      rm -f test link
-     p_CPP=`which cpp`
+     if test "x$CPP" = x ; then
+         CPP="cpp -traditional -P"
-     RETVAL=$?
-     if test "x${RETVAL}" = x0 ; then
-         p_LN="ln -s"
      fi
-     rm -f test link
      # look for possible fortran compilers
+     tmp="$MITGCM_FC $FC g77 f77 pgf77 pgf95 ifc f90 f95 mpif77 mpf77 mpxlf95"
      p_FC=
-     for c in f77 g77 pgf77 pgf95 ifc f90 f95 mpif77 mpf77 mpxlf95 ; do
+     for c in $tmp ; do
-         which $c > /dev/null 2>&1
+         rm -f ./hello.f ./hello
+         cat >> hello.f <<EOF
+       program hello
+       do i=1,3
+         print *, 'hello world : ', i
+       enddo
+       end
+ EOF
+         $c -o hello hello.f > /dev/null 2>&1
          RETVAL=$?
          if test "x${RETVAL}" = x0 ; then
              p_FC="$p_FC $c"
          fi
      done
-     echo "Possible FORTRAN compilers appear to be:  "
      if test "x${p_FC}" = x ; then
-         echo "  None found!!!"
+         cat 1>&2 <<EOF
-     else
-         echo "  "$p_FC
+ Error: No Fortran compilers were found in your path.  Please specify one using:
-     fi
+) an "optfile" on (eg. "-optfile=path/to/OPTFILE"),
+) a command-line option (eg. "-fc NAME"), or
+) the MITGCM_FC environment variable.
-     # look for possible MPI libraries
-     mpi_libs=
-     mpi_fort=`which mpif77 2>/dev/null`
-     RETVAL=$?
-     if test "x${RETVAL}" = x0 ; then
-         cat >>test.f <<EOF
-       PROGRAM HELLO
-       DO 10, I=1,10
-       PRINT *,'Hello World'
-CONTINUE
-       STOP
-       END
  EOF
-         eval "$mpi_fort -showme test.f > out"
+         exit 1
-         RETVAL=$?
+     else
-         if test "x${RETVAL}" = x0 ; then
+         echo "  The possible FORTRAN compilers found in your path are:"
-             a=`cat out`
+         echo "   "$p_FC
-             for i in $a ; do
+         if test "x$FC" = x ; then
-                 case $i in
+             FC=`echo $p_FC | awk '{print $1}'`
-                     -*)
-                         mpi_libs="$mpi_libs $i" ;;
-                 esac
-             done
-             echo "The MPI libs appear to be:"
-             echo "  "$mpi_libs
          fi
-         rm -f test.f out
      fi
- }
+     for i in $p_FC ; do
+         p_OF=$ROOTDIR"/tools/build_options/"$PLATFORM"_"$i
+         if test -r $p_OF ; then
+             OPTFILE=$p_OF
+             echo "  The options file:  $p_OF"
+             echo "    appears to match so we'll use it."
+             break
+         fi
+     done
+     if test "x$OPTFILE" = x ; then
+         cat 1>&2 <<EOF
- parse_options()  {
+ Error: No options file was found in:  $ROOTDIR/tools/build_options/
+   that matches this platform ("$PLATFORM") and the compilers found in
+   your path.  Please specify an "optfile" using:
-     ac_prev=
+) the command line (eg. "-optfile=path/to/OPTFILE"), or
-     for ac_option in "${OPTIONS[@]}" ; do
+) the MITGCM_OF environment variable.
+   If you need help, please contact the developers at <MITgcm-support@mitgcm.org>.
+ EOF
+         exit 1
+     fi
+ #     # look for possible MPI libraries
+ #     mpi_libs=
+ #     mpi_fort=`which mpif77 2>/dev/null`
+ #     RETVAL=$?
+ #     if test "x${RETVAL}" = x0 ; then
+ #       cat >>test.f <<EOF
+ #       PROGRAM HELLO
+ #       DO 10, I=1,10
+ #       PRINT *,'Hello World'
+ #    10 CONTINUE
+ #       STOP
+ #       END
+ # EOF
+ #       eval "$mpi_fort -showme test.f > out"
+ #       RETVAL=$?
+ #       if test "x${RETVAL}" = x0 ; then
+ #           a=`cat out`
+ #           for i in $a ; do
+ #               case $i in
+ #                   -*)
+ #                       mpi_libs="$mpi_libs $i" ;;
+ #               esac
+ #           done
+ #           echo "The MPI libs appear to be:"
+ #           echo "  "$mpi_libs
+ #       fi
+ #       rm -f test.f out
+ #     fi
-         # echo "ac_option = :$ac_option:"
-         # If the previous option needs an argument, assign it.
-         if test -n "$ac_prev"; then
-             eval "$ac_prev=\$ac_option"
-             ac_prev=
-             continue
-         fi
-         ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-         case $ac_option in
-             -help | --help | -h | --h)
-                 usage ;;
-             -nooptfile | --nooptfile)
-                 OPTFILE="NONE" ;;
-             -optfile | --optfile | -of | --of)
-                 ac_prev=optfile ;;
-             -optfile=* | --optfile=* | -of=* | --of=*)
-                 OPTFILE=$ac_optarg ;;
-             -pdepend | --pdepend)
-                 ac_prev=pdepend ;;
-             -pdepend=* | --pdepend=*)
-                 PDEPEND=$ac_optarg ;;
-             -pdefault | --pdefault)
-                 ac_prev=pdefault ;;
-             -pdefault=* | --pdefault=*)
-                 PDEFAULT=$ac_optarg ;;
-             -makefile | -ma)
-                 ac_prev=makefile ;;
-             --makefile=* | -ma=*)
-                 MAKEFILE=$ac_optarg ;;
-             -platform | --platform | -pl | --pl)
-                 ac_prev=platform ;;
-             -platform=* | --platform=* | -pl=* | --pl=*)
-                 PLATFORM=$ac_optarg ;;
-             -rootdir | --rootdir | -rd | --rd)
-                 ac_prev=rootdir ;;
-             -rootdir=* | --rootdir=* | -rd=* | --rd=*)
-                 ROOTDIR=$ac_optarg ;;
-             -mods | --mods | -mo | --mo)
-                 ac_prev=mods ;;
-             -mods=* | --mods=* | -mo=* | --mo=*)
-                 MODS=$ac_optarg ;;
-             -disable | --disable)
-                 ac_prev=disable ;;
-             -disable=* | --disable=*)
-                 DISABLE=$ac_optarg ;;
-             -enable | --enable)
-                 ac_prev=enable ;;
-             -enable=* | --enable=*)
-                 ENABLE=$ac_optarg ;;
-             -noopt | --noopt)
-                 ac_prev=noopt ;;
-             -noopt=* | --noopt=*)
-                 NOOPT=$ac_optarg ;;
- #           -cpp | --cpp)
- #               ac_prev=cpp ;;
- #           -cpp=* | --cpp=*)
- #               CPP=$ac_optarg ;;
-             -fortran | --fortran | -fc | --fc)
-                 ac_prev=fc ;;
-             -fc=* | --fc=*)
-                 FC=$ac_optarg ;;
-             -ieee | --ieee)
-                 IEEE=1 ;;
-             -noieee | --noieee)
-                 IEEE=0 ;;
-             -mpi | --mpi)
-                 MPI=1 ;;
-             -nompi | --nompi)
-                 MPI=0 ;;
-             -jam | --jam)
-                 JAM=1 ;;
-             -nojam | --nojam)
-                 JAM=0 ;;
-             -*)
-                 echo "Error: unrecognized option: "$ac_option
-                 usage
-                 ;;
-             *)
-                 echo "Error: unrecognized argument: "$ac_option
-                 usage
-                 ;;
-         esac
-     done
  }
  #  Parse the package dependency information
-Line 210 
 get_pdepend_list()  {
+Line 186 
 get_pdepend_list()  {
  #  Explain usage
  usage()  {
-     echo ""
+     echo
      echo "Usage: "$0" [OPTIONS]"
-     echo "  where [OPTIONS] can be:"$'\n'
+     echo "  where [OPTIONS] can be:"
+     echo
      echo "    -help | --help | -h | --h"
      echo "    -nooptfile | --nooptfile"
      echo "      -optfile NAME | --optfile NAME | -of NAME | --of NAME"
-Line 221 
 usage()  {
+Line 198 
 usage()  {
      echo "      -pdepend=NAME | --pdepend=NAME"
      echo "    -pdefault NAME | --pdefault NAME"
      echo "      -pdefault=NAME | --pdefault=NAME"
-     echo "    -makefile NAME | -ma NAME"
+     echo "    -make NAME | -m NAME"
-     echo "      --makefile=NAME | -ma=NAME"
+     echo "      --make=NAME | -m=NAME"
+     echo "    -makefile NAME | -mf NAME"
+     echo "      --makefile=NAME | -mf=NAME"
      echo "    -platform NAME | --platform NAME | -pl NAME | --pl NAME"
      echo "      -platform=NAME | --platform=NAME | -pl=NAME | --pl=NAME"
      echo "    -rootdir NAME | --rootdir NAME | -rd NAME | --rd NAME"
-Line 241 
 usage()  {
+Line 220 
 usage()  {
      echo "      -fc=NAME | --fc=NAME"
      echo "    -[no]ieee | --[no]ieee"
      echo "    -[no]mpi | --[no]mpi"
-     echo "    -[no]jam | --[no]jam"$'\n'
+     echo "    -[no]jam | --[no]jam"
-     echo "  and NAME is a string such as:"$'\n'
+     echo
+     echo "  and NAME is a string such as:"
+     echo
      echo "    --enable pkg1   --enable 'pkg1 pkg2'   --enable 'pkg1 pkg2 pkg3'"
      echo "    -mods=dir1   -mods='dir1'   -mods='dir1 dir2 dir3'"
-     echo "    -foptim='-Mvect=cachesize:512000,transform -xtypemap=real:64,double:64,integer:32'"$'\n'
+     echo "    -foptim='-Mvect=cachesize:512000,transform -xtypemap=real:64,double:64,integer:32'"
+     echo
      echo "  which, depending upon your shell, may need to be single-quoted"
      echo "  if it contains spaces, dashes, or other special characters."
      exit 1
  }
- # Dump all important state
- dump_state()  {
-     fname=$1
-     echo " " > $fname
-     RETVAL=$?
-     if test "x${RETVAL}" = x ; then
-         echo "Error: cannot write to $fname"
-         exit 1
-     fi
-     echo "makefile "$makefile > $fname
- }
  #eh3 # This is the generic configuration.
  #eh3 set LN         = ( 'ln -s' )
  #eh3 set CPP        = ( '/lib/cpp -P' )
-Line 284 
 dump_state()  {
+Line 253 
 dump_state()  {
  #eh3 if (! $?NOOPTFLAGS ) set NOOPTFLAGS = (  )
  #  Set defaults here
+ COMMANDL="$0 $@"
  PLATFORM=
  LN=
  S64=
  KPP=
  FC=
  LINK=
+ DEFINES="-DWORDLENGTH=4"
  PACKAGES=
  ENABLE=
  DISABLE=
  MAKEFILE=
  MAKEDEPEND=
  PDEPEND=
+ DUMPSTATE=t
  PDEFAULT=
  OPTFILE=
- INCLUDES=-I.
+ INCLUDES="-I."
  FFLAGS=
  FOPTIM=
  CFLAGS=
-Line 320 
 THISHOSTNAME=`hostname`
+Line 293 
 THISHOSTNAME=`hostname`
  THISCWD=`pwd`
  THISDATE=`date`
  MACHINE=`uname -a`
+ EXECUTABLE=
+ EXEHOOK=
+ EXEDIR=
+ #  The following state can be set directly by command-line switches
+ gm_s1="OPTFILE PDEPEND PDEFAULT MAKEFILE PLATFORM ROOTDIR MODS DISABLE ENABLE NOOPT"
+ gm_s2="FC IEEE MPI JAM DUMPSTATE"
+ #  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_s6="EXECUTABLE EXEHOOK EXEDIR"
+ gm_state="COMMANDL $gm_s1 $gm_s2 $gm_s3 $gm_s4 $gm_s5 $gm_s6"
- echo $'\n'"===  Processing options files and arguments  ==="
+ echo
+ echo "===  Processing options files and arguments  ==="
  gm_local="./gm_local"
  echo -n "  getting local config information:  "
  if test -e $gm_local ; then
      echo "using $gm_local"
      source $gm_local
-     echo "DISABLE=$DISABLE"$'\n'"ENABLE=$ENABLE"
+     # echo "DISABLE=$DISABLE"
+     # echo "ENABLE=$ENABLE"
  else
      echo "none found"
  fi
  #  echo "$0::$1:$2:$3:$4:$5:$6:$7:"
- OPTIONS=()
+ #OPTIONS=
- n=0
+ #n=0
- for i ; do
+ #for i ; do
-    setvar="OPTIONS[$n]='$i'"
+ #   echo "$i  $n"
-    #  echo "  $setvar"
+ #   setvar="OPTIONS[$n]='$i'"
-    eval "$setvar"
+ #   #  echo "  $setvar"
-    n=$(( $n + 1 ))
+ #   eval "$setvar"
+ #   n=$(( $n + 1 ))
+ #done
+ #parse_options
+ ac_prev=
+ for ac_option ; do
+     # If the previous option needs an argument, assign it.
+     if test -n "$ac_prev"; then
+         eval "$ac_prev=\$ac_option"
+         ac_prev=
+         continue
+     fi
+     ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
+     case $ac_option in
+         -help | --help | -h | --h)
+             usage ;;
+         -nooptfile | --nooptfile)
+             OPTFILE="NONE" ;;
+         -optfile | --optfile | -of | --of)
+             ac_prev=OPTFILE ;;
+         -optfile=* | --optfile=* | -of=* | --of=*)
+             OPTFILE=$ac_optarg ;;
+         -pdepend | --pdepend)
+             ac_prev=PDEPEND ;;
+         -pdepend=* | --pdepend=*)
+             PDEPEND=$ac_optarg ;;
+         -pdefault | --pdefault)
+             ac_prev=PDEFAULT ;;
+         -pdefault=* | --pdefault=*)
+             PDEFAULT=$ac_optarg ;;
+         -make | --make | -m | --m)
+             ac_prev=MAKE ;;
+         -make=* | --make=* | -m=* | --m=*)
+             MAKE=$ac_optarg ;;
+         -makefile | --makefile | -ma | --ma)
+             ac_prev=MAKEFILE ;;
+         -makefile=* | --makefile=* | -ma=* | --ma=*)
+             MAKEFILE=$ac_optarg ;;
+         -platform | --platform | -pl | --pl)
+             ac_prev=PLATFORM ;;
+         -platform=* | --platform=* | -pl=* | --pl=*)
+             PLATFORM=$ac_optarg ;;
+         -rootdir | --rootdir | -rd | --rd)
+             ac_prev=ROOTDIR ;;
+         -rootdir=* | --rootdir=* | -rd=* | --rd=*)
+             ROOTDIR=$ac_optarg ;;
+         -mods | --mods | -mo | --mo)
+             ac_prev=MODS ;;
+         -mods=* | --mods=* | -mo=* | --mo=*)
+             MODS=$ac_optarg ;;
+         -disable | --disable)
+             ac_prev=DISABLE ;;
+         -disable=* | --disable=*)
+             DISABLE=$ac_optarg ;;
+         -enable | --enable)
+             ac_prev=ENABLE ;;
+         -enable=* | --enable=*)
+             ENABLE=$ac_optarg ;;
+         -noopt | --noopt)
+             ac_prev=NOOPT ;;
+         -noopt=* | --noopt=*)
+             NOOPT=$ac_optarg ;;
+ #           -cpp | --cpp)
+ #               ac_prev=cpp ;;
+ #           -cpp=* | --cpp=*)
+ #               CPP=$ac_optarg ;;
+         -fortran | --fortran | -fc | --fc)
+             ac_prev=FC ;;
+         -fc=* | --fc=*)
+             FC=$ac_optarg ;;
+         -ieee | --ieee)
+             IEEE=1 ;;
+         -noieee | --noieee)
+             IEEE=0 ;;
+         -mpi | --mpi)
+             MPI=1 ;;
+         -nompi | --nompi)
+             MPI=0 ;;
+         -jam | --jam)
+             JAM=1 ;;
+         -nojam | --nojam)
+             JAM=0 ;;
+         -ds | --ds)
+             DUMPSTATE=t ;;
+         -*)
+             echo "Error: unrecognized option: "$ac_option
+             usage
+             ;;
+         *)
+             echo "Error: unrecognized argument: "$ac_option
+             usage
+             ;;
+     esac
  done
- parse_options
+ if test "x${ROOTDIR}" = x ; then
+     if test "${PWD##/*/}" = "bin" -a -d ../model -a -d ../eesup -a -d ../pkg ; then
+         ROOTDIR=".."
+     else
+         for d in . .. ../.. ../../.. ../../../.. ../../../../.. ; do
+             if [ -d "$d/model" -a -d "$d/eesupp" -a -d "$d/pkg" ]; then
+                 ROOTDIR=$d
+                 echo -n "Warning:  ROOTDIR was not specified but there appears to be"
+                 echo " a copy of MITgcm at \"$ROOTDIR\" so we'll try it."
+                 break
+             fi
+         done
+     fi
+ fi
+ if test "x${ROOTDIR}" = x ; then
+     echo "Error: Cannot determine ROOTDIR for MITgcm code."
+     echo "  Please specify a ROOTDIR using either an options "
+     echo "  file or a command-line option."
+     exit 1
+ fi
+ if test ! -d ${ROOTDIR} ; then
+     echo "Error: the specified ROOTDIR (\"$ROOTDIR\") does not exist!"
+     exit 1
+ fi
  echo "  getting OPTFILE information:  "
  if test "x${OPTFILE}" = x ; then
-     echo "Warning: no OPTFILE specified so we'll look for possible settings"
+     if test "x$MITGCM_OF" = x ; then
-     echo $'\n'"===  Searching for possible settings for OPTFILE  ==="
+         echo "Warning: no OPTFILE specified so we'll look for possible settings"
-     find_possible_configs
+         printf "\n===  Searching for possible settings for OPTFILE  ===\n"
- else
+         find_possible_configs
-     if test "x$OPTFILE" = xNONE ; then
-         echo "    OPTFILE=NONE so we'll try to use default settings"
      else
-         if test -f "$OPTFILE" -a -r "$OPTFILE" ; then
+         OPTFILE=$MITGCM_OF
-             echo "    using OPTFILE=\"$OPTFILE\""
+     fi
-             source "$OPTFILE"
+ fi
-             RETVAL=$?
+ if test "x$OPTFILE" != xNONE ; then
-             if test "x$RETVAL" != x0 ; then
+     if test -f "$OPTFILE" -a -r "$OPTFILE" ; then
-                 echo -n "Error: failed to source OPTFILE \"$OPTFILE\""
+         echo "    using OPTFILE=\"$OPTFILE\""
-                 echo "--please check that variable syntax is bash-compatible"
+         source "$OPTFILE"
-                 exit 1
+         RETVAL=$?
-             fi
+         if test "x$RETVAL" != x0 ; then
-         else
+             echo -n "Error: failed to source OPTFILE \"$OPTFILE\""
-             echo "Error: can't read OPTFILE=\"$OPTFILE\""
+             echo "--please check that variable syntax is bash-compatible"
              exit 1
          fi
+         if test "x$DUMPSTATE" != xf ; then
+             cp -f $OPTFILE "gm_optfile"
+         fi
+     else
+         echo "Error: can't read OPTFILE=\"$OPTFILE\""
+         exit 1
      fi
  fi
- echo $'\n'"===  Setting defaults  ==="
+ #  Check that FC, LINK, CPP, and S64 are defined.  If not, complain
+ #  and abort!
+ if test "x$FC" = x ; then
+     cat <<EOF 1>&2
+ Error: no Fortran compiler: please specify using one of the following:
+) within the options file ("FC=...") as specified by "-of=OPTFILE"
+) the "-fc=XXX" command-line option
+) the "./gm_local" file
+ EOF
+     exit 1
+ fi
+ if test "x$LINK" = x ; then
+     LINK=$FC
+ fi
+ if test "x$CPP" = x ; then
+     CPP="cpp"
+ fi
+ echo "#define A a" | cpp > test_cpp 2>&1
+ RETVAL=$?
+ if test "x$RETVAL" != x0 ; then
+     cat <<EOF 1>&2
+ Error: C pre-processor "$CPP" failed the test case: please specify using:
+) within the options file ("CPP=...") as specified by "-of=OPTFILE"
+) the "./gm_local" file
+ EOF
+     exit 1
+ else
+     rm -f test_cpp
+ fi
+ if test "x$MAKEDEPEND" = x ; then
+     MAKEDEPEND=makedepend
+ fi
+ printf "\n===  Setting defaults  ===\n"
  echo -n "  Adding MODS directories:  "
  for d in $MODS ; do
      if test ! -d $d ; then
-         echo $'\n\n'"Error: MODS directory \"$d\" not found!"
+         echo
+         echo "Error: MODS directory \"$d\" not found!"
          exit 1
      else
          echo -n " $d"
-Line 389 
 if test "x${PLATFORM}" = x ; then
+Line 564 
 if test "x${PLATFORM}" = x ; then
      PLATFORM=$p_PLATFORM
  fi
- if test "x${ROOTDIR}" = x ; then
-     if test "${PWD##/*/}" = "bin" -a -d ../model -a -d ../eesup -a -d ../pkg ; then
-         ROOTDIR=".."
-     else
-         for d in . .. ../.. ../../.. ../../../.. ../../../../.. ; do
-             if [ -d "$d/model" -a -d "$d/eesupp" -a -d "$d/pkg" ]; then
-                 ROOTDIR=$d
-                 echo -n "Warning:  ROOTDIR was not specified but there appears to be"
-                 echo " a copy of MITgcm at \"$ROOTDIR\" so we'll try it."
-                 break
-             fi
-         done
-     fi
- fi
- if test "x${ROOTDIR}" = x ; then
-     echo "Error: Cannot determine ROOTDIR for MITgcm code."
-     echo "  Please specify a ROOTDIR using either an options "
-     echo "  file or a command-line option."
-     exit 1
- fi
- if test ! -d ${ROOTDIR} ; then
-     echo "Error: the specified ROOTDIR (\"$ROOTDIR\") does not exist!"
-     exit 1
- fi
  if test "x${EXEDIR}" = x ; then
      if test "${PWD##/*/}" = "bin" -a -d ../exe -a $ROOTDIR = .. ; then
          EXEDIR=../exe
-Line 433 
 if test ! -d ${TOOLSDIR} ; then
+Line 583 
 if test ! -d ${TOOLSDIR} ; then
      echo "Error: the specified $TOOLSDIR (\"$TOOLSDIR\") does not exist!"
      exit 1
  fi
+ if test "x$S64" = x ; then
+     S64='$(TOOLSDIR)/set64bitConst.sh'
+ fi
  EXECUTABLE=${EXECUTABLE:-mitgcmuv}
-Line 443 
 if test -r $ROOTDIR"/eesupp/src/Makefile
+Line 596 
 if test -r $ROOTDIR"/eesupp/src/Makefile
      echo "  Making source files in eesupp from templates"
      $MAKE -C $ROOTDIR"/eesupp/src/" > make_eesupp.errors 2>&1
      RETVAL=$?
-     if test "x${RETVAL}" == "x0" ; then
+     if test "x${RETVAL}" = x0 ; then
          rm -f make_eesupp.errors
      else
          echo "Error: problem encountered while building source files in eesupp:"
-Line 452 
 if test -r $ROOTDIR"/eesupp/src/Makefile
+Line 605 
 if test -r $ROOTDIR"/eesupp/src/Makefile
      fi
  fi
- echo $'\n'"===  Determining package settings  ==="
+ printf "\n===  Determining package settings  ===\n"
  if  test "x${PDEPEND}" = x ; then
      tmp=$ROOTDIR"/pkg/pkg_depend"
      if test -r $tmp ; then
-Line 471 
 echo "  getting package dependency info
+Line 624 
 echo "  getting package dependency info
  #  Strip the comments and then convert the dependency file into
  #  two arrays: PNAME, DNAME
  cat $PDEPEND | sed -e 's/#.*$//g' \
-     | awk 'BEGIN{nn=-1;} (NF>0){ for(i=2;i<=NF;i++){nn++; print "PNAME["nn"]="$1"\nDNAME["nn"]="$i} }' \
+     | awk 'BEGIN{nn=-1;} (NF>0){ for(i=2;i<=NF;i++){nn++; print "PNAME_"nn"="$1"\nDNAME_"nn"="$i}} END{print "nname="nn}' \
      > ./.pd_tmp
  RETVAL=$?
  if test ! "x${RETVAL}" = x0 ; then
-Line 523 
 for p in $PACKAGES ; do
+Line 676 
 for p in $PACKAGES ; do
  done
  PACKAGES="$pack"
  echo "  applying ENABLE settings"
- rm -f ./.tmp_pack
+ echo "" > ./.tmp_pack
  PACKAGES="$PACKAGES $ENABLE"
  for i in $PACKAGES ; do
      if test ! -d "$ROOTDIR/pkg/$i" ; then
-Line 544 
 echo "  applying package dependency rule
+Line 697 
 echo "  applying package dependency rule
  ck=
  while test "x$ck" != xtt ; do
      i=0
-     rtot=${#PNAME[@]}
+     # rtot=${#PNAME[@]}
+     rtot=$nname
      while test $i -lt $rtot ; do
          #  Is $pname in the current $PACKAGES list?
-         pname=${PNAME[$i]}
+         #  pname=${PNAME[$i]}
+         tmp="pname=\"\$PNAME_$i\""
+         eval $tmp
          pin="f"
          for p in $PACKAGES ; do
              if test "x$p" = "x$pname" ; then
-Line 557 
 while test "x$ck" != xtt ; do
+Line 713 
 while test "x$ck" != xtt ; do
          done
          #  Is the DNAME entry a (+) or (-) rule ?
+         tmp="dname=\"\$DNAME_$i\""
+         eval $tmp
          plus="-"
-         echo "${DNAME[$i]}" | grep '^+' > /dev/null 2>&1
+         echo $dname | grep '^+' > /dev/null 2>&1
          RETVAL=$?
          if test "x$RETVAL" = x0 ; then
              plus="+"
          fi
          #  Is $dname in the current $PACKAGES list?
-         dname=`echo ${DNAME[$i]} | sed -e 's/^[+-]//'`
+         dname=`echo $dname | sed -e 's/^[+-]//'`
          din="f"
          for p in $PACKAGES ; do
              if test "x$p" = "x$dname" ; then
-Line 634 
 done
+Line 792 
 done
  # done
  # echo
- echo "  Setting package-specific CPP flags in CPP_OPTIONS.h:"
+ # Create a list of #define and #undef to enable/disable packages
- CPP_OPTIONS=
+ PACKAGES_DOT_H=PACKAGES.h
- spaths=". $SOURCEDIRS"
+ if test -e $PACKAGES_DOT_H ; then
- for i in $spaths ; do
+     cat $PACKAGES_DOT_H \
-     try="$i/CPP_OPTIONS.h"
-     #  echo -n "    trying $try : "
-     if test -f $try -a -r $try ; then
-         echo "    found CPP_OPTIONS=\"$try\""
-         CPP_OPTIONS="$try"
-         if test "x$i" != "x." ; then
-             cp -f $CPP_OPTIONS .
-         fi
-         break
-     fi
- done
- if test "x$CPP_OPTIONS" = x ; then
-     echo "Error: can't find \"CPP_OPTIONS.h\" in the path list: $spaths"
-     exit 1
- fi
- if test -e CPP_OPTIONS.h ; then
-     if test ! -e CPP_OPTIONS.h.bak ; then
-         cp -f CPP_OPTIONS.h CPP_OPTIONS.h.bak
-     fi
-     cat CPP_OPTIONS.h \
          | awk 'BEGIN{p=1;} ($1=="C===" && $2=="GENMAKE"){p=0;} {if (p==1) print $0}' \
-         > CPP_OPTIONS.h.tmp
+         > $PACKAGES_DOT_H".tmp"
  fi
- cat <<EOF >>CPP_OPTIONS.h.tmp
+ cat <<EOF >>$PACKAGES_DOT_H".tmp"
  C=== GENMAKE v2 ===
- C  The following defines have been set by GENMAKE, so please edit
+ C  The following defines have been set by GENMAKE, so please do not
- C  them only if you know what you're doing.  In general, you should
+ C  edit anything below these comments.  In general, you should
  C  add or remove packages by re-running genmake with different
  C  "-enable" and/or "-disable" options.
-Line 687 
 for n in $names ; do
+Line 825 
 for n in $names ; do
          done
          if test "x$has_pack" = xf ; then
              undef=`echo "ALLOW_$n" | awk '{print toupper($0)}'`
-             echo "#undef $undef" >> CPP_OPTIONS.h.tmp
+             echo "#undef $undef" >> $PACKAGES_DOT_H".tmp"
+ #           DEFINES="$DEFINES -U$undef"
  #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!
              case $n in
-Line 697 
 for n in $names ; do
+Line 836 
 for n in $names ; do
                  mom_vecinv)
                      DEFINES="$DEFINES -DDISABLE_MOM_VECINV"
                      ;;
-                 generic_advdiff)
-                     DEFINES="$DEFINES -DDISABLE_GENERIC_ADVDIFF"
-                     ;;
                  debug)
                      DEFINES="$DEFINES -DDISABLE_DEBUGMODE"
                      ;;
-Line 709 
 for n in $names ; do
+Line 845 
 for n in $names ; do
          fi
      fi
  done
- cat <<EOF >>CPP_OPTIONS.h.tmp
+ cat <<EOF >>$PACKAGES_DOT_H".tmp"
  C  Packages enabled by genmake:
  EOF
  for i in $PACKAGES ; do
      def=`echo "ALLOW_$i" | awk '{print toupper($0)}'`
-     echo "#define $def" >> CPP_OPTIONS.h.tmp
+     echo "#define $def" >> $PACKAGES_DOT_H".tmp"
+ #eh3 DEFINES="$DEFINES -D$def"
  #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!
      case $i in
          aim_v23)
-             echo "#define   ALLOW_AIM" >> CPP_OPTIONS.h.tmp
+             echo "#define   ALLOW_AIM" >> $PACKAGES_DOT_H".tmp"
+             DEFINES="$DEFINES -DALLOW_AIM"
+             echo "Warning: ALLOW_AIM is set to enable aim_v23. This is REALLY ugly Jean-Michel :-)"
              ;;
      esac
  #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!
  done
- mv -f CPP_OPTIONS.h.tmp CPP_OPTIONS.h
+ cmp $PACKAGES_DOT_H".tmp" $PACKAGES_DOT_H
+ RETVAL=$?
+ if test "x$RETVAL" = x0 ; then
+     mv -f $PACKAGES_DOT_H".tmp" $PACKAGES_DOT_H".bak"
+     mv -f $PACKAGES_DOT_H".tmp" $PACKAGES_DOT_H
+ fi
  echo "  Adding STANDARDDIRS"
  BUILDDIR=${BUILDDIR:-.}
-Line 750 
 for d in $STANDARDDIRS ; do
+Line 894 
 for d in $STANDARDDIRS ; do
      fi
  done
+ echo " Searching for CPP_OPTIONS.h in order to warn about the presence"
+ echo " of \"#define ALLOW_PKGNAME\"-type statements:"
+ CPP_OPTIONS=
+ spaths=". $INCLUDEDIRS"
+ for i in $spaths ; do
+     try="$i/CPP_OPTIONS.h"
+     #  echo -n "    trying $try : "
+     if test -f $try -a -r $try ; then
+         echo "    found CPP_OPTIONS=\"$try\""
+         CPP_OPTIONS="$try"
+         break
+     fi
+ done
+ if test "x$CPP_OPTIONS" = x ; then
+     echo "Error: can't find \"CPP_OPTIONS.h\" in the path list: $spaths"
+     exit 1
+ fi
+ # New safety test: make sure packages are not mentioned in CPP_OPTIONS.h
+ names=`ls -1 "$ROOTDIR/pkg"`
+ for n in $names ; do
+     test_for_package_in_cpp_options $CPP_OPTIONS $n
+ done
- echo $'\n'"===  Creating the Makefile  ==="
+ echo
+ echo "===  Creating the Makefile  ==="
  echo "  setting INCLUDES"
  for i in $INCLUDEDIRS ; do
-     if test -d $i ; then
+     if ! test -d $i ; then
-         INCLUDES="$INCLUDES -I$i"
+ #       INCLUDES="$INCLUDES -I$i"
-     else
+ #   else
          echo "Warning: can't find INCLUDEDIRS=\"$i\""
      fi
  done
-Line 766 
 rm -rf .links.tmp
+Line 934 
 rm -rf .links.tmp
  mkdir .links.tmp
  echo "# This section creates symbolic links" > srclinks.tmp
  echo "" >> srclinks.tmp
- echo -n 'SRCFILES = ' > srclist.inc
+ echo -n 'SRCFILES = '    > srclist.inc
- echo -n 'CSRCFILES = ' > csrclist.inc
+ echo -n 'CSRCFILES = '   > csrclist.inc
+ echo -n 'F90SRCFILES = ' > f90srclist.inc
  echo -n 'HEADERFILES = ' > hlist.inc
- alldirs=". $SOURCEDIRS $INCLUDEDIRS"
+ alldirs="$SOURCEDIRS $INCLUDEDIRS ."
  for d in $alldirs ; do
      deplist=
      sfiles=`( cd $d; echo *.[h,c,F] )`
+     sfiles=`( echo $sfiles; cd $d; echo *.F90 )`
      for sf in $sfiles ; do
          if test ! -r ".links.tmp/$sf" ; then
              if test -f "$d/$sf" ; then
-Line 784 
 for d in $alldirs ; do
+Line 954 
 for d in $alldirs ; do
                          echo    " \\"  >> srclist.inc
                          echo -n " $sf" >> srclist.inc
                          ;;
+                     F90)
+                         echo    " \\"  >> f90srclist.inc
+                         echo -n " $sf" >> f90srclist.inc
+                         ;;
                      c)
                          echo    " \\"  >> csrclist.inc
                          echo -n " $sf" >> csrclist.inc
-Line 797 
 for d in $alldirs ; do
+Line 971 
 for d in $alldirs ; do
          fi
      done
      if test "x$deplist" != x ; then
-         echo $'\n'"#  These files are linked from $d" >> srclinks.tmp
+         echo "" >> srclinks.tmp
+         echo "#  These files are linked from $d" >> srclinks.tmp
          echo "$deplist :" >> srclinks.tmp
-         echo $'\t$(LN) '$d'/$@ $@' >> srclinks.tmp
+         printf "\t\$(LN) %s/\$@ \$@\n" $d >> srclinks.tmp
      fi
  done
  rm -rf .links.tmp
  echo "" >> srclist.inc
  echo "" >> csrclist.inc
+ echo "" >> f90srclist.inc
  echo "" >> hlist.inc
  if test -e $MAKEFILE ; then
-Line 862 
 MAKEDEPEND = ${MAKEDEPEND}
+Line 1038 
 MAKEDEPEND = ${MAKEDEPEND}
  KPP = ${KPP}
  # Fortran compiler
  FC = ${FC}
+ # Fortran compiler
+ F90C = ${F90C}
  # Link editor
  LINK = ${LINK}
-Line 875 
 KFLAGS2 = ${KFLAGS2}
+Line 1053 
 KFLAGS2 = ${KFLAGS2}
  # Optim./debug for FC
  FFLAGS = ${FFLAGS}
  FOPTIM = ${FOPTIM}
+ # Optim./debug for FC
+ F90FLAGS = ${F90FLAGS}
+ F90OPTIM = ${F90OPTIM}
  # Flags for CC
  CFLAGS = ${CFLAGS}
  # Files that should not be optimized
-Line 882 
 NOOPTFILES = ${NOOPTFILES}
+Line 1063 
 NOOPTFILES = ${NOOPTFILES}
  NOOPTFLAGS = ${NOOPTFLAGS}
  # Flags and libraries needed for linking
  LIBS = ${LIBS} \$(XLIBS)
+ # Name of the Mekfile
+ MAKEFILE=${MAKEFILE}
  EOF
- cat srclist.inc  >> $MAKEFILE
+ cat srclist.inc    >> $MAKEFILE
- cat csrclist.inc >> $MAKEFILE
+ cat csrclist.inc   >> $MAKEFILE
- cat hlist.inc >> $MAKEFILE
+ cat f90srclist.inc >> $MAKEFILE
- echo 'F77FILES =  $(SRCFILES:.F=.f)'                    >> $MAKEFILE
+ cat hlist.inc      >> $MAKEFILE
- echo 'OBJFILES =  $(SRCFILES:.F=.o) $(CSRCFILES:.c=.o)' >> $MAKEFILE
+ echo 'F77FILES =  $(SRCFILES:.F=.f)'                                           >> $MAKEFILE
+ echo 'F90FILES =  $(F90SRCFILES:.F90=.f90)'                                    >> $MAKEFILE
+ echo 'OBJFILES =  $(SRCFILES:.F=.o) $(CSRCFILES:.c=.o) $(F90SRCFILES:.F90=.o)' >> $MAKEFILE
- rm -f srclist.inc csrclist.inc hlist.inc flist.tmp clist.tmp
+ rm -f srclist.inc csrclist.inc hlist.inc flist.tmp clist.tmp f90srclist.inc
  cat >>$MAKEFILE <<EOF
  .SUFFIXES:
- .SUFFIXES: .o .f .p .F .c
+ .SUFFIXES: .o .f .p .F .c .F90 .f90
  all: \$(EXECUTABLE)
  \$(EXECUTABLE): \$(OBJFILES)
-Line 904 
 all: \$(EXECUTABLE)
+Line 1089 
 all: \$(EXECUTABLE)
  depend:
          @make links
          \$(MAKEDEPEND) -o .f \$(DEFINES) \$(INCLUDES) \$(SRCFILES)
+         ${TOOLSDIR}/f90mkdepend >> \$(MAKEFILE)
- links: \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES)
+ links: \$(SRCFILES) \$(CSRCFILES) \$(HEADERFILES) \$(F90SRCFILES)
- small_f: \$(F77FILES)
+ small_f: \$(F77FILES) \$(F90FILES)
  output.txt: \$(EXECUTABLE)
          @printf 'running ... '
          @\$(EXECUTABLE) > \$@
  clean:
-         -rm -rf *.o *.f *.p ${RMFILES} work.{pc,pcl}
+         -rm -rf *.o *.f *.p *.f90 *.mod ${RMFILES} work.{pc,pcl}
  Clean:
          @make clean
          @make cleanlinks
-         -rm -f Makefile.bak
+         -rm -f Makefile.bak gm_state gm_optfile make.log PACKAGES.h*
  CLEAN:
          @make Clean
          -find \$(EXEDIR) -name "*.meta" -exec rm {} \;
          -find \$(EXEDIR) -name "*.data" -exec rm {} \;
          -find \$(EXEDIR) -name "fort.*" -exec rm {} \;
-         -rm -f \$(EXECUTABLE)
+         -rm -f \$(EXECUTABLE) output.txt
  makefile:
          ${0} $@
-Line 936 
 cleanlinks:
+Line 1122 
 cleanlinks:
          \$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
  .f.o:
          \$(FC) \$(FFLAGS) \$(FOPTIM) -c \$<
+ .F90.f90:
+         \$(CPP) \$(DEFINES) \$(INCLUDES) > \$@
+ .f90.o:
+         \$(F90C) \$(F90FLAGS) \$(F90OPTIM) -c \$<
  .c.o:
          \$(CC) \$(CFLAGS) -c \$<
-Line 947 
 cleanlinks:
+Line 1137 
 cleanlinks:
  EOF
+ if test "x$EXEHOOK" != x ; then
+     printf "\nexehook:\n\t%s\n" $EXEHOOK >> $MAKEFILE
+ fi
  echo "  Making list of \"exceptions\" that need \".p\" files"
  for i in $KPPFILES ; do
      base=`echo $i | sed -e 's/\/.*\///g' | sed -e 's/\..*$//g'`
-Line 965 
 for i in $NOOPTFILES ; do
+Line 1159 
 for i in $NOOPTFILES ; do
          echo "Error: unable to add file \"$i\" to the exceptions list"
      fi
      echo "$base.o: $base.f" >> $MAKEFILE
-     echo $'\t$(FC) $(FFLAGS) $(NOOPTFLAGS) -c $<' >> $MAKEFILE
+     printf "\t\$(FC) \$(FFLAGS) \$(NOOPTFLAGS) -c \$<\n" >> $MAKEFILE
  done
  echo "  Add rules for links"
-Line 973 
 cat srclinks.tmp >> $MAKEFILE
+Line 1167 
 cat srclinks.tmp >> $MAKEFILE
  rm -f srclinks.tmp
  echo "  Adding makedepend marker"
- echo $'\n\n'"# DO NOT DELETE" >> $MAKEFILE
+ printf "\n\n# DO NOT DELETE\n" >> $MAKEFILE
+ printf "\n===  Done  ===\n"
- echo $'\n'"===  Done  ==="
+ #  Write the "state" for future records
+ if test "x$DUMPSTATE" != xf ; then
+     echo -n "" > gm_state
+     for i in $gm_state ; do
+         t1="t2=\$$i"
+         eval $t1
+         echo "$i='$t2'" >> gm_state
+     done
+ fi

 Legend:



Removed from v.1.1
 


changed lines


 
Added in v.1.11.2.2
 Legend:



Removed from v.1.1
 


changed lines


 
Added in v.1.11.2.2
-Removed from v.1.1
+Added in v.1.11.2.2

	ViewVC Help
Powered by ViewVC 1.1.22