work finished, feel free to commit/cherry-pick

.travis.yml

@@ -10,14 +10,14 @@ env:
   global:
     - PV=r8e PLATF=linux-x86_64 NDK_HOME=${TRAVIS_BUILD_DIR}/android-ndk-${PV} PATH=${PATH}:${NDK_HOME}
   matrix:
-#    - LINUX=1 TRAVIS_NO_EXPORT=YES
-#    - LINUX=1 TRAVIS_NO_EXPORT=NO
-#    - LINUX=1 TRAVIS_STATIC_BUILD=ON
-#    - LINUX=1 TRAVIS_STATIC_BUILD=OFF
-#    - WINDOWS=1 TRAVIS_NO_EXPORT=YES
-#    - WINDOWS=1 TRAVIS_NO_EXPORT=NO
-#    - WINDOWS=1 TRAVIS_STATIC_BUILD=ON
-#    - WINDOWS=1 TRAVIS_STATIC_BUILD=OFF
+    - LINUX=1 TRAVIS_NO_EXPORT=YES
+    - LINUX=1 TRAVIS_NO_EXPORT=NO
+    - LINUX=1 TRAVIS_STATIC_BUILD=ON
+    - LINUX=1 TRAVIS_STATIC_BUILD=OFF
+    - WINDOWS=1 TRAVIS_NO_EXPORT=YES
+    - WINDOWS=1 TRAVIS_NO_EXPORT=NO
+    - WINDOWS=1 TRAVIS_STATIC_BUILD=ON
+    - WINDOWS=1 TRAVIS_STATIC_BUILD=OFF
     - ANDROID=1
 
 language: cpp
@@ -31,16 +31,16 @@ install:
   - if [ $ANDROID ]; then wget -c http://dl.google.com/android/ndk/android-ndk-${PV}-${PLATF}.tar.bz2 && tar xf android-ndk-${PV}-${PLATF}.tar.bz2 ; fi
 
 script:
-#  - cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT -STATIC_BUILD=$TRAVIS_STATIC_BUILD
-#  - make
-#  - sudo make install
-#  - sudo ldconfig
-#  - cd test/unit
-#  - ../../bin/unit
-#  - cd ../regression
-#  - chmod 755 run.py
-#  - ./run.py
-  - echo "=========================================================="
-#  - echo "REGRESSION TEST FAILS (results/run_regression_suite_failures.csv)"
-#  - cat ../results/run_regression_suite_failures.csv
   - if [ $ANDROID ]; then ant -v -Dmy.dir=${TRAVIS_BUILD_DIR} -f ${TRAVIS_BUILD_DIR}/port/jassimp/build.xml ndk-jni ; fi
+  - cmake -G "Unix Makefiles" -DASSIMP_ENABLE_BOOST_WORKAROUND=YES -DASSIMP_NO_EXPORT=$TRAVIS_NO_EXPORT -STATIC_BUILD=$TRAVIS_STATIC_BUILD
+  - make
+  - sudo make install
+  - sudo ldconfig
+  - cd test/unit
+  - ../../bin/unit
+  - cd ../regression
+  - chmod 755 run.py
+  - ./run.py
+  - echo "=========================================================="
+  - echo "REGRESSION TEST FAILS (results/run_regression_suite_failures.csv)"
+  - cat ../results/run_regression_suite_failures.csv