Renamed TimerCallback.i -> utils.i

Author: Premik

Diff for: pysimavr/swig/SConstruct

@@ -42,7 +42,7 @@ envCPP = envBase.Clone(
 
 #######################################
 # swig simavr
-########################################
+#######################################
 def filtered_glob(env, pattern, omit=[],
   ondisk=True, source=False, strings=False):
     return filter(
@@ -111,7 +111,7 @@ def part(name):
 
 #######################################
 # swig parts
-########################################
+#######################################
 part('sgm7')
 part('ledrow')
 part('inverter')
@@ -124,12 +124,11 @@ part('uart_buff')
 
 #######################################
 # swig utils
-########################################
+#######################################
 swig_utils = envCPP.SharedLibrary(
                   'utils',
-                  source=[Dir(UTILS).File('TimerCallback.cpp'), 
-                          Dir(SWIG).File('TimerCallback.i')                          
-                          #, Dir(SWIG).File('_simavr.so')
+                  source=[Glob(UTILS + '/*.cpp'),
+                          Dir(SWIG).File('utils.i'),                                                    
                           ],
                   SWIGFLAGS=['-python', '-c++'],
                   SHLIBPREFIX="_",                     

Diff for: pysimavr/swig/TimerCallback.i renamed to pysimavr/swig/utils.i

@@ -3772,7 +3772,7 @@ SWIG_From_unsigned_SS_long_SS_long  (unsigned long long value)
  * C++ director class methods
  * --------------------------------------------------- */
 
-#include "TimerCallback_wrap.h"
+#include "utils_wrap.h"
 
 SwigDirector_TimerCallback::SwigDirector_TimerCallback(PyObject *self, avr_t *avr): TimerCallback(avr), Swig::Director(self) {
   SWIG_DIRECTOR_RGTR((TimerCallback *)this, this); 

Diff for: pysimavr/swig/TimerCallback_wrap.cc renamed to pysimavr/swig/utils_wrap.cc

@@ -126,18 +126,15 @@ def part(name):
               ),
      Extension(name='pysimavr.swig._utils',     
               sources=[
-              SWIG + '/TimerCallback_wrap.cc',              
-              UTILS + '/TimerCallback.cpp'           
-              ],            
+                SWIG + '/utils_wrap.cc',
+                ]
+                + files(UTILS, '*.cpp'),                
               include_dirs=[
-                  SIM, INCLUDE_SIMAVR, INCLUDE_AVR, UTILS
+                SIM, INCLUDE_SIMAVR, INCLUDE_AVR, UTILS
               ],
-               #swig_opts=[
-               #    '-c++'               
-               #],
-              extra_compile_args=[            
-              #The Fast get feature seems broken in py2.7 (TypeError on avr_t * cast). Disable.
-              '-DSWIG_PYTHON_SLOW_GETSET_THIS', 
+              define_macros=[
+                #The Fast get feature seems broken in py2.7 (TypeError on avr_t * cast). Disable.
+                ('SWIG_PYTHON_SLOW_GETSET_THIS', None), 
               ],
               ),           
     part('sgm7'),