[Pyode-commits] pyode .cvsignore,1.1,1.2 INSTALL,1.2,1.3 setup.py,1.3,1.4

[Matthias B. <mb...@us...>]

Update of /cvsroot/pyode/pyode
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18369

Modified Files:
	.cvsignore INSTALL setup.py 
Log Message:
Trimesh support can now be disabled in the setup script by setting TRIMESH_SUPPORT to False.

Index: .cvsignore
===================================================================
RCS file: /cvsroot/pyode/pyode/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .cvsignore	27 Jun 2004 20:49:25 -0000	1.1
--- .cvsignore	29 Jul 2004 20:17:12 -0000	1.2
***************
*** 1,3 ****
  build
  ode.c
! _precision.pyx
--- 1,3 ----
  build
  ode.c
! _trimesh_switch.pyx

Index: setup.py
===================================================================
RCS file: /cvsroot/pyode/pyode/setup.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** setup.py	29 Jul 2004 14:59:18 -0000	1.3
--- setup.py	29 Jul 2004 20:17:13 -0000	1.4
***************
*** 3,11 ****
  ######################################################################
  
  from distutils.core import setup, Extension
  import distutils.sysconfig
  import shutil, os, os.path, sys
  
! # ODE itself must already be compiled
  
  # Windows?
--- 3,14 ----
  ######################################################################
  
+ # ODE itself must already be compiled
+ 
  from distutils.core import setup, Extension
  import distutils.sysconfig
  import shutil, os, os.path, sys
  
! # Should the wrapper support trimesh geoms?
! TRIMESH_SUPPORT = True
  
  # Windows?
***************
*** 83,86 ****
--- 86,100 ----
      sys.exit()
  
+ # Generate the trimesh_switch file
+ f = file("_trimesh_switch.pyx", "wt")
+ print >>f, '# This file was generated by the setup script and is included in ode.pyx.\n'
+ if TRIMESH_SUPPORT:
+     print >>f, 'include "trimeshdata.pyx"'
+     print >>f, 'include "trimesh.pyx"'
+ else:
+     print >>f, 'include "trimesh_dummy.pyx"'
+ f.close()
+ 
+ 
  # Generate the C source file
  cmd = "pyrexc -o ode.c -I. -Isrc src/ode.pyx"

Index: INSTALL
===================================================================
RCS file: /cvsroot/pyode/pyode/INSTALL,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** INSTALL	29 Jul 2004 09:48:01 -0000	1.2
--- INSTALL	29 Jul 2004 20:17:13 -0000	1.3
***************
*** 38,39 ****
--- 38,44 ----
  system.
  
+ ODE can either be compiled with or without trimesh support. If you disabled
+ trimesh support you also have to disable it in this wrapper. You do that
+ by setting the variable TRIMESH_SUPPORT to False in the setup script.
+ In that case the TriMeshData and GeomTriMesh classes will still be there
+ but they will raise a NotImplementedError exception in their constructor.