diff options
Diffstat (limited to 'src/engine/SCons')
| -rw-r--r-- | src/engine/SCons/Tool/cvf.py | 8 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/f77.py | 53 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/f90.py | 54 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/f95.py | 55 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/fortran.py | 35 | ||||
| -rw-r--r-- | src/engine/SCons/Tool/ifl.py | 2 |
6 files changed, 128 insertions, 79 deletions
diff --git a/src/engine/SCons/Tool/cvf.py b/src/engine/SCons/Tool/cvf.py index 15db1da..2f70078 100644 --- a/src/engine/SCons/Tool/cvf.py +++ b/src/engine/SCons/Tool/cvf.py @@ -40,10 +40,10 @@ def generate(env): fortran.generate(env) env['FORTRAN'] = 'f90' - env['FORTRANCOM'] = '$FORTRAN $FORTRANFLAGS $_FORTRANMODODFLAG $_FORTRANINCFLAGS /compile_only ${SOURCES.win32} /object:${TARGET.win32}' - env['FORTRANPPCOM'] = '$FORTRAN $FORTRANFLAGS $CPPFLAGS $_CPPDEFFLAGS $_FORTRANMODODFLAG $_FORTRANINCFLAGS /compile_only ${SOURCES.win32} /object:${TARGET.win32}' - env['SHFORTRANCOM'] = '$SHFORTRAN $SHFORTRANFLAGS $_FORTRANMODODFLAG $_FORTRANINCFLAGS /compile_only ${SOURCES.win32} /object:${TARGET.win32}' - env['SHFORTRANPPCOM'] = '$SHFORTRAN $SHFORTRANFLAGS $CPPFLAGS $_CPPDEFFLAGS $_FORTRANMODODFLAG $_FORTRANINCFLAGS /compile_only ${SOURCES.win32} /object:${TARGET.win32}' + env['FORTRANCOM'] = '$FORTRAN $FORTRANFLAGS $_FORTRANMODFLAG $_FORTRANINCFLAGS /compile_only ${SOURCES.win32} /object:${TARGET.win32}' + env['FORTRANPPCOM'] = '$FORTRAN $FORTRANFLAGS $CPPFLAGS $_CPPDEFFLAGS $_FORTRANMODFLAG $_FORTRANINCFLAGS /compile_only ${SOURCES.win32} /object:${TARGET.win32}' + env['SHFORTRANCOM'] = '$SHFORTRAN $SHFORTRANFLAGS $_FORTRANMODFLAG $_FORTRANINCFLAGS /compile_only ${SOURCES.win32} /object:${TARGET.win32}' + env['SHFORTRANPPCOM'] = '$SHFORTRAN $SHFORTRANFLAGS $CPPFLAGS $_CPPDEFFLAGS $_FORTRANMODFLAG $_FORTRANINCFLAGS /compile_only ${SOURCES.win32} /object:${TARGET.win32}' env['OBJSUFFIX'] = '.obj' env['FORTRANMODDIR'] = '${TARGET.dir}' env['FORTRANMODDIRPREFIX'] = '/module:' diff --git a/src/engine/SCons/Tool/f77.py b/src/engine/SCons/Tool/f77.py index 0651585..e0473a1 100644 --- a/src/engine/SCons/Tool/f77.py +++ b/src/engine/SCons/Tool/f77.py @@ -42,12 +42,6 @@ import fortran compilers = ['f77'] # -F77Action = SCons.Action.Action("$F77COM") -ShF77Action = SCons.Action.Action("$SHF77COM") -F77PPAction = SCons.Action.Action("$F77PPCOM") -ShF77PPAction = SCons.Action.Action("$SHF77PPCOM") - -# F77Suffixes = ['.f77'] F77PPSuffixes = [] if SCons.Util.case_sensitive_suffixes('.f77', '.F77'): @@ -62,10 +56,24 @@ for suffix in F77Suffixes + F77PPSuffixes: SCons.Defaults.ObjSourceScan.add_scanner(suffix, F77Scan) # -F77Generator = fortran.VariableListGenerator('F77', 'FORTRAN', '_FORTRAND') -F77FlagsGenerator = fortran.VariableListGenerator('F77FLAGS', 'FORTRANFLAGS') -ShF77Generator = fortran.VariableListGenerator('SHF77', 'SHFORTRAN', 'F77', 'FORTRAN', '_FORTRAND') -ShF77FlagsGenerator = fortran.VariableListGenerator('SHF77FLAGS', 'SHFORTRANFLAGS') +fVLG = fortran.VariableListGenerator + +F77Generator = fVLG('F77', 'FORTRAN', '_FORTRAND') +F77FlagsGenerator = fVLG('F77FLAGS', 'FORTRANFLAGS') +F77CommandGenerator = fVLG('F77COM', 'FORTRANCOM', '_F77COMD') +F77PPCommandGenerator = fVLG('F77PPCOM', 'FORTRANPPCOM', '_F77PPCOMD') +ShF77Generator = fVLG('SHF77', 'SHFORTRAN', 'F77', 'FORTRAN', '_FORTRAND') +ShF77FlagsGenerator = fVLG('SHF77FLAGS', 'SHFORTRANFLAGS') +ShF77CommandGenerator = fVLG('SHF77COM', 'SHFORTRANCOM', '_SHF77COMD') +ShF77PPCommandGenerator = fVLG('SHF77PPCOM', 'SHFORTRANPPCOM', '_SHF77PPCOMD') + +del fVLG + +# +F77Action = SCons.Action.Action('$_F77COMG ') +F77PPAction = SCons.Action.Action('$_F77PPCOMG ') +ShF77Action = SCons.Action.Action('$_SHF77COMG ') +ShF77PPAction = SCons.Action.Action('$_SHF77PPCOMG ') def add_to_env(env): """Add Builders and construction variables for f77 to an Environment.""" @@ -76,27 +84,32 @@ def add_to_env(env): for suffix in F77Suffixes: static_obj.add_action(suffix, F77Action) shared_obj.add_action(suffix, ShF77Action) - static_obj.add_emitter(suffix, SCons.Defaults.StaticObjectEmitter) - shared_obj.add_emitter(suffix, SCons.Defaults.SharedObjectEmitter) + static_obj.add_emitter(suffix, fortran.FortranEmitter) + shared_obj.add_emitter(suffix, fortran.ShFortranEmitter) for suffix in F77PPSuffixes: static_obj.add_action(suffix, F77PPAction) shared_obj.add_action(suffix, ShF77PPAction) - static_obj.add_emitter(suffix, SCons.Defaults.StaticObjectEmitter) - shared_obj.add_emitter(suffix, SCons.Defaults.SharedObjectEmitter) + static_obj.add_emitter(suffix, fortran.FortranEmitter) + shared_obj.add_emitter(suffix, fortran.ShFortranEmitter) - env['_F77G'] = F77Generator - env['_F77FLAGSG'] = F77FlagsGenerator - env['F77COM'] = '$_F77G $_F77FLAGSG $_F77INCFLAGS -c -o $TARGET $SOURCES' - env['F77PPCOM'] = '$_F77G $_F77FLAGSG $CPPFLAGS $_CPPDEFFLAGS $_F77INCFLAGS -c -o $TARGET $SOURCES' + env['_F77G'] = F77Generator + env['_F77FLAGSG'] = F77FlagsGenerator + env['_F77COMG'] = F77CommandGenerator + env['_F77PPCOMG'] = F77PPCommandGenerator env['_SHF77G'] = ShF77Generator env['_SHF77FLAGSG'] = ShF77FlagsGenerator - env['SHF77COM'] = '$_SHF77G $_SHF77FLAGSG $_F77INCFLAGS -c -o $TARGET $SOURCES' - env['SHF77PPCOM'] = '$_SHF77G $_SHF77FLAGSG $CPPFLAGS $_CPPDEFFLAGS $_F77INCFLAGS -c -o $TARGET $SOURCES' + env['_SHF77COMG'] = ShF77CommandGenerator + env['_SHF77PPCOMG'] = ShF77PPCommandGenerator env['_F77INCFLAGS'] = '$( ${_concat(INCPREFIX, F77PATH, INCSUFFIX, __env__, RDirs)} $)' + env['_F77COMD'] = '$_F77G $_F77FLAGSG $_F77INCFLAGS -c -o $TARGET $SOURCES' + env['_F77PPCOMD'] = '$_F77G $_F77FLAGSG $CPPFLAGS $_CPPDEFFLAGS $_F77INCFLAGS -c -o $TARGET $SOURCES' + env['_SHF77COMD'] = '$_SHF77G $_SHF77FLAGSG $_F77INCFLAGS -c -o $TARGET $SOURCES' + env['_SHF77PPCOMD'] = '$_SHF77G $_SHF77FLAGSG $CPPFLAGS $_CPPDEFFLAGS $_F77INCFLAGS -c -o $TARGET $SOURCES' + def generate(env): fortran.add_to_env(env) diff --git a/src/engine/SCons/Tool/f90.py b/src/engine/SCons/Tool/f90.py index b00a76e..47be38f 100644 --- a/src/engine/SCons/Tool/f90.py +++ b/src/engine/SCons/Tool/f90.py @@ -42,12 +42,6 @@ import fortran compilers = ['f90'] # -F90Action = SCons.Action.Action("$F90COM") -ShF90Action = SCons.Action.Action("$SHF90COM") -F90PPAction = SCons.Action.Action("$F90PPCOM") -ShF90PPAction = SCons.Action.Action("$SHF90PPCOM") - -# F90Suffixes = ['.f90'] F90PPSuffixes = [] if SCons.Util.case_sensitive_suffixes('.f90', '.F90'): @@ -62,10 +56,24 @@ for suffix in F90Suffixes + F90PPSuffixes: SCons.Defaults.ObjSourceScan.add_scanner(suffix, F90Scan) # -F90Generator = fortran.VariableListGenerator('F90', 'FORTRAN', '_FORTRAND') -F90FlagsGenerator = fortran.VariableListGenerator('F90FLAGS', 'FORTRANFLAGS') -ShF90Generator = fortran.VariableListGenerator('SHF90', 'SHFORTRAN', 'F90', 'FORTRAN', '_FORTRAND') -ShF90FlagsGenerator = fortran.VariableListGenerator('SHF90FLAGS', 'SHFORTRANFLAGS') +fVLG = fortran.VariableListGenerator + +F90Generator = fVLG('F90', 'FORTRAN', '_FORTRAND') +F90FlagsGenerator = fVLG('F90FLAGS', 'FORTRANFLAGS') +F90CommandGenerator = fVLG('F90COM', 'FORTRANCOM', '_F90COMD') +F90PPCommandGenerator = fVLG('F90PPCOM', 'FORTRANPPCOM', '_F90PPCOMD') +ShF90Generator = fVLG('SHF90', 'SHFORTRAN', 'F90', 'FORTRAN', '_FORTRAND') +ShF90FlagsGenerator = fVLG('SHF90FLAGS', 'SHFORTRANFLAGS') +ShF90CommandGenerator = fVLG('SHF90COM', 'SHFORTRANCOM', '_SHF90COMD') +ShF90PPCommandGenerator = fVLG('SHF90PPCOM', 'SHFORTRANPPCOM', '_SHF90PPCOMD') + +del fVLG + +# +F90Action = SCons.Action.Action('$_F90COMG ') +F90PPAction = SCons.Action.Action('$_F90PPCOMG ') +ShF90Action = SCons.Action.Action('$_SHF90COMG ') +ShF90PPAction = SCons.Action.Action('$_SHF90PPCOMG ') def add_to_env(env): """Add Builders and construction variables for f90 to an Environment.""" @@ -76,32 +84,36 @@ def add_to_env(env): for suffix in F90Suffixes: static_obj.add_action(suffix, F90Action) shared_obj.add_action(suffix, ShF90Action) - static_obj.add_emitter(suffix, SCons.Defaults.StaticObjectEmitter) - shared_obj.add_emitter(suffix, SCons.Defaults.SharedObjectEmitter) + static_obj.add_emitter(suffix, fortran.FortranEmitter) + shared_obj.add_emitter(suffix, fortran.ShFortranEmitter) for suffix in F90PPSuffixes: static_obj.add_action(suffix, F90PPAction) shared_obj.add_action(suffix, ShF90PPAction) - static_obj.add_emitter(suffix, SCons.Defaults.StaticObjectEmitter) - shared_obj.add_emitter(suffix, SCons.Defaults.SharedObjectEmitter) + static_obj.add_emitter(suffix, fortran.FortranEmitter) + shared_obj.add_emitter(suffix, fortran.ShFortranEmitter) - env['_F90G'] = F90Generator - env['_F90FLAGSG'] = F90FlagsGenerator - env['F90COM'] = '$_F90G $_F90FLAGSG $_F90INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' - env['F90PPCOM'] = '$_F90G $_F90FLAGSG $CPPFLAGS $_CPPDEFFLAGS $_F90INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' + env['_F90G'] = F90Generator + env['_F90FLAGSG'] = F90FlagsGenerator + env['_F90COMG'] = F90CommandGenerator + env['_F90PPCOMG'] = F90PPCommandGenerator env['_SHF90G'] = ShF90Generator env['_SHF90FLAGSG'] = ShF90FlagsGenerator - env['SHF90COM'] = '$_SHF90G $_SHF90FLAGSG $_F90INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' - env['SHF90PPCOM'] = '$_SHF90G $_SHF90FLAGSG $CPPFLAGS $_CPPDEFFLAGS $_F90INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' + env['_SHF90COMG'] = ShF90CommandGenerator + env['_SHF90PPCOMG'] = ShF90PPCommandGenerator env['_F90INCFLAGS'] = '$( ${_concat(INCPREFIX, F90PATH, INCSUFFIX, __env__, RDirs)} $)' + env['_F90COMD'] = '$_F90G $_F90FLAGSG $_F90INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' + env['_F90PPCOMD'] = '$_F90G $_F90FLAGSG $CPPFLAGS $_CPPDEFFLAGS $_F90INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' + env['_SHF90COMD'] = '$_SHF90G $_SHF90FLAGSG $_F90INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' + env['_SHF90PPCOMD'] = '$_SHF90G $_SHF90FLAGSG $CPPFLAGS $_CPPDEFFLAGS $_F90INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' def generate(env): fortran.add_to_env(env) add_to_env(env) - env['_FORTRAND'] = env.Detect(compilers) or 'f90' + env['_FORTRAND'] = env.Detect(compilers) or 'f90' def exists(env): return env.Detect(compilers) diff --git a/src/engine/SCons/Tool/f95.py b/src/engine/SCons/Tool/f95.py index 291c980..4f413a0 100644 --- a/src/engine/SCons/Tool/f95.py +++ b/src/engine/SCons/Tool/f95.py @@ -41,12 +41,6 @@ import fortran compilers = ['f95'] # -F95Action = SCons.Action.Action("$F95COM") -ShF95Action = SCons.Action.Action("$SHF95COM") -F95PPAction = SCons.Action.Action("$F95PPCOM") -ShF95PPAction = SCons.Action.Action("$SHF95PPCOM") - -# F95Suffixes = ['.f95'] F95PPSuffixes = [] if SCons.Util.case_sensitive_suffixes('.f95', '.F95'): @@ -61,10 +55,24 @@ for suffix in F95Suffixes + F95PPSuffixes: SCons.Defaults.ObjSourceScan.add_scanner(suffix, F95Scan) # -F95Generator = fortran.VariableListGenerator('F95', 'FORTRAN', '_FORTRAND') -F95FlagsGenerator = fortran.VariableListGenerator('F95FLAGS', 'FORTRANFLAGS') -ShF95Generator = fortran.VariableListGenerator('SHF95', 'SHFORTRAN', 'F95', 'FORTRAN', '_FORTRAND') -ShF95FlagsGenerator = fortran.VariableListGenerator('SHF95FLAGS', 'SHFORTRANFLAGS') +fVLG = fortran.VariableListGenerator + +F95Generator = fVLG('F95', 'FORTRAN', '_FORTRAND') +F95FlagsGenerator = fVLG('F95FLAGS', 'FORTRANFLAGS') +F95CommandGenerator = fVLG('F95COM', 'FORTRANCOM', '_F95COMD') +F95PPCommandGenerator = fVLG('F95PPCOM', 'FORTRANPPCOM', '_F95PPCOMD') +ShF95Generator = fVLG('SHF95', 'SHFORTRAN', 'F95', 'FORTRAN', '_FORTRAND') +ShF95FlagsGenerator = fVLG('SHF95FLAGS', 'SHFORTRANFLAGS') +ShF95CommandGenerator = fVLG('SHF95COM', 'SHFORTRANCOM', '_SHF95COMD') +ShF95PPCommandGenerator = fVLG('SHF95PPCOM', 'SHFORTRANPPCOM', '_SHF95PPCOMD') + +del fVLG + +# +F95Action = SCons.Action.Action('$_F95COMG ') +F95PPAction = SCons.Action.Action('$_F95PPCOMG ') +ShF95Action = SCons.Action.Action('$_SHF95COMG ') +ShF95PPAction = SCons.Action.Action('$_SHF95PPCOMG ') def add_to_env(env): """Add Builders and construction variables for f95 to an Environment.""" @@ -75,32 +83,37 @@ def add_to_env(env): for suffix in F95Suffixes: static_obj.add_action(suffix, F95Action) shared_obj.add_action(suffix, ShF95Action) - static_obj.add_emitter(suffix, SCons.Defaults.StaticObjectEmitter) - shared_obj.add_emitter(suffix, SCons.Defaults.SharedObjectEmitter) + static_obj.add_emitter(suffix, fortran.FortranEmitter) + shared_obj.add_emitter(suffix, fortran.ShFortranEmitter) for suffix in F95PPSuffixes: static_obj.add_action(suffix, F95PPAction) shared_obj.add_action(suffix, ShF95PPAction) - static_obj.add_emitter(suffix, SCons.Defaults.StaticObjectEmitter) - shared_obj.add_emitter(suffix, SCons.Defaults.SharedObjectEmitter) + static_obj.add_emitter(suffix, fortran.FortranEmitter) + shared_obj.add_emitter(suffix, fortran.ShFortranEmitter) - env['_F95G'] = F95Generator - env['_F95FLAGSG'] = F95FlagsGenerator - env['F95COM'] = '$_F95G $_F95FLAGSG $_F95INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' - env['F95PPCOM'] = '$_F95G $_F95FLAGSG $CPPFLAGS $_CPPDEFFLAGS $_F95INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' + env['_F95G'] = F95Generator + env['_F95FLAGSG'] = F95FlagsGenerator + env['_F95COMG'] = F95CommandGenerator + env['_F95PPCOMG'] = F95PPCommandGenerator env['_SHF95G'] = ShF95Generator env['_SHF95FLAGSG'] = ShF95FlagsGenerator - env['SHF95COM'] = '$_SHF95G $_SHF95FLAGSG $_F95INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' - env['SHF95PPCOM'] = '$_SHF95G $_SHF95FLAGSG $CPPFLAGS $_CPPDEFFLAGS $_F95INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' + env['_SHF95COMG'] = ShF95CommandGenerator + env['_SHF95PPCOMG'] = ShF95PPCommandGenerator env['_F95INCFLAGS'] = '$( ${_concat(INCPREFIX, F95PATH, INCSUFFIX, __env__, RDirs)} $)' + env['_F95COMD'] = '$_F95G $_F95FLAGSG $_F95INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' + env['_F95PPCOMD'] = '$_F95G $_F95FLAGSG $CPPFLAGS $_CPPDEFFLAGS $_F95INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' + env['_SHF95COMD'] = '$_SHF95G $_SHF95FLAGSG $_F95INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' + env['_SHF95PPCOMD'] = '$_SHF95G $_SHF95FLAGSG $CPPFLAGS $_CPPDEFFLAGS $_F95INCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' + def generate(env): fortran.add_to_env(env) add_to_env(env) - env['_FORTRAND'] = env.Detect(compilers) or 'f95' + env['_FORTRAND'] = env.Detect(compilers) or 'f95' def exists(env): return env.Detect(compilers) diff --git a/src/engine/SCons/Tool/fortran.py b/src/engine/SCons/Tool/fortran.py index 5e2b5eb..42a597e 100644 --- a/src/engine/SCons/Tool/fortran.py +++ b/src/engine/SCons/Tool/fortran.py @@ -44,11 +44,6 @@ import SCons.Util compilers = ['f95', 'f90', 'f77'] -FortranAction = SCons.Action.Action("$FORTRANCOM") -ShFortranAction = SCons.Action.Action("$SHFORTRANCOM") -FortranPPAction = SCons.Action.Action("$FORTRANPPCOM") -ShFortranPPAction = SCons.Action.Action("$SHFORTRANPPCOM") - # # Not yet sure how to deal with fortran pre-processor functions. # Different compilers do this differently in modern fortran. Some still @@ -85,7 +80,7 @@ def _fortranEmitter(target, source, env): suffix = env.subst('$FORTRANMODSUFFIX') modules = map(lambda x, s=suffix: string.lower(x) + s, modules) for m in modules: - target.append(m) + target.append(env.fs.File(m)) return (target, source) def FortranEmitter(target, source, env): @@ -105,23 +100,34 @@ class VariableListGenerator: except KeyError: pass return '' +# FortranGenerator = VariableListGenerator('FORTRAN', 'F77', '_FORTRAND') FortranFlagsGenerator = VariableListGenerator('FORTRANFLAGS', 'F77FLAGS') +FortranCommandGenerator = VariableListGenerator('FORTRANCOM', 'F77COM', '_FORTRANCOMD') +FortranPPCommandGenerator = VariableListGenerator('FORTRANPPCOM', 'F77PPCOM', '_FORTRANPPCOMD') ShFortranGenerator = VariableListGenerator('SHFORTRAN', 'SHF77', 'FORTRAN', 'F77', '_FORTRAND') ShFortranFlagsGenerator = VariableListGenerator('SHFORTRANFLAGS', 'SHF77FLAGS') +ShFortranCommandGenerator = VariableListGenerator('SHFORTRANCOM', 'SHF77COM', '_SHFORTRANCOMD') +ShFortranPPCommandGenerator = VariableListGenerator('SHFORTRANPPCOM', 'SHF77PPCOM', '_SHFORTRANPPCOMD') + +# +FortranAction = SCons.Action.Action('$_FORTRANCOMG ') +FortranPPAction = SCons.Action.Action('$_FORTRANPPCOMG ') +ShFortranAction = SCons.Action.Action('$_SHFORTRANCOMG ') +ShFortranPPAction = SCons.Action.Action('$_SHFORTRANPPCOMG ') def add_to_env(env): """Add Builders and construction variables for Fortran to an Environment.""" - env['_FORTRANG'] = FortranGenerator - env['_FORTRANFLAGSG'] = FortranFlagsGenerator - env['FORTRANCOM'] = '$_FORTRANG $_FORTRANFLAGSG $_FORTRANINCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' - env['FORTRANPPCOM'] = '$_FORTRANG $_FORTRANFLAGSG $CPPFLAGS $_CPPDEFFLAGS $_FORTRANINCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' + env['_FORTRANG'] = FortranGenerator + env['_FORTRANFLAGSG'] = FortranFlagsGenerator + env['_FORTRANCOMG'] = FortranCommandGenerator + env['_FORTRANPPCOMG'] = FortranPPCommandGenerator env['_SHFORTRANG'] = ShFortranGenerator env['_SHFORTRANFLAGSG'] = ShFortranFlagsGenerator - env['SHFORTRANCOM'] = '$_SHFORTRANG $_SHFORTRANFLAGSG $_FORTRANINCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' - env['SHFORTRANPPCOM'] = '$_SHFORTRANG $_SHFORTRANFLAGSG $CPPFLAGS $_CPPDEFFLAGS $_FORTRANINCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' + env['_SHFORTRANCOMG'] = ShFortranCommandGenerator + env['_SHFORTRANPPCOMG'] = ShFortranPPCommandGenerator env['_FORTRANINCFLAGS'] = '$( ${_concat(INCPREFIX, FORTRANPATH, INCSUFFIX, __env__, RDirs)} $)' @@ -149,6 +155,11 @@ def add_to_env(env): static_obj.add_emitter(suffix, FortranEmitter) shared_obj.add_emitter(suffix, ShFortranEmitter) + env['_FORTRANCOMD'] = '$_FORTRANG $_FORTRANFLAGSG $_FORTRANINCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' + env['_FORTRANPPCOMD'] = '$_FORTRANG $_FORTRANFLAGSG $CPPFLAGS $_CPPDEFFLAGS $_FORTRANINCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' + env['_SHFORTRANCOMD'] = '$_SHFORTRANG $_SHFORTRANFLAGSG $_FORTRANINCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' + env['_SHFORTRANPPCOMD'] = '$_SHFORTRANG $_SHFORTRANFLAGSG $CPPFLAGS $_CPPDEFFLAGS $_FORTRANINCFLAGS $_FORTRANMODFLAG -c -o $TARGET $SOURCES' + def generate(env): import f77 import f90 diff --git a/src/engine/SCons/Tool/ifl.py b/src/engine/SCons/Tool/ifl.py index 8d800e2..923e5ef 100644 --- a/src/engine/SCons/Tool/ifl.py +++ b/src/engine/SCons/Tool/ifl.py @@ -43,7 +43,7 @@ def generate(env): fortran.FortranSuffixes.extend(['.i90']) fortran.generate(env) - env['_FORTRAND'] = 'ifl' + env['FORTRAN'] = 'ifl' env['FORTRANCOM'] = '$FORTRAN $FORTRANFLAGS $_FORTRANINCFLAGS /c $SOURCES /Fo$TARGET' env['FORTRANPPCOM'] = '$FORTRAN $FORTRANFLAGS $CPPFLAGS $_CPPDEFFLAGS $_FORTRANINCFLAGS /c $SOURCES /Fo$TARGET' env['SHFORTRANCOM'] = '$SHFORTRAN $SHFORTRANFLAGS $_FORTRANINCFLAGS /c $SOURCES /Fo$TARGET' |