Index: mttroot/mtt/bin/mtt ================================================================== --- mttroot/mtt/bin/mtt +++ mttroot/mtt/bin/mtt @@ -15,10 +15,14 @@ ############################################################### ## Version control history ############################################################### ## $Header$ ## $Log$ +## Revision 1.368 2002/12/12 17:18:41 geraint +## Fixed [ 647664 ] Namespace clash: LANG +## Prepended MTT_ to SYS, OPTS and LANG environment variables. +## ## Revision 1.367 2002/12/09 00:14:08 geraint ## Hierarchical dia and mixed dia/fig bond graphs now working. ## ## Revision 1.366 2002/12/06 21:56:21 geraint ## Cosmetic change: removed commented-out lines. @@ -1486,10 +1490,13 @@ mtt_switches="$mtt_switches $1"; Solve='-A';; -abg ) mtt_switches="$mtt_switches $1"; start_at_abg='yes';; + -ibg ) + mtt_switches="$mtt_switches $1"; + use_ibg='yes';; -stdin ) mtt_switches="$mtt_switches $1"; stdin=stdin;; -sub ) mtt_switches="$mtt_switches $1 $2"; sub='-sub'; @@ -1590,10 +1597,11 @@ echo 'Options: -q quiet mode -- suppress MTT banner' echo ' -A solve algebraic equations symbolically' echo ' -D debug -- leave log files etc' echo ' -I prints more information' echo ' -abg start at abg.m representation' + echo ' -ibg use intermediate representation to transform rbg to abg (EXPERIMENTAL)' echo ' -c c-code generation' echo ' -cc C++ code generation' echo ' -cr Use cr before resolving equations' echo ' -d use directory ' echo ' -dr use files contained in ' @@ -2733,13 +2741,25 @@ ifneq ($start_at_abg,yes) %_abg.m: %_abg.dia %_lbl.txt %_alias.m abg_dia2m \$* (sh \$*_sub.sh "mtt $mtt_switches -q -u -l $level+1 " ' abg m null || exit 1') || exit 1 +ifneq ($use_ibg,yes) %_abg.m: %_rbg.m %_alias.m %_sub.sh %_icd.m (sh \$*_sub.sh "mtt $mtt_switches -q -u -l $level+1 " ' abg m null || exit 1') || exit 1 rbg2abg_m $info_switch \$* +else +.PRECIOUS: %_ibg.m +%_ibg.m: %_rbg.m + @echo "EXPERIMENTAL: Creating \$@" + rbg2ibg_m $info_switch \$* + +%_abg.m: %_ibg.m %_alias.m %_sub.sh %_icd.m + @echo "EXPERIMENTAL: Creating \$@" + (sh \$*_sub.sh "mtt $mtt_switches -q -u -l $level+1 " ' abg m null || exit 1') || exit 1 + ibg2abg_m $info_switch \$* +endif endif #SUMMARY cbg* causal bond graph (m) #Acausal bond graph to causal bond graph: mfile $1_cbg.m: $1_abg.m