[Avida-SVN] r3212 - in branches/developers/avida-edward: . source/bindings/Boost.Python source/python

[welsberr at myxo.css.msu.edu]

Author: welsberr
Date: 2009-04-16 20:00:13 -0400 (Thu, 16 Apr 2009)
New Revision: 3212

Modified:
   branches/developers/avida-edward/CMakeLists.txt
   branches/developers/avida-edward/source/bindings/Boost.Python/tArray.pyste
   branches/developers/avida-edward/source/bindings/Boost.Python/tArray_instantiations.hh
   branches/developers/avida-edward/source/bindings/Boost.Python/tVector_instantiations.hh
   branches/developers/avida-edward/source/python/CMakeLists.txt
   branches/developers/avida-edward/source/python/setup_osx.py.in
Log:
Check-in of incremental changes to Avida-ED build

Modified: branches/developers/avida-edward/CMakeLists.txt
===================================================================
--- branches/developers/avida-edward/CMakeLists.txt	2009-04-16 23:51:28 UTC (rev 3211)
+++ branches/developers/avida-edward/CMakeLists.txt	2009-04-17 00:00:13 UTC (rev 3212)
@@ -109,8 +109,8 @@
 )
 IF(AVD_PY_BINDINGS)
   INCLUDE(${PROJECT_SOURCE_DIR}/CMakeModules/avdFindPython.cmake)
-  AVD_FIND_PYTHON(2.4 /Library/Frameworks)
-  SET( BOOST_VERSION "1_32" CACHE STRING "Version of Boost Library to use")
+  AVD_FIND_PYTHON(2.5 /Library/Frameworks)
+  SET( BOOST_VERSION "1_38" CACHE STRING "Version of Boost Library to use")
   FIND_LIBRARY(
     BOOST_LIBRARY
     NAMES

Modified: branches/developers/avida-edward/source/bindings/Boost.Python/tArray.pyste
===================================================================
--- branches/developers/avida-edward/source/bindings/Boost.Python/tArray.pyste	2009-04-16 23:51:28 UTC (rev 3211)
+++ branches/developers/avida-edward/source/bindings/Boost.Python/tArray.pyste	2009-04-17 00:00:13 UTC (rev 3212)
@@ -52,6 +52,7 @@
 # Function to wrap class type specializations of tArray.
 
 def commonClassWrapperFactors(spec_str, spec_type):
+  exclude(spec_type.Resize)
   exclude(spec_type.ElementAt)
   decl_code_str = ""
   decl_code_str += addClass__len__Wrapper(spec_str, spec_type)

Modified: branches/developers/avida-edward/source/bindings/Boost.Python/tArray_instantiations.hh
===================================================================
--- branches/developers/avida-edward/source/bindings/Boost.Python/tArray_instantiations.hh	2009-04-16 23:51:28 UTC (rev 3211)
+++ branches/developers/avida-edward/source/bindings/Boost.Python/tArray_instantiations.hh	2009-04-17 00:00:13 UTC (rev 3212)
@@ -6,7 +6,8 @@
 
 #include "tArray.h"
 
-#include <exception>
+#include <assert.h>
+#include <stdexcept>
 
 typedef cOrganism * pOrganism;
 typedef cMutation * pMutation;

Modified: branches/developers/avida-edward/source/bindings/Boost.Python/tVector_instantiations.hh
===================================================================
--- branches/developers/avida-edward/source/bindings/Boost.Python/tVector_instantiations.hh	2009-04-16 23:51:28 UTC (rev 3211)
+++ branches/developers/avida-edward/source/bindings/Boost.Python/tVector_instantiations.hh	2009-04-17 00:00:13 UTC (rev 3212)
@@ -1,2 +1,3 @@
 
+#include <assert.h>
 #include "tVector.h"

Modified: branches/developers/avida-edward/source/python/CMakeLists.txt
===================================================================
--- branches/developers/avida-edward/source/python/CMakeLists.txt	2009-04-16 23:51:28 UTC (rev 3211)
+++ branches/developers/avida-edward/source/python/CMakeLists.txt	2009-04-17 00:00:13 UTC (rev 3212)
@@ -8,16 +8,25 @@
       STRING(REGEX REPLACE "c:/" "/c/" PYUI_PATH ${PYUI_PATH})
     ENDIF(MINGW)
     SET(ABS_PYUI_MODULE ${PYUI_PATH}/${PYUI_MODULE})
-    ADD_CUSTOM_TARGET(
-      ${ABS_PYUI_MODULE}.py
-      ALL
-      ${PYUIC}
-      -p 2 -o
-      ${ABS_PYUI_MODULE}.py
-      ${ABS_PYUI_MODULE}.ui
-      DEPENDS
-      ${ABS_PYUI_MODULE}.ui
+    ADD_CUSTOM_COMMAND(
+      OUTPUT
+        ${ABS_PYUI_MODULE}.ui
+      COMMAND
+        ${PYUIC}
+        -p 2 -o
+        ${ABS_PYUI_MODULE}.py
+        ${ABS_PYUI_MODULE}.ui
     )
+    #ADD_CUSTOM_TARGET(
+    #  ${ABS_PYUI_MODULE}.py
+    #  ALL
+    #  ${PYUIC}
+    #  -p 2 -o
+    #  ${ABS_PYUI_MODULE}.py
+    #  ${ABS_PYUI_MODULE}.ui
+    #  DEPENDS
+    #  ${ABS_PYUI_MODULE}.ui
+    #)
     SET_DIRECTORY_PROPERTIES(PROPERTIES
       ADDITIONAL_MAKE_CLEAN_FILES "${ADDITIONAL_MAKE_CLEAN_FILES};${ABS_PYUI_MODULE}.py")
   ENDFOREACH(PYUI_FILE ${PYUI_FILES})

Modified: branches/developers/avida-edward/source/python/setup_osx.py.in
===================================================================
--- branches/developers/avida-edward/source/python/setup_osx.py.in	2009-04-16 23:51:28 UTC (rev 3211)
+++ branches/developers/avida-edward/source/python/setup_osx.py.in	2009-04-17 00:00:13 UTC (rev 3212)
@@ -38,9 +38,11 @@
     # Options for py2app
     py2app = dict(
       # Python modules to copy :
-      includes = ['iqt', 'sip', 'qt', 'qwt', 'readline', 'unittest', 'IPython', 'AvidaGui2', 'AvidaCore'],
+      # includes = ['iqt', 'sip', 'qt', 'qwt', 'readline', 'unittest', 'IPython', 'AvidaGui2', 'AvidaCore'],
+      includes = ['sip', 'qt', 'Qwt5', 'readline', 'unittest', 'IPython', 'AvidaGui2', 'AvidaCore'],
       # Python packages to copy :
-      packages = ['IPython', 'AvidaGui2'],
+      # packages = ['IPython', 'AvidaGui2'],
+      packages = ['AvidaGui2'],
       # Additional frameworks and dylibs to include
       #frameworks = ['libqt-mt.3.dylib'],
       # Subdirectory in which Avi :da-ED.app should be assembled