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

Diff for /JSOC/configure between version 1.56 and 1.57

version 1.56, 2009/11/13 23:14:07 version 1.57, 2010/03/10 23:58:46
Line 1 
Line 1 
 #! /bin/csh -f #! /bin/csh -f
  
 if (-e custom.mk) rm custom.mk  
   
 # set up $JSOC_MACHINE # set up $JSOC_MACHINE
 set JSOC_MACHINE = `build/jsoc_machine.csh` set JSOC_MACHINE = `build/jsoc_machine.csh`
 echo "Machine type is $JSOC_MACHINE" echo "Machine type is $JSOC_MACHINE"
Line 159  if ($CHKLIBS == "no") then
Line 157  if ($CHKLIBS == "no") then
         echo "done"         echo "done"
         echo         echo
  
         # 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  
   
         ./moreconfigure.pl -fcustom.mk  
   
         echo "done"  
         echo  
   
         # generate links for DSDS/SOI dynamic libraries - only do this if         # generate links for DSDS/SOI dynamic libraries - only do this if
         # user's environment has access to /home/soi/CM         # user's environment has access to /home/soi/CM
         if (-d /home/soi/CM/include && -d /home/soi/CM/src) then         if (-d /home/soi/CM/include && -d /home/soi/CM/src) then
Line 179  if ($CHKLIBS == "no") then
Line 169  if ($CHKLIBS == "no") then
             endif             endif
         endif         endif
  
           echo "done"
           echo
   
         # Site Localization         # Site Localization
   
           # Path to the configuration file - at some point, make this an argument to the configure script
           set conflocal = "config.local"
           set LOCALIZATIONDIR = `perl -n -e 'if ($_ =~ /^LOCALIZATIONDIR\s+(.+)/) { print $1; }' $conflocal`
   
           if ($LOCALIZATIONDIR == "") then
               set LOCALIZATIONDIR = ${PWD}/localization
           endif
   
           # Eventually, dump all these generated files into a user-specified location.
           # This script will need to read the config.local file to get the
           # localization directory. Otherwise, just use JSOC/localization as the default.
           # We should put custom.mk in the localization directory too.
           if (!(-d ${LOCALIZATIONDIR})) then
               mkdir ${LOCALIZATIONDIR}
               if ($? != 0) then
                   echo "Error creating localization directory."
               endif
           endif
   
           if (-e ${LOCALIZATIONDIR}/custom.mk) then
               rm ${LOCALIZATIONDIR}/custom.mk
           endif
   
           # 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
           ./moreconfigure.pl -f${LOCALIZATIONDIR}/custom.mk
   
         if (!(-e suflag.txt)) then         if (!(-e suflag.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"
Line 195  if ($CHKLIBS == "no") then
Line 216  if ($CHKLIBS == "no") then
                 echo "    update, ensure this file is in place."                 echo "    update, ensure this file is in place."
                 exit 1;                 exit 1;
             else             else
                 echo "CUSTOM_DEFINES = __LOCALIZED_DEFS__" >> custom.mk                  echo "CUSTOM_DEFINES = __LOCALIZED_DEFS__" >> ${LOCALIZATIONDIR}/custom.mk
                 ./gen_init.csh                 ./gen_init.csh
                 ./customizemake.pl                  ./customizemake.pl ./config.local ${LOCALIZATIONDIR}
             endif             endif
         else if (-e config.local) then         else if (-e config.local) then
             # config.local is optional at Stanford, but it won't necessarily contain the same information that             # config.local is optional at Stanford, but it won't necessarily contain the same information that
Line 212  if ($CHKLIBS == "no") then
Line 233  if ($CHKLIBS == "no") then
             # items included in config.local to override those defined in serverdefs.h, but not all             # items included in config.local to override those defined in serverdefs.h, but not all
             # items need be specified in config.local.             # items need be specified in config.local.
             ./customizedefs.pl             ./customizedefs.pl
             echo "CUSTOM_DEFINES = __CUSTOMIZED_DEFS__" >> custom.mk              echo "CUSTOM_DEFINES = __CUSTOMIZED_DEFS__" >> ${LOCALIZATIONDIR}/custom.mk
  
             # update custom.mk with data from config.local             # update custom.mk with data from config.local
             ./customizemake.pl              ./customizemake.pl ./config.local ${LOCALIZATIONDIR}
         endif         endif
  
         echo "Setting links to headers..."         echo "Setting links to headers..."

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