|
version 1.25, 2016/09/23 16:22:18
|
version 1.26, 2016/09/23 16:38:30
|
| Line 609 def parseConfig(fin, keymap, addenda, de |
|
| Line 609 def parseConfig(fin, keymap, addenda, de |
|
| raise | raise |
| | |
| if not rv: | if not rv: |
| # Always create a Rules.mk and target.mk, even if no proj XML is provided. All builds should have the proj/example and |
|
| # proj/cookbook directories. |
|
| projRules.extend(list(RULESPREFIX)) |
|
| projTarget.extend(list(TARGETPREFIX)) |
|
| |
|
| if not xml is None: | if not xml is None: |
| # Process xml. | # Process xml. |
| rv = processXML(xml, projRules, projTarget) | rv = processXML(xml, projRules, projTarget) |
| projRules.extend(RULESSUFFIX) |
|
| | |
| # Process addenda - these are parameters that are not configurable and must be set in the | # Process addenda - these are parameters that are not configurable and must be set in the |
| # NetDRMS build. | # NetDRMS build. |
| Line 1042 def configureNet(cfgfile, cfile, mfile, |
|
| Line 1036 def configureNet(cfgfile, cfile, mfile, |
|
| try: | try: |
| with open(cfgfile, 'r') as fin: | with open(cfgfile, 'r') as fin: |
| # Process configuration parameters | # Process configuration parameters |
| |
|
| |
# Always create a Rules.mk and target.mk, even if no proj XML is provided. All builds should have the proj/example and |
| |
# proj/cookbook directories. The required make information is in RULESPREFIX, TARGETPREFIX, and RULESSUFFIX. RULESSUFFIX |
| |
# must be added after the xml has been parsed. |
| |
projRules.extend(list(RULESPREFIX)) |
| |
projTarget.extend(list(TARGETPREFIX)) |
| |
|
| rv = parseConfig(fin, keymap, addenda, defs, cDefs, mDefsGen, mDefsMake, projCfg, projMkRules, projRules, projTarget, perlConstSection, perlInitSection, pyConstSection, pyInitSection, shConstSection) | rv = parseConfig(fin, keymap, addenda, defs, cDefs, mDefsGen, mDefsMake, projCfg, projMkRules, projRules, projTarget, perlConstSection, perlInitSection, pyConstSection, pyInitSection, shConstSection) |
| if not rv: | if not rv: |
| |
projRules.extend(RULESSUFFIX) |
| |
|
| # Must add a parameter for the SUMS_MANAGER UID (for some reason). This must be done after the | # Must add a parameter for the SUMS_MANAGER UID (for some reason). This must be done after the |
| # config file is processed since an input to getMgrUIDLine() is one of the config file's | # config file is processed since an input to getMgrUIDLine() is one of the config file's |
| # parameter values. | # parameter values. |
| Line 1125 def configureSdp(cfgfile, cfile, mfile, |
|
| Line 1128 def configureSdp(cfgfile, cfile, mfile, |
|
| | |
| try: | try: |
| with open(cfgfile, 'r') as fin: | with open(cfgfile, 'r') as fin: |
| |
|
| |
# Always create a Rules.mk and target.mk, even if no proj XML is provided. All builds should have the proj/example and |
| |
# proj/cookbook directories. The required make information is in RULESPREFIX, TARGETPREFIX, and RULESSUFFIX. RULESSUFFIX |
| |
# must be added after the xml has been parsed. |
| |
projRules.extend(list(RULESPREFIX)) |
| |
projTarget.extend(list(TARGETPREFIX)) |
| |
|
| rv = parseConfig(fin, None, addenda, defs, cDefs, mDefsGen, mDefsMake, projCfg, projMkRules, projRules, projTarget, perlConstSection, perlInitSection, pyConstSection, pyInitSection, shConstSection) | rv = parseConfig(fin, None, addenda, defs, cDefs, mDefsGen, mDefsMake, projCfg, projMkRules, projRules, projTarget, perlConstSection, perlInitSection, pyConstSection, pyInitSection, shConstSection) |
| | |
| if not rv: | if not rv: |
| |
projRules.extend(RULESSUFFIX) |
| |
|
| # Must add a parameter for the SUMS_MANAGER UID (for some reason) | # Must add a parameter for the SUMS_MANAGER UID (for some reason) |
| uidParam = {} | uidParam = {} |
| rv = getMgrUIDLine(defs, uidParam) | rv = getMgrUIDLine(defs, uidParam) |
Return to
localize.py
CVS log
Up to [Development] / JSOC