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

Diff for /JSOC/configure between version 1.76 and 1.79

version 1.76, 2013/11/22 02:55:04 version 1.79, 2014/02/12 19:25:42
Line 1 
Line 1 
 #! /bin/csh -f #! /bin/csh -f
  
 # system configuration for configure script  # The system configuration for configure script
 set PERLBIN = "" set PERLBIN = ""
 set PYBIN = "" set PYBIN = ""
  
Line 28  echo ""
Line 28  echo ""
 set CLEAN = "no" set CLEAN = "no"
 set PROJCONFIG = "" set PROJCONFIG = ""
 set CLEANCMD = "d" set CLEANCMD = "d"
   set CFGSERVER = "no"
   set CFGSERVERARG = "s"
 set CUSTOMDEFSFILE = "" set CUSTOMDEFSFILE = ""
  
 foreach THEARG ($argv) foreach THEARG ($argv)
Line 37  foreach THEARG ($argv)
Line 38  foreach THEARG ($argv)
  
     if ($FLAG == $CLEANCMD) then     if ($FLAG == $CLEANCMD) then
         set CLEAN = "yes"         set CLEAN = "yes"
       else if ($FLAG == $CFGSERVERARG) then
           set CFGSERVER = "yes"
     else if (-e $THEARG) then     else if (-e $THEARG) then
         set PROJCONFIG = $THEARG         set PROJCONFIG = $THEARG
     endif     endif
Line 163  endif
Line 166  endif
  
         # 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 LOCALIZATIONDIR = ""
           set RELLOCALIZATIONDIR = ""
         set conflocal = "config.local"         set conflocal = "config.local"
  
         if (-e $conflocal) then         if (-e $conflocal) then
             set LOCALIZATIONDIR = `perl -n -e 'if ($_ =~ /^LOCALIZATIONDIR\s+(.+)/) { print $1; }' $conflocal`              set RELLOCALIZATIONDIR = `perl -n -e 'if ($_ =~ /^LOCALIZATIONDIR\s+(.+)/) { print $1; }' $conflocal`
         endif         endif
  
         if ($LOCALIZATIONDIR == "") then         if ($LOCALIZATIONDIR == "") then
             set LOCALIZATIONDIR = localization              set RELLOCALIZATIONDIR = localization
         endif         endif
  
         # Make the path absoluate         # Make the path absoluate
         set LOCALIZATIONDIR = ${PWD}/${LOCALIZATIONDIR}          set LOCALIZATIONDIR = ${PWD}/${RELLOCALIZATIONDIR}
  
         # Eventually, dump all these generated files into a user-specified location.         # Eventually, dump all these generated files into a user-specified location.
         # This script will need to read the config.local file to get the         # This script will need to read the config.local file to get the
Line 222  endif
Line 226  endif
         endif         endif
  
         # We now call localize.py for both Stanford and NetDRMS builds.         # We now call localize.py for both Stanford and NetDRMS builds.
           if ($CFGSERVER == "yes") then
               $PYBIN ./localize.py -d ${LOCALIZATIONDIR} -b drmsparams -s
           else
         $PYBIN ./localize.py -d ${LOCALIZATIONDIR} -b drmsparams         $PYBIN ./localize.py -d ${LOCALIZATIONDIR} -b drmsparams
           endif
  
         echo "Setting links to scripts..."         echo "Setting links to scripts..."
         cd scripts         cd scripts
Line 257  endif
Line 265  endif
         # If we make a link from JSOC/base/drms/apps/serverdefs.h to ${LOCALIZATIONDIR}/drmsparams.h, then the script below will make links from         # If we make a link from JSOC/base/drms/apps/serverdefs.h to ${LOCALIZATIONDIR}/drmsparams.h, then the script below will make links from
         # JSOC/base/include/serverdefs.h and JSOC/include/serverdefs.h to JSOC/base/drms/apps/serverdefs.h, which then links to ${LOCALIZATIONDIR}/drmsparams.h.         # JSOC/base/include/serverdefs.h and JSOC/include/serverdefs.h to JSOC/base/drms/apps/serverdefs.h, which then links to ${LOCALIZATIONDIR}/drmsparams.h.
         cd base/drms/apps         cd base/drms/apps
             ln -s ../../../${LOCALIZATIONDIR}/drmsparams.h serverdefs.h              ln -s ../../../${RELLOCALIZATIONDIR}/drmsparams.h serverdefs.h
         cd ../../..         cd ../../..
  
         cd base/include         cd base/include
             ln -s ../../../${LOCALIZATIONDIR}/drmsparams.h localization.h              ln -s ../../../${RELLOCALIZATIONDIR}/drmsparams.h localization.h
         cd ../..         cd ../..
  
         cd base/include         cd base/include


Legend:
Removed from v.1.76  
changed lines
  Added in v.1.79

Karen Tian
Powered by
ViewCVS 0.9.4