/[MITgcm]/MITgcm/tools/genmake2
ViewVC logotype

Diff of /MITgcm/tools/genmake2

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

revision 1.11.2.1 by adcroft, Wed Oct 1 18:44:48 2003 UTC revision 1.11.2.7 by edhill, Thu Oct 2 18:20:45 2003 UTC
# Line 11  Line 11 
11  # Search for particular CPP #cmds associated with packages  # Search for particular CPP #cmds associated with packages
12  # usage: test_for_package_in_cpp_options CPP_file package_name  # usage: test_for_package_in_cpp_options CPP_file package_name
13  test_for_package_in_cpp_options() {  test_for_package_in_cpp_options() {
14     cpp_options=$1      cpp_options=$1
15     pkg=$2      pkg=$2
16     grep -i "#define.*ALLOW_$pkg" $cpp_options > /dev/null 2>&1      grep -i "#define.*ALLOW_$pkg" $cpp_options > /dev/null 2>&1
17     RETVAL=$?      RETVAL=$?
18     if test "x${RETVAL}" = x0 ; then      if test "x${RETVAL}" = x0 ; then
19        echo "Error: In $cpp_options there is an illegal line: #define ALLOW_$pkg"          echo "Error: In $cpp_options there is an illegal line: #define ALLOW_$pkg"
20        exit 99          exit 99
21     fi      fi
22     grep -i "#undef.*ALLOW_$pkg" $cpp_options > /dev/null 2>&1      grep -i "#undef.*ALLOW_$pkg" $cpp_options > /dev/null 2>&1
23     RETVAL=$?      RETVAL=$?
24     if test "x${RETVAL}" = x0 ; then      if test "x${RETVAL}" = x0 ; then
25        echo "Error: In $cpp_options there is an illegal line: #undef ALLOW_$pkg"          echo "Error: In $cpp_options there is an illegal line: #undef ALLOW_$pkg"
26        exit 99          exit 99
27     fi      fi
28     grep -i "#define.*DISABLE_$pkg" $cpp_options > /dev/null 2>&1      grep -i "#define.*DISABLE_$pkg" $cpp_options > /dev/null 2>&1
29     RETVAL=$?      RETVAL=$?
30     if test "x${RETVAL}" = x0 ; then      if test "x${RETVAL}" = x0 ; then
31        echo "Error: In $cpp_options there is an illegal line: #define DISABLE_$pkg"          echo "Error: In $cpp_options there is an illegal line: #define DISABLE_$pkg"
32        exit 99          exit 99
33     fi      fi
34     grep -i "#undef.*DISABLE_$pkg" $cpp_options > /dev/null 2>&1      grep -i "#undef.*DISABLE_$pkg" $cpp_options > /dev/null 2>&1
35     RETVAL=$?      RETVAL=$?
36     if test "x${RETVAL}" = x0 ; then      if test "x${RETVAL}" = x0 ; then
37        echo "Error: In $cpp_options there is an illegal line: #undef DISABLE_$pkg"          echo "Error: In $cpp_options there is an illegal line: #undef DISABLE_$pkg"
38        exit 99          exit 99
39     fi     fi
40  }  }
41    
42    # Read the $ROOTDIR/pkg/pkg_groups file and expand any references to
43    # the package list.
44    expand_pkg_groups() {
45        new_packages=
46        PKG_GROUPS=$ROOTDIR"/pkg/pkg_groups"
47        if test -r $PKG_GROUPS ; then
48            cat $PKG_GROUPS | sed -e 's/#.*$//g' | sed -e 's/:/ : /g' > ./p1.tmp
49            cat ./p1.tmp | awk '(NF>2 && $2==":"){ print $0 }' > ./p2.tmp
50            matched=0
51            for i in $PACKAGES ; do
52                line=`grep $i ./p2.tmp`
53                RETVAL=$?
54                if test "x$RETVAL" = x0 ; then
55                    matched=1
56                    replace=`echo $line | awk '{ $1=""; $2=""; print $0 }'`
57                    echo "    replacing \"$i\" with: $replace"
58                    new_packages="$new_packages $replace"
59                else
60                    new_packages="$new_packages $i"
61                fi
62            done
63            PACKAGES=$new_packages
64            rm -f ./p[1,2].tmp
65        else
66            echo "Warning: can't read package groups definition file: $PKG_GROUPS"
67        fi
68    }
69    
70  # Guess possible config options for this host  # Guess possible config options for this host
71  find_possible_configs()  {  find_possible_configs()  {
# Line 634  fi Line 661  fi
661  source ./.pd_tmp  source ./.pd_tmp
662  rm -f ./.pd_tmp  rm -f ./.pd_tmp
663    
664    #  Search for default packages.  Note that a "$ROOTDIR/pkg/pkg_groups"
665    #  file should eventually be added so that, for convenience, one can
666    #  specify groups of packages using names like "ocean" and "atmosphere".
667  echo  -n "  checking default package list:  "  echo  -n "  checking default package list:  "
668  if test "x${PDEFAULT}" = x ; then  if test "x${PDEFAULT}" = x ; then
669        for i in "." $MODS ; do
670            if test -r $i"/packages.conf" ; then
671                    PDEFAULT=$i"/packages.conf"
672                    break
673            fi
674        done
675    fi
676    if test "x${PDEFAULT}" = x ; then
677      PDEFAULT="$ROOTDIR/pkg/pkg_default"      PDEFAULT="$ROOTDIR/pkg/pkg_default"
678  fi  fi
679  if test "x${PDEFAULT}" = xNONE ; then  if test "x${PDEFAULT}" = xNONE ; then
# Line 657  else Line 695  else
695          for i in $def ; do          for i in $def ; do
696              PACKAGES="$PACKAGES $i"              PACKAGES="$PACKAGES $i"
697          done          done
698          echo "    packages are:  $PACKAGES"          echo "    before group expansion packages are: $PACKAGES"
699            expand_pkg_groups
700            echo "    after group expansion packages are:  $PACKAGES"
701      fi      fi
702  fi  fi
703    
# Line 793  done Line 833  done
833  # echo  # echo
834    
835  # Create a list of #define and #undef to enable/disable packages  # Create a list of #define and #undef to enable/disable packages
836  PACKAGES_DOT_H=PACKAGES.h  PACKAGES_DOT_H=PACKAGES_CONF.h
837  if test -e $PACKAGES_DOT_H ; then  cat <<EOF >$PACKAGES_DOT_H".tmp"
     if test ! -e $PACKAGES_DOT_H.bak ; then  
         cp -f $PACKAGES_DOT_H $PACKAGES_DOT_H.bak  
     fi  
     cat $PACKAGES_DOT_H \  
         | awk 'BEGIN{p=1;} ($1=="C===" && $2=="GENMAKE"){p=0;} {if (p==1) print $0}' \  
         > $PACKAGES_DOT_H.tmp  
 fi  
 cat <<EOF >>$PACKAGES_DOT_H.tmp  
838  C=== GENMAKE v2 ===  C=== GENMAKE v2 ===
839  C  The following defines have been set by GENMAKE, so please do not  C  The following defines have been set by GENMAKE, so please do not
840  C  edit anything below these comments.  In general, you should  C  edit anything below these comments.  In general, you should
841  C  add or remove packages by re-running genmake with different  C  add or remove packages by re-running genmake with different
842  C  "-enable" and/or "-disable" options.  C  "-enable" and/or "-disable" options.
843    
844    #ifndef PACKAGES_H
845    #define PACKAGES_H
846    
847  C  Packages disabled by genmake:  C  Packages disabled by genmake:
848  EOF  EOF
849  #  The following UGLY HACK sets multiple "#undef"s and it needs to go  #  The following UGLY HACK sets multiple "#undef"s and it needs to go
# Line 828  for n in $names ; do Line 863  for n in $names ; do
863          done          done
864          if test "x$has_pack" = xf ; then          if test "x$has_pack" = xf ; then
865              undef=`echo "ALLOW_$n" | awk '{print toupper($0)}'`              undef=`echo "ALLOW_$n" | awk '{print toupper($0)}'`
866              echo "#undef $undef" >> $PACKAGES_DOT_H.tmp              echo "#undef $undef" >> $PACKAGES_DOT_H".tmp"
867  #           DEFINES="$DEFINES -U$undef"  #           DEFINES="$DEFINES -U$undef"
868    
869  #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!  #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!
# Line 848  for n in $names ; do Line 883  for n in $names ; do
883          fi          fi
884      fi      fi
885  done  done
886  cat <<EOF >>$PACKAGES_DOT_H.tmp  cat <<EOF >>$PACKAGES_DOT_H".tmp"
887    
888  C  Packages enabled by genmake:  C  Packages enabled by genmake:
889  EOF  EOF
890  for i in $PACKAGES ; do  for i in $PACKAGES ; do
891      def=`echo "ALLOW_$i" | awk '{print toupper($0)}'`      def=`echo "ALLOW_$i" | awk '{print toupper($0)}'`
892      echo "#define $def" >> $PACKAGES_DOT_H.tmp      echo "#define $def" >> $PACKAGES_DOT_H".tmp"
893      DEFINES="$DEFINES -D$def"  #eh3 DEFINES="$DEFINES -D$def"
894    
895  #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!  #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!
896      case $i in      case $i in
897          aim_v23)          aim_v23)
898              echo "#define   ALLOW_AIM" >> $PACKAGES_DOT_H.tmp              echo "#define   ALLOW_AIM" >> $PACKAGES_DOT_H".tmp"
899              DEFINES="$DEFINES -DALLOW_AIM"              DEFINES="$DEFINES -DALLOW_AIM"
900              echo "Warning: ALLOW_AIM is set to enable aim_v23. This is REALLY ugly Jean-Michel :-)"              echo "Warning: ALLOW_AIM is set to enable aim_v23. This is REALLY ugly Jean-Michel :-)"
901              ;;              ;;
902      esac      esac
903  #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!  #EH3  WARNING :  This is an UGLY HACK that needs to be removed!!!
904    
905  done  done
906  mv -f $PACKAGES_DOT_H.tmp $PACKAGES_DOT_H  cat <<EOF >>$PACKAGES_DOT_H".tmp"
907    
908    #endif /* PACKAGES_H */
909    EOF
910    
911    if test ! -f $PACKAGES_DOT_H ; then
912        mv -f $PACKAGES_DOT_H".tmp" $PACKAGES_DOT_H
913    else
914        cmp $PACKAGES_DOT_H".tmp" $PACKAGES_DOT_H
915        RETVAL=$?
916        if test "x$RETVAL" = x0 ; then
917            rm -f $PACKAGES_DOT_H".tmp"
918        else
919            mv -f $PACKAGES_DOT_H $PACKAGES_DOT_H".bak"
920            mv -f $PACKAGES_DOT_H".tmp" $PACKAGES_DOT_H
921        fi
922    fi
923    
924  echo "  Adding STANDARDDIRS"  echo "  Adding STANDARDDIRS"
925  BUILDDIR=${BUILDDIR:-.}  BUILDDIR=${BUILDDIR:-.}
# Line 892  for d in $STANDARDDIRS ; do Line 943  for d in $STANDARDDIRS ; do
943      fi      fi
944  done  done
945    
946  echo "  Searching for CPP_OPTIONS.h (macros and flags for configuring the model):"  echo " Searching for CPP_OPTIONS.h in order to warn about the presence"
947    echo " of \"#define ALLOW_PKGNAME\"-type statements:"
948  CPP_OPTIONS=  CPP_OPTIONS=
949  spaths=". $INCLUDEDIRS"  spaths=". $INCLUDEDIRS"
950  for i in $spaths ; do  for i in $spaths ; do
# Line 901  for i in $spaths ; do Line 953  for i in $spaths ; do
953      if test -f $try -a -r $try ; then      if test -f $try -a -r $try ; then
954          echo "    found CPP_OPTIONS=\"$try\""          echo "    found CPP_OPTIONS=\"$try\""
955          CPP_OPTIONS="$try"          CPP_OPTIONS="$try"
 #aja    if test "x$i" != "x." ; then  
 #aja        cp -f $CPP_OPTIONS .  
 #aja    fi  
956          break          break
957      fi      fi
958  done  done
# Line 983  echo "" >> csrclist.inc Line 1032  echo "" >> csrclist.inc
1032  echo "" >> f90srclist.inc  echo "" >> f90srclist.inc
1033  echo "" >> hlist.inc  echo "" >> hlist.inc
1034    
 echo $DEFINES  
   
1035  if test -e $MAKEFILE ; then  if test -e $MAKEFILE ; then
1036      mv -f $MAKEFILE "$MAKEFILE.bak"      mv -f $MAKEFILE "$MAKEFILE.bak"
1037  fi  fi
# Line 1106  clean: Line 1153  clean:
1153  Clean:  Clean:
1154          @make clean          @make clean
1155          @make cleanlinks          @make cleanlinks
1156          -rm -f Makefile.bak gm_state gm_optfile make.log PACKAGES.h*          -rm -f Makefile.bak gm_state gm_optfile make.log
1157  CLEAN:  CLEAN:
1158          @make Clean          @make Clean
1159          -find \$(EXEDIR) -name "*.meta" -exec rm {} \;          -find \$(EXEDIR) -name "*.meta" -exec rm {} \;

Legend:
Removed from v.1.11.2.1  
changed lines
  Added in v.1.11.2.7

  ViewVC Help
Powered by ViewVC 1.1.22