ViewVC Help

View File | Revision Log | Show Annotations | Root Listing

root/JSOC/localize.py

Comparing localize.py (file contents):
Revision 1.8 by arta, Wed Nov 13 19:38:37 2013 UTC vs.
Revision 1.9 by arta, Fri Nov 15 17:05:49 2013 UTC

#	Line 42 | Line 42 | PERL_FXNS_A = """sub new
42		};
43
44		bless($self, $clname);
45	<	$self->{_paramsH} = $self->initialize();
45	>	$self->{_paramsH} = {};
46	>	$self->initialize();
47
48		return $self;
49		}
#	Line 259 | Line 260 | def processParam(cfgfile, line, regexpQu
260		# constants (the names of which are the parameter names)
261		# we can refer to those in the init section. The key variable holds the
262		# name of the constant.
263	<	perlInitSection.extend(list('\n  $self->{_paramsH}->{' + key + '} = ' + "'" + val + "';"))
263	>	perlInitSection.extend(list("\n  $self->{_paramsH}->{'" + key + "'} = " + key + ';'))
264		else:
265		# No quote qualifier
266		raise Exception('missingQuoteQual', key)
#	Line 651 | Line 652 | def configureComps(defs, mDefs):
652		mDefs.extend(list('\nFCOMPILER = gfortran'))
653
654		# Environment overrides. These get written, regardless of the disposition of auto-configuration.
655	<	mDefs.extend(list('\nifneq ($(JSOC_COMPILER,))\n  COMPILER = $(JSOC_COMPILER)\nendif'))
656	<	mDefs.extend(list('\nifneq ($(JSOC_FCOMPILER,))\n  FCOMPILER = $(JSOC_FCOMPILER)\nendif'))
655	>	mDefs.extend(list('\nifneq ($(JSOC_COMPILER),)\n  COMPILER = $(JSOC_COMPILER)\nendif'))
656	>	mDefs.extend(list('\nifneq ($(JSOC_FCOMPILER),)\n  FCOMPILER = $(JSOC_FCOMPILER)\nendif'))
657
658		return rv
659

Diff Legend

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