ViewVC Help
View File | Revision Log | Show Annotations | Root Listing
root/JSOC/build/buildprod.py
(Generate patch)

Comparing build/buildprod.py (file contents):
Revision 1.9 by arta, Fri May 20 15:07:23 2016 UTC vs.
Revision 1.10 by arta, Tue May 24 18:29:23 2016 UTC

# Line 76 | Line 76 | os.environ['JSOC_DEBUG'] = '0'
76   # Make sure the JSOCROOT is PROD_ROOTDIR + '/JSOC'
77   os.environ['JSOCROOT'] = PROD_ROOTDIR + '/JSOC'
78  
79 – # Unset 'GLOBALHSTAGOVERRIDE'
80 – if 'GLOBALHSTAGOVERRIDE' in os.environ:
81 –    del os.environ['GLOBALHSTAGOVERRIDE']
82 –
79   try:
80      with Chdir(PROD_ROOTDIR + '/' + WAYSTATION + '/JSOC') as ret:
81          # os.chdir does NOT change the environment variable $PWD. But our make system relies on PWD being the current directory.
82          os.environ['PWD'] = os.path.realpath(os.getcwd())
83 +        
84 +        # Set 'GLOBALHSTAGOVERRIDE'
85 +        if 'GLOBALHSTAGOVERRIDE' in os.environ:
86 +            del os.environ['GLOBALHSTAGOVERRIDE']
87 +        os.environ['GLOBALHSTAGOVERRIDE'] = 'globalhs'
88  
89          if optD['full']:
90              cmdList = ['./configure']
# Line 96 | Line 97 | try:
97          cmdList = ['/usr/bin/make', 'dsds']
98          check_call(cmdList)
99          if optD['full']:
100 +            # Unset 'GLOBALHSTAGOVERRIDE'
101 +            if 'GLOBALHSTAGOVERRIDE' in os.environ:
102 +                del os.environ['GLOBALHSTAGOVERRIDE']
103 +
104              cmdList = ['/usr/bin/make', 'globalhs',]
105              check_call(cmdList)
106  

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines