remove swig from setup process

SebastianZug · May 26, 2016 · 1975916 · 1975916
1 parent 16589d0
commit 1975916
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -8,3 +8,5 @@ include README*
 include setup.py
 recursive-include pysimavr *.h
 prune docs/_build
+recursive-include pysimavr *_wrap.c
+recursive-exclude pysimavr *.i
diff --git a/README.rst b/README.rst
@@ -53,10 +53,10 @@ Ubuntu 14.04
 ::
 
     sudo apt-get install python-pip
-    sudo apt-get install swig python-dev gcc libelf-dev arduino
+    sudo apt-get install python-dev gcc libelf-dev arduino
     sudo pip install pysimavr
     # optional for some tests:
-    sudo apt-get install freeglut3-dev scons
+    sudo apt-get install freeglut3-dev scons swig
 
 Uninstall
 ---------

diff --git a/setup.py b/setup.py
@@ -78,7 +78,8 @@ def part(name):
     return Extension(name='pysimavr.swig._' + name,
                      sources=[
                      PARTS + '/' + name + '.c',
-                     SWIG + '/' + name + '.i',
+#                      SWIG + '/' + name + '.i',
+                     SWIG + '/' + name + '_wrap.c',
                      #                     'pysimavr/swig/sim/sim_cycle_timers.c',
                      #                     'pysimavr/swig/sim/sim_irq.c',
                      #                     'pysimavr/swig/sim/sim_io.c',
@@ -89,11 +90,11 @@ def part(name):
                      INCLUDE_SIMAVR, INCLUDE_AVR,
                      PARTS,
                      ],
-                     swig_opts=[
-                     #                       '-modern',
-                     '-I' + PARTS,
-                     '-I' + SIM,
-                     ],
+#                      swig_opts=[
+#                      #                       '-modern',
+#                      '-I' + PARTS,
+#                      '-I' + SIM,
+#                      ],
                      extra_compile_args=[
                      '--std=gnu99',
                      ],
@@ -102,7 +103,8 @@ def part(name):
 ext_modules = [
     Extension(name='pysimavr.swig._simavr',
               sources=[
-              SWIG + '/simavr.i',
+#               SWIG + '/simavr.i',
+              SWIG + '/simavr_wrap.c',
               SWIG + '/simavr_logger.cpp',
               ]
               + files(SIM, '*.c')
@@ -112,10 +114,10 @@ def part(name):
               SIM,
               INCLUDE_SIMAVR, INCLUDE_AVR,
               ],
-              swig_opts=[
-              #                       '-modern',
-              '-I' + SIM,
-              ],
+#               swig_opts=[
+#               #                       '-modern',
+#               '-I' + SIM,
+#               ],
               extra_compile_args=[
               '--std=gnu99',
               '-DNO_COLOR',