(file) Return to buildprod.py CVS log (file) (dir) Up to [Development] / JSOC / build

Diff for /JSOC/build/buildprod.py between version 1.9 and 1.10

version 1.9, 2016/05/20 15:07:23 version 1.10, 2016/05/24 18:29:23
Line 76  os.environ['JSOC_DEBUG'] = '0'
Line 76  os.environ['JSOC_DEBUG'] = '0'
 # Make sure the JSOCROOT is PROD_ROOTDIR + '/JSOC' # Make sure the JSOCROOT is PROD_ROOTDIR + '/JSOC'
 os.environ['JSOCROOT'] = PROD_ROOTDIR + '/JSOC' os.environ['JSOCROOT'] = PROD_ROOTDIR + '/JSOC'
  
 # Unset 'GLOBALHSTAGOVERRIDE'  
 if 'GLOBALHSTAGOVERRIDE' in os.environ:  
     del os.environ['GLOBALHSTAGOVERRIDE']  
   
 try: try:
     with Chdir(PROD_ROOTDIR + '/' + WAYSTATION + '/JSOC') as ret:     with Chdir(PROD_ROOTDIR + '/' + WAYSTATION + '/JSOC') as ret:
         # os.chdir does NOT change the environment variable $PWD. But our make system relies on PWD being the current directory.         # os.chdir does NOT change the environment variable $PWD. But our make system relies on PWD being the current directory.
         os.environ['PWD'] = os.path.realpath(os.getcwd())         os.environ['PWD'] = os.path.realpath(os.getcwd())
  
           # Set 'GLOBALHSTAGOVERRIDE'
           if 'GLOBALHSTAGOVERRIDE' in os.environ:
               del os.environ['GLOBALHSTAGOVERRIDE']
           os.environ['GLOBALHSTAGOVERRIDE'] = 'globalhs'
   
         if optD['full']:         if optD['full']:
             cmdList = ['./configure']             cmdList = ['./configure']
         else:         else:
Line 96  try:
Line 97  try:
         cmdList = ['/usr/bin/make', 'dsds']         cmdList = ['/usr/bin/make', 'dsds']
         check_call(cmdList)         check_call(cmdList)
         if optD['full']:         if optD['full']:
               # Unset 'GLOBALHSTAGOVERRIDE'
               if 'GLOBALHSTAGOVERRIDE' in os.environ:
                   del os.environ['GLOBALHSTAGOVERRIDE']
   
             cmdList = ['/usr/bin/make', 'globalhs',]             cmdList = ['/usr/bin/make', 'globalhs',]
             check_call(cmdList)             check_call(cmdList)
  


Legend:
Removed from v.1.9  
changed lines
  Added in v.1.10

Karen Tian
Powered by
ViewCVS 0.9.4