(file) Return to configure CVS log (file) (dir) Up to [Development] / JSOC

Diff for /JSOC/configure between version 1.60 and 1.61

version 1.60, 2011/01/19 20:40:37 version 1.61, 2011/02/02 19:49:16
Line 6  echo "Machine type is $JSOC_MACHINE"
Line 6  echo "Machine type is $JSOC_MACHINE"
 echo "" echo ""
  
 set CLEAN = "no" set CLEAN = "no"
 set CHKLIBS = "no"  set PROJCONFIG = ""
 set CCMD = "c"  set CLEANCMD = "d"
 set LCMD = "l"  set CONFIGCMD = "c"
 set LOCALIZE = "L" set LOCALIZE = "L"
  
 set CUSTOMDEFSFILE = "" set CUSTOMDEFSFILE = ""
  
 foreach ARG ($argv) foreach ARG ($argv)
     set FLAG = `echo $ARG | awk '{print substr($0, 2)}'`      set FLAG = `echo $ARG | awk '{print substr($0, 2, 1)}'`
     if ($FLAG == $CCMD) then  
       if ($FLAG == $CLEANCMD) then
       set CLEAN = "yes"       set CLEAN = "yes"
     else if ($FLAG == $LCMD) then      else if ($FLAG == $CONFIGCMD) then
       set CHKLIBS = "yes"        set PROJCONFIG = `echo $ARG | awk '{print substr($0, 3)}'`
     endif     endif
 end end
  
 if ($CHKLIBS == "no") then  
     echo -n "Remove links for local project configuration..."  
     if (-d proj) then  
         cd proj  
         if (-e configure) then  
             rm configure  
         endif  
         if (-e make_basic.mk) then  
             rm make_basic.mk  
         endif  
         if (-e Rules.mk) then  
             rm Rules.mk  
         endif  
         if (-e target.mk) then  
             rm target.mk  
         endif  
         cd ..  
     endif  
     echo "done"  
   
     echo -n "Remove links to man pages..."     echo -n "Remove links to man pages..."
     if (-e man) then     if (-e man) then
         rm -rf man         rm -rf man
Line 98  if ($CHKLIBS == "no") then
Line 79  if ($CHKLIBS == "no") then
             mkdir -p include             mkdir -p include
         endif         endif
  
         echo -n "Setting links for local project configuration..."  
         if (-e suflag.txt) then  
             cd proj  
             ln -sf ../projconf/su/configure configure  
             ln -sf ../projconf/su/make_basic.mk make_basic.mk  
             ln -sf ../projconf/su/Rules.mk Rules.mk  
             ln -sf ../projconf/su/target.mk target.mk  
             cd ..  
         else  
             cd proj  
             ln -sf ../projconf/ex/configure configure  
             ln -sf ../projconf/ex/make_basic.mk make_basic.mk  
             ln -sf ../projconf/ex/Rules.mk Rules.mk  
             ln -sf ../projconf/ex/target.mk target.mk  
             cd ..  
         endif  
         echo "done"  
   
         echo "Setting links to man pages..."         echo "Setting links to man pages..."
         if (-d /home/jsoc/man) then         if (-d /home/jsoc/man) then
             if (!(-e man)) then             if (!(-e man)) then
Line 206  if ($CHKLIBS == "no") then
Line 169  if ($CHKLIBS == "no") then
             rm ${LOCALIZATIONDIR}/custom.mk             rm ${LOCALIZATIONDIR}/custom.mk
         endif         endif
  
         if (!(-e suflag.txt)) then          if (!(-e configsdp.txt)) then
             if (!(-e config.local)) then             if (!(-e config.local)) then
                 echo "Error: config.local not found. If you have a saved version of this"                 echo "Error: config.local not found. If you have a saved version of this"
                 echo "       file from a previous installation, you should copy that into"                 echo "       file from a previous installation, you should copy that into"
Line 227  if ($CHKLIBS == "no") then
Line 190  if ($CHKLIBS == "no") then
                 set CUSTOMDEFSFILE = "base/include/localization.h"                 set CUSTOMDEFSFILE = "base/include/localization.h"
  
                 # run moreconfigure.pl - this script is written in perl because it is easier to do the compiler detection                 # run moreconfigure.pl - this script is written in perl because it is easier to do the compiler detection
                 # in perl. It also reads suflag.txt (if it exists) to set the default Stanford values for certain make variables                  # in perl. It also reads configdsp.txt (if it exists) to set the default Stanford values for certain make variables
                 ./moreconfigure.pl -d${LOCALIZATIONDIR} -fcustom.mk -c${CUSTOMDEFSFILE}                 ./moreconfigure.pl -d${LOCALIZATIONDIR} -fcustom.mk -c${CUSTOMDEFSFILE}
  
                 # must follow moreconfigure.pl, because moreconfigure.pl will possibly set the compiler make variables,                 # must follow moreconfigure.pl, because moreconfigure.pl will possibly set the compiler make variables,
Line 252  if ($CHKLIBS == "no") then
Line 215  if ($CHKLIBS == "no") then
             set CUSTOMDEFSFILE = "base/include/customizeddefs.h"             set CUSTOMDEFSFILE = "base/include/customizeddefs.h"
  
             # run moreconfigure.pl - this script is written in perl because it is easier to do the compiler detection             # run moreconfigure.pl - this script is written in perl because it is easier to do the compiler detection
             # in perl. It also reads suflag.txt (if it exists) to set the default Stanford values for certain make variables              # in perl. It also reads configsdp.txt (if it exists) to set the default Stanford values for certain make variables
             ./moreconfigure.pl -d${LOCALIZATIONDIR} -fcustom.mk -c${CUSTOMDEFSFILE}             ./moreconfigure.pl -d${LOCALIZATIONDIR} -fcustom.mk -c${CUSTOMDEFSFILE}
  
             # update custom.mk with data from config.local             # update custom.mk with data from config.local
Line 261  if ($CHKLIBS == "no") then
Line 224  if ($CHKLIBS == "no") then
             ./customizemake.pl ./config.local ${LOCALIZATIONDIR}             ./customizemake.pl ./config.local ${LOCALIZATIONDIR}
         else         else
             # run moreconfigure.pl - this script is written in perl because it is easier to do the compiler detection             # run moreconfigure.pl - this script is written in perl because it is easier to do the compiler detection
             # in perl. It also reads suflag.txt (if it exists) to set the default Stanford values for certain make variables              # in perl. It also reads configsdp.txt (if it exists) to set the default Stanford values for certain make variables
             ./moreconfigure.pl -d${LOCALIZATIONDIR} -fcustom.mk             ./moreconfigure.pl -d${LOCALIZATIONDIR} -fcustom.mk
         endif         endif
  
   
           if (${PROJCONFIG} == "") then
               if (-e configsdp.txt) then
                   set PROJCONFIG = configsdp.txt
               endif
           endif
   
           if (-e configsdp.txt) then
               set PROJCONFIGEXE = "/home/jsoc/bin/linux_x86_64/perl5.12.2 configproj.pl"
           else
               set PROJCONFIGEXE = "perl"
           endif
   
           if (${PROJCONFIG} != "") then
               ${PROJCONFIGEXE} -c${PROJCONFIG} -d${LOCALIZATIONDIR}
           endif
   
         echo "Setting links to headers..."         echo "Setting links to headers..."
  
         cd base/include         cd base/include
Line 285  if ($CHKLIBS == "no") then
Line 265  if ($CHKLIBS == "no") then
         # echo "DRMS_DEFAULT_RETENTION = -10" >> custom.mk         # echo "DRMS_DEFAULT_RETENTION = -10" >> custom.mk
  
     endif     endif
 else  
 # $CHKLIBS == "yes"  
 # Enter required library names and versions here.  
   
  
 endif  
  

Legend:
Removed from v.1.60  
changed lines
  Added in v.1.61
Karen Tian
 Powered by
ViewCVS 0.9.4