/[MITgcm]/MITgcm/tools/genmake2

Diff of /MITgcm/tools/genmake2

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

-revision 1.204 by jmc,
Wed Mar 10 15:49:54 2010 UTC
+revision 1.205 by jmc,
Sun May 23 03:45:58 2010 UTC
 Line 480 
 get_pdepend_list()  {
      #  strip the comments and then convert the dependency file into
      #  two arrays: PNAME, DNAME
      cat $1 | sed -e 's/#.*$//g' \
-         | $AWK 'BEGIN{nn=0;} (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
+       echo "Error: unable to parse package dependencies -- please check PDEPEND=\"$1\""
+       exit 1
+     fi
      . ./.pd_tmp
      rm -f ./.pd_tmp
-     printf "PNAME = "${}
  }
-Line 1861 
 THIS_SCRIPT=`echo ${0} | sed 's:'$TOOLSD
+Line 1865 
 THIS_SCRIPT=`echo ${0} | sed 's:'$TOOLSD
  EXECUTABLE=${EXECUTABLE:-mitgcmuv}
+ #  Set Standard Code Directories:
+ if test "x$STANDARDDIRS" = xUSE_THE_DEFAULT ; then
+     STANDARDDIRS="eesupp model"
+ fi
+ #  if model in Standard-Code-Dir, add eesupp (needed to compile model)
+ echo " $STANDARDDIRS " | grep ' model ' > /dev/null 2>&1
+ ckM=$?
+ echo " $STANDARDDIRS " | grep ' eesupp ' > /dev/null 2>&1
+ ckE=$?
+ if test $ckM = 0 -a $ckE = 1 ; then
+     STANDARDDIRS="$STANDARDDIRS eesupp"
+ fi
  #  We have a special set of source files in eesupp/src which are
  #  generated from some template source files. We'll make them first so
  #  they appear as regular source code
-Line 1911 
 fi
+Line 1928 
 fi
  echo "  getting package dependency info from  $PDEPEND"
  #  Strip the comments and then convert the dependency file into
  #  two arrays: PNAME, DNAME
- cat $PDEPEND | sed -e 's/#.*$//g' \
+ get_pdepend_list $PDEPEND
-     | $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
-     echo "Error: unable to parse package dependencies -- please check PDEPEND=\"$PDEPEND\""
-     exit 1
- fi
- . ./.pd_tmp
- rm -f ./.pd_tmp
  #  Search for default packages.  Note that a "$ROOTDIR/pkg/pkg_groups"
- #  file should eventually be added so that, for convenience, one can
+ #  file has been added so that, for convenience, one can specify
- #  specify groups of packages using names like "ocean" and "atmosphere".
+ #  groups of packages using names like "ocean" and "atmosphere".
  echo "  checking default package list:  "
  if test "x${PDEFAULT}" = x ; then
      for i in "." $MODS ; do
-Line 1955 
 else
+Line 1963 
 else
          for i in $def ; do
              PACKAGES="$PACKAGES $i"
          done
-         echo "    before group expansion packages are: $PACKAGES"
+         echo "    before group expansion packages are:$PACKAGES"
          RET=1
          while test $RET = 1 ; do expand_pkg_groups; RET=$?; done
-         echo "    after group expansion packages are:  $PACKAGES"
+         echo "    after group expansion packages are: $PACKAGES"
      fi
  fi
  echo "  applying DISABLE settings"
+ echo "" > ./.tmp_pack
  for i in $PACKAGES ; do
      echo $i >> ./.tmp_pack
  done
-Line 2000 
 for i in `grep -v "-" ./.tmp_pack | sort
+Line 2009 
 for i in `grep -v "-" ./.tmp_pack | sort
      PACKAGES="$PACKAGES $i"
  done
  rm -f ./.tmp_pack
- echo "    packages are:  $PACKAGES"
+ echo "    packages are: $PACKAGES"
  #  Check for package MNC: if NetCDF is available, then build the MNC
  #  template files ; otherwise, delete mnc from the list of packages.
- echo $PACKAGES | grep ' mnc ' > /dev/null 2>&1
+ echo " $PACKAGES " | grep ' mnc ' > /dev/null 2>&1
  RETVAL=$?
  if test "x$RETVAL" = x0 ; then
      if test "x$HAVE_NETCDF" != xt ; then
-Line 2039 
 fi
+Line 2048 
 fi
  #  Check for package PROFILES: if NetCDF is not available,
  #  then delete profiles from the list of available packages.
- echo $PACKAGES | grep ' profiles ' > /dev/null 2>&1
+ echo " $PACKAGES " | grep ' profiles ' > /dev/null 2>&1
  RETVAL=$?
  if test "x$RETVAL" = x0 ; then
      if test "x$HAVE_NETCDF" != xt ; then
-Line 2080 
 while test "x$ck" != xtt ; do
+Line 2089 
 while test "x$ck" != xtt ; do
                  pin="t"
              fi
          done
+         #  or in the current $STANDARDDIRS list?
+         for p in $STANDARDDIRS ; do
+             if test "x$p" = "x$pname" ; then pin="t" ; fi
+         done
          #  Is the DNAME entry a (+) or (-) rule ?
          tmp="dname=\"\$DNAME_$i\""
-Line 2132 
 while test "x$ck" != xtt ; do
+Line 2145 
 while test "x$ck" != xtt ; do
      done
      ck=$ck"t"
  done
- echo "    packages are:  $PACKAGES"
+ echo "    packages are: $PACKAGES"
  for i in $PACKAGES ; do
      adr="$ROOTDIR/pkg/$i"
      if test -d $adr ; then
-Line 2188 
 for i in $PACKAGES ; do
+Line 2201 
 for i in $PACKAGES ; do
  done
- echo "  Adding STANDARDDIRS"
+ echo "  Adding STANDARDDIRS='$STANDARDDIRS'"
  BUILDDIR=${BUILDDIR:-.}
- if test "x$STANDARDDIRS" = xUSE_THE_DEFAULT ; then
-     STANDARDDIRS="eesupp model"
- fi
  if test "x$STANDARDDIRS" != x ; then
      for d in $STANDARDDIRS ; do
          adr="$ROOTDIR/$d/src"
-Line 2487 
 for xx in "$@" ; do nw=`echo $xx | wc -w
+Line 2497 
 for xx in "$@" ; do nw=`echo $xx | wc -w
  done
  if test -f $MAKEFILE ; then
-     mv -f $MAKEFILE "$MAKEFILE.bak"
+     mv -f $MAKEFILE "$MAKEFILE.old"
  fi
  echo "  Writing makefile: $MAKEFILE"
  echo "# Multithreaded + multi-processing makefile for:" > $MAKEFILE
-Line 2506 
 EXE_SVD=$EXECUTABLE"_svd"
+Line 2516 
 EXE_SVD=$EXECUTABLE"_svd"
  cat >>$MAKEFILE <<EOF
  #
  # OPTFILE="$OPTFILE"
  #
  # BUILDDIR     : Directory where object files are written
  # SOURCEDIRS   : Directories containing the source (.F) files
  # INCLUDEDIRS  : Directories containing the header-source (.h) files
-Line 2526 
 cat >>$MAKEFILE <<EOF
+Line 2536 
 cat >>$MAKEFILE <<EOF
  # LIBS         : Library flags /or/ additional optimization/debugging flags
  ROOTDIR     = ${ROOTDIR}
  BUILDDIR    = ${BUILDDIR}
  SOURCEDIRS  = ${SOURCEDIRS}
  INCLUDEDIRS = ${INCLUDEDIRS}
  EXEDIR      = ${EXEDIR}
-Line 2607 
 rm -f F77srclist.tmp nonADF77srclist.tmp
+Line 2617 
 rm -f F77srclist.tmp nonADF77srclist.tmp
  echo >> $MAKEFILE
  # add definitions for preprocessed sources
  # and note that not all systems allow case sensitive extensions
  # hence the $FS and $FS90 here.
  # for fixed format f90 files we use ff90 or FF90 resp
  # but these are not expected to be the original source files
  echo 'F77_PP_SRC_FILES = $(F77_SRC_FILES:.F=.'$FS')'      >> $MAKEFILE
-Line 2657 
 Clean:
+Line 2667 
 Clean:
          @make cleanlinks
          -rm -f \$(SPECIAL_FILES)
          -rm -f genmake_state genmake_*optfile genmake_warnings genmake_errors
-         -rm -f make.log run.log f90mkdepend.log *.bak
+         -rm -f make.log run.log f90mkdepend.log *.bak "$MAKEFILE.old"
          -rm -f taf_command taf_output taf_ad.log taf_ad_flow.log
  CLEAN:
          @make Clean
-Line 2699 
 if test "x$EMBED_SRC" = xt ; then
+Line 2709 
 if test "x$EMBED_SRC" = xt ; then
  decode_files.o : EMBEDDED_FILES.h
  ##  \$(F77_PP_SRC_FILES)
  all_fF.tar.gz : \$(SPECIAL_FILES) \$(F77_SRC_FILES) \$(C_SRC_FILES) \$(H_SRC_FILES) \$(F90_SRC_FILES) \$(F77_PP_SRC_FILES) Makefile
          @echo Creating \$@ ...
          -tar -hcf all_fF.tar \$(SPECIAL_FILES) \$(F77_SRC_FILES) \$(C_SRC_FILES) \$(H_SRC_FILES) \$(F90_SRC_FILES) \$(F77_PP_SRC_FILES) Makefile

 Legend:



Removed from v.1.204
 


changed lines


 
Added in v.1.205
 Legend:



Removed from v.1.204
 


changed lines


 
Added in v.1.205
-Removed from v.1.204
+Added in v.1.205

	ViewVC Help
Powered by ViewVC 1.1.22