From 54dcc64d339da3c743c8e9b6a216055903c59ebf Mon Sep 17 00:00:00 2001
From: Ser Lev Arris <arris@zsolttech.com>
Date: Fri, 20 Mar 2015 22:36:57 +0100
Subject: [PATCH] enable some importers, skip otherbuild for test/discuss

---
 .travis.yml                           | 29 ++++++++++++++-------------
 workspaces/Android-NDK/jni/Android.mk |  2 +-
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ba1227d3e..01e14246d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,10 @@
 before_install:
   - sudo apt-get install cmake python3
+  - echo -e "#ifndef A_R_H_INC\n#define A_R_H_INC\n#define GitVersion ${TRAVIS_JOB_ID}\n#define GitBranch \"${TRAVIS_BRANCH}\"\n#endif // A_R_H_INC" > revision.h
 
-#branches:
-#  only:
-#    - master
+branches:
+  only:
+    - master
 
 env:
   global:
@@ -30,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
+#  - 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
+#  - echo "REGRESSION TEST FAILS (results/run_regression_suite_failures.csv)"
+#  - cat ../results/run_regression_suite_failures.csv
   - if [ $ANDROID ]; then ant -v -Dbasedir=${TRAVIS_BUILD_DIR} -f ${TRAVIS_BUILD_DIR}/port/jassimp/build.xml ndk-jni ; fi
diff --git a/workspaces/Android-NDK/jni/Android.mk b/workspaces/Android-NDK/jni/Android.mk
index 764760e60..09f8eeb84 100755
--- a/workspaces/Android-NDK/jni/Android.mk
+++ b/workspaces/Android-NDK/jni/Android.mk
@@ -99,7 +99,7 @@ DontBuildImporters = \
 #         -DASSIMP_BUILD_NO_GEO_IMPORTER
 #         -DASSIMP_BUILD_NO_OBJ_IMPORTER \
 #
-#DontBuildImporters := -DASSIMP_BUILD_NO_IFC_IMPORTER -DASSIMP_BUILD_NO_IRRMESH_IMPORTER  -DASSIMP_BUILD_NO_IRR_IMPORTER -DASSIMP_BUILD_NO_C4D_IMPORTER -DASSIMP_BUILD_NO_OPENGEX_IMPORTER
+DontBuildImporters := -DASSIMP_BUILD_NO_IFC_IMPORTER -DASSIMP_BUILD_NO_IRRMESH_IMPORTER  -DASSIMP_BUILD_NO_IRR_IMPORTER -DASSIMP_BUILD_NO_C4D_IMPORTER -DASSIMP_BUILD_NO_OPENGEX_IMPORTER
 
 ASSIMP_FLAGS_3_0 = -DASSIMP_BUILD_DLL_EXPORT -DASSIMP_BUILD_NO_OWN_ZLIB -DASSIMP_BUILD_BOOST_WORKAROUND -Dassimp_EXPORTS -fPIC -fvisibility=hidden -Wall # $(DontBuildProcess)
 ASSIMP_FLAGS_3_1 = $(ASSIMP_FLAGS_3_0) # -DASSIMP_BUILD_BLENDER_DEBUG # -DASSIMP_BUILD_NO_EXPORT