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

Diff for /JSOC/configure between version 1.57 and 1.60

version 1.57, 2010/03/10 23:58:46 version 1.60, 2011/01/19 20:40:37
Line 11  set CCMD = "c"
Line 11  set CCMD = "c"
 set LCMD = "l" set LCMD = "l"
 set LOCALIZE = "L" set LOCALIZE = "L"
  
   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)}'`
     if ($FLAG == $CCMD) then     if ($FLAG == $CCMD) then
Line 135  if ($CHKLIBS == "no") then
Line 137  if ($CHKLIBS == "no") then
         # Util scripts         # Util scripts
         find ../base/util/scripts -mindepth 1 \( -path \*CVS -prune -o -exec ln -s {} . \; -a -exec echo "  " {} " OK" \; \) -o -exec echo "  " {} " ERROR - couldn't create link" \;         find ../base/util/scripts -mindepth 1 \( -path \*CVS -prune -o -exec ln -s {} . \; -a -exec echo "  " {} " OK" \; \) -o -exec echo "  " {} " ERROR - couldn't create link" \;
  
           # Export scripts
           find ../base/export/scripts -mindepth 1 \( -path \*CVS -prune -o -exec ln -s {} . \; -a -exec echo "  " {} " OK" \; \) -o -exec echo "  " {} " ERROR - couldn't create link" \;
   
         # DRMS / IDL-interface scripts         # DRMS / IDL-interface scripts
         find ../base/drms/scripts -mindepth 1 \( -path \*CVS -prune -o -exec ln -s {} . \; -a -exec echo "  " {} " OK" \; \) -o -exec echo "  " {} " ERROR - couldn't create link" \;         find ../base/drms/scripts -mindepth 1 \( -path \*CVS -prune -o -exec ln -s {} . \; -a -exec echo "  " {} " OK" \; \) -o -exec echo "  " {} " ERROR - couldn't create link" \;
  
Line 175  if ($CHKLIBS == "no") then
Line 180  if ($CHKLIBS == "no") then
         # Site Localization         # Site Localization
  
         # Path to the configuration file - at some point, make this an argument to the configure script         # Path to the configuration file - at some point, make this an argument to the configure script
           set LOCALIZATIONDIR = ""
         set conflocal = "config.local"         set conflocal = "config.local"
   
           if (-e $conflocal) then
         set LOCALIZATIONDIR = `perl -n -e 'if ($_ =~ /^LOCALIZATIONDIR\s+(.+)/) { print $1; }' $conflocal`         set LOCALIZATIONDIR = `perl -n -e 'if ($_ =~ /^LOCALIZATIONDIR\s+(.+)/) { print $1; }' $conflocal`
           endif
  
         if ($LOCALIZATIONDIR == "") then         if ($LOCALIZATIONDIR == "") then
             set LOCALIZATIONDIR = ${PWD}/localization             set LOCALIZATIONDIR = ${PWD}/localization
Line 197  if ($CHKLIBS == "no") then
Line 206  if ($CHKLIBS == "no") then
             rm ${LOCALIZATIONDIR}/custom.mk             rm ${LOCALIZATIONDIR}/custom.mk
         endif         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 218  if ($CHKLIBS == "no") then
Line 223  if ($CHKLIBS == "no") then
             else             else
                 echo "CUSTOM_DEFINES = __LOCALIZED_DEFS__" >> ${LOCALIZATIONDIR}/custom.mk                 echo "CUSTOM_DEFINES = __LOCALIZED_DEFS__" >> ${LOCALIZATIONDIR}/custom.mk
                 ./gen_init.csh                 ./gen_init.csh
   
                   set CUSTOMDEFSFILE = "base/include/localization.h"
   
                   # 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 -d${LOCALIZATIONDIR} -fcustom.mk -c${CUSTOMDEFSFILE}
   
                   # must follow moreconfigure.pl, because moreconfigure.pl will possibly set the compiler make variables,
                   # which are then referenced by lines in custom.mk generated by customizemake.pl.
                 ./customizemake.pl ./config.local ${LOCALIZATIONDIR}                 ./customizemake.pl ./config.local ${LOCALIZATIONDIR}
             endif             endif
         else if (-e config.local) then         else if (-e config.local) then
Line 232  if ($CHKLIBS == "no") then
Line 246  if ($CHKLIBS == "no") then
             # most of which are relevant only to non-SU NetDRMS sites). This script causes all             # most of which are relevant only to non-SU NetDRMS sites). This script causes all
             # 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  
             echo "CUSTOM_DEFINES = __CUSTOMIZED_DEFS__" >> ${LOCALIZATIONDIR}/custom.mk             echo "CUSTOM_DEFINES = __CUSTOMIZED_DEFS__" >> ${LOCALIZATIONDIR}/custom.mk
               ./customizedefs.pl
   
               set CUSTOMDEFSFILE = "base/include/customizeddefs.h"
   
               # 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 -d${LOCALIZATIONDIR} -fcustom.mk -c${CUSTOMDEFSFILE}
  
             # update custom.mk with data from config.local             # update custom.mk with data from config.local
               # must follow moreconfigure.pl, because moreconfigure.pl will possibly set the compiler make variables,
               # which are then referenced by lines in custom.mk generated by customizemake.pl.
             ./customizemake.pl ./config.local ${LOCALIZATIONDIR}             ./customizemake.pl ./config.local ${LOCALIZATIONDIR}
           else
               # 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 -d${LOCALIZATIONDIR} -fcustom.mk
         endif         endif
  
         echo "Setting links to headers..."         echo "Setting links to headers..."

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