Overview
Comment:Comment out conflicts - hope I got this right!
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | origin/master | trunk
Files: files | file ages | folders
SHA3-256: 5bd32bdcb6afed00c114753310d216b30b2b608dbe735efa73ff8ea5971d725d
User & Date: gawthrop@users.sourceforge.net on 2013-07-21 23:03:40
Other Links: branch diff | manifest | tags
Context
2013-07-21
23:57:44
Sorted out conflict. check-in: f46546cd1f user: gawthrop@users.sourceforge.net tags: origin/master, trunk
23:03:40
Comment out conflicts - hope I got this right! check-in: 5bd32bdcb6 user: gawthrop@users.sourceforge.net tags: origin/master, trunk
2013-07-19
06:54:16
No alpha sort added. check-in: 15f141eae1 user: gawthrop@users.sourceforge.net tags: origin/master, trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified mttroot/mtt/bin/mttrc from [48e6f8d2db] to [38af940af8].

︙
11
12
13
14
15
16
17




18
19
20
21
22
23
24

11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28








+
+
+
+










###############################################################
## Version control history
###############################################################
## $Id$
## $Log$
## Revision 1.45  2009/06/26 01:08:49  geraint
## Octave load path no longer accepts trailing // as recursive.
## Path is now calculated using find, which is much quicker than Octave's genpath()
##
## Revision 1.44  2006/04/25 23:24:29  geraint
## Reverted to simple g++ for MTT_CXX. Trying to force the version causes library problems.
##
## Revision 1.43  2006/02/09 23:49:40  geraint
## added rtxi build flags
##
## Revision 1.42  2005/11/16 00:43:15  geraint
︙
198
199
200
201
202
203
204







205
206
207
208
209
210
211
212
213
214
215

216



217


218
219
220


221
222
223
224
225
226
227

202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231

232
233
234
235

236
237
238
239
240
241
242
243
244








+
+
+
+
+
+
+











+

+
+
+
-
+
+


-
+
+








  export MTT_CRS=$MTT_LIB/cr
  export MTT_EXAMPLES=$MTT_LIB/examples
  export MTT_REP=$MTT_LIB/rep
  
  export PATH=$PATH\:$MTTPATH\:$MTTPATH/trans\:$MTT_CC\:$MTT_REP
  
  #Setup octave
##<<<<<<< mttrc
##  export MATRIX_PATH=$MTTPATH/trans/m/
##  export MATRIX_PATH=$MATRIX_PATH\:$MTT_LIB/comp/simple/
##  export MATRIX_PATH=$MATRIX_PATH\:$MTT_LIB/control/
##  export MATRIX_PATH=$MATRIX_PATH\:$MTT_LIB/octave/\:\:
  
##=======
  MATRIX="octave"
  #MATRIX_PATH1=$(echo "genpath('$MTTPATH/trans/m')"     |$MATRIX -q | awk '{print $3}') 
  #MATRIX_PATH2=$(echo "genpath('$MTT_LIB/comp/simple')" |$MATRIX -q | awk '{print $3}') 
  #MATRIX_PATH3=$(echo "genpath('$MTT_LIB/control')"     |$MATRIX -q | awk '{print $3}') 
  #MATRIX_PATH4=$(echo "genpath('$MTT_LIB/octave')"      |$MATRIX -q | awk '{print $3}') 
  #export MATRIX_PATH=$MATRIX_PATH1:$MATRIX_PATH2:$MATRIX_PATH3:$MATRIX_PATH4
  MATRIX_PATH1=$(find $MTTPATH/trans/m     -type d|grep -v CVS|awk '{printf ":%s", $0}')
  MATRIX_PATH2=$(find $MTT_LIB/comp/simple -type d|grep -v CVS|awk '{printf ":%s", $0}')
  MATRIX_PATH3=$(find $MTT_LIB/control     -type d|grep -v CVS|awk '{printf ":%s", $0}')
  MATRIX_PATH4=$(find $MTT_LIB/octave      -type d|grep -v CVS|awk '{printf ":%s", $0}')
  export MATRIX_PATH=$MATRIX_PATH1:$MATRIX_PATH2:$MATRIX_PATH3:$MATRIX_PATH4
##>>>>>>> 1.45
  export OCTAVE_PATH=.\:$MATRIX_PATH
##<<<<<<< mttrc
  export MATRIX="octave --path $OCTAVE_PATH"
##=======
  export MATRIX="$MATRIX --path $OCTAVE_PATH"
##  export MATRIX="$MATRIX --path $OCTAVE_PATH"
##>>>>>>> 1.45
  
  # Setup the symbolic stuff
  export SYMBOLIC='reduce 64'
  ##export SYMBOLIC='reduce 64'
  export SYMBOLIC='reduce -w'
  
  
  # Setup xfig
  export FIG="xfig  \
  	-startfontsize 20 \
  	-metric \
  	-portrait \
︙
323
324
325
326
327
328
329




330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348

349
350
351
352
353
354
355

340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377








+
+
+
+



















+








  ##
  #############################################################

  #######################################################
  ##
  ## Configure environment for compilation of RTXI module

##<<<<<<< mttrc
 ## RTXI_INCS="-I/usr/local/src/mtt/rtxi/rtxi_cvs_30Sep05/include -I/usr/include/qt3 -I/home/peterg/Development/rtxi/include"
#  MORE_RTXI_INCS="-I/usr/realtime/include -I/usr/src/linux/include"
##=======
  ROOT="/usr/local/rtxi-knoppix"

  RTXI_LIBTOOL="${ROOT}/usr/local/lib/rtxi/libtool"
  RTXI_CXX="g++-3.3"
  RTXI_CXXLD="g++-3.3"
  RTXI_CXXCOMPILE="${RTXI_LIBTOOL} --mode=compile --tag CXX ${RTXI_CXX}"
  RTXI_CXXLINK="${RTXI_LIBTOOL} --mode=link --tag CXX ${RTXI_CXXLD}"

  RTXI_INCS=""
  RTXI_INCS="${RTXI_INCS} -I${ROOT}/usr/share/qt3/include"
  RTXI_INCS="${RTXI_INCS} -I."
  RTXI_INCS="${RTXI_INCS} -I${ROOT}/usr/realtime/include"
  RTXI_INCS="${RTXI_INCS} -I${ROOT}/usr/share/qt3/include"
  RTXI_INCS="${RTXI_INCS} -I${ROOT}/usr/src/comedi/include"
  RTXI_INCS="${RTXI_INCS} -I${ROOT}/usr/src/rtxi/include"

  RTXI_DEFS="-D_REENTRANT -DQT_THREAD_SUPPORT"
  RTXI_CXXFLAGS="-g -O2 ${RTXI_INCS} ${RTXI_DEFS}"
  RTXI_LIBS="-L${ROOT}/usr/share/qt3/lib -lqt-mt"
##>>>>>>> 1.45
  RTXI_FLAGS="-DHAVE_CONFIG_H -D_REENTRANT -DQT_THREAD_SUPPORT"
  RTXI_LDFLAGS="-L${ROOT}/usr/realtime/lib -lpthread -module -avoid-version"
  RTXI_RPATH="${ROOT}/usr/local/lib/rtxi/models/"

  export MTT_RTXI_CXXCOMPILE="${RTXI_CXXCOMPILE}"
  export MTT_RTXI_CXXLINK="${RTXI_CXXLINK}"
  export MTT_RTXI_LIBTOOL="${RTXI_LIBTOOL}"
︙

MTT: Model Transformation Tools
[ GitHub | SourceHut | Sourceforge | Fossil RSS ]