Merge a4a864e into 7b89abe

.gitignore

@@ -12,6 +12,9 @@ test.out
 *.swp
 *.coverage*
 
+# build
+build/
+
 # personalized nupic configuration file
 .nupic_config
 
@@ -60,15 +63,11 @@ extensions/core/
 experimental/
 
 # nupic bindings swig libraries
-nupic/bindings/*engine_internal.*
-nupic/bindings/*algorithms.*
-nupic/bindings/*iorange.*
-nupic/bindings/*math.*
-nupic/bindings/*.cxx
+nupic/bindings/
+~nupic/bindings/*.i
 
 # Pip stuff
 dist/
 nupic.egg-info/
 nupic/*cpp_region.*
 temp/
-

.nupic_modules

@@ -1,3 +1,3 @@
 # Default nupic.core dependencies (override in optional .nupic_config)
 NUPIC_CORE_REMOTE = 'git://github.com/numenta/nupic.core.git'
-NUPIC_CORE_COMMITISH = '64f7abb2903120a253d634d8d15dcbca4ca8dca7'
+NUPIC_CORE_COMMITISH = '85a42e1c2b8b713d92dbbbd69d6ab4ae52e986c6'

.travis.yml

@@ -16,9 +16,10 @@ env:
   global:
     - NUPIC=$TRAVIS_BUILD_DIR
     - PATH=$TRAVIS_BUILD_DIR/python/bin:$PATH
+    - ARCHFLAGS="-arch x86_64"
 
 matrix:
-  # This excludes OSX builds from the build matrix for gcc and Python 2.6
+  # This excludes OSX builds from the build matrix for gcc
   exclude:
     - os: osx
       compiler: gcc
@@ -57,9 +58,8 @@ notifications:
       - https://webhooks.gitter.im/e/68f77bae61efa5c931f8
 
 before_install:
-  # install gcc-4.8 for C++11 compatibility, #TODO remove when Travis has gcc>=4.8, (it's used for clang too, in coveralls)
-  - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; sudo apt-get -qq update; sudo apt-get -qq install g++-4.8; alias gcc='gcc-4.8'; alias g++='g++-4.8'; fi"
-  - "if [ $CC = 'gcc' ]; then export CC='gcc-4.8'; export CXX='g++-4.8'; fi"
+  - "echo CC: ${CC}"
+  - "echo CXX: ${CXX}"
   - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'linux' ]; then . ./ci/travis/before_install-linux.sh; fi"
   - "if [ ${TRAVIS_OS_NAME:-'linux'} = 'osx' ]; then . ./ci/travis/before_install-osx.sh; fi"