Merge pull request #211 from SynBioDex/develop

Develop

.travis.yml

@@ -23,7 +23,7 @@ before_install:
   - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
 
   # cache refresh required to install packages
-  - sudo apt-get update -qq
+  - sudo apt-get update -q=2
 
   # install dependencies
   - sudo apt-get -y install build-essential libxml2-dev gcc-multilib g++-multilib libraptor2-dev libjsoncpp-dev swig3.0 python-dev
@@ -34,7 +34,7 @@ before_install:
 
 install:
   - cd ~/build/libSBOL
-  - sudo apt-get install -qq g++-4.8
+  - sudo apt-get install -q=2 g++-4.8
   - export CXX="g++-5" CC="gcc-5"
   - cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=~/install_x64 -DSBOL_BUILD_64=ON -DSBOL_BUILD_SHARED=ON -DCURL_LIBRARY=/usr/lib/x86_64-linux-gnu/libcurl.so -DJsonCpp_LIBRARY=/usr/lib/x86_64-linux-gnu/libjsoncpp.so -DLIBXSLT_LIBRARIES=/usr/lib/x86_64-linux-gnu/libxslt.so -DRAPTOR_LIBRARY=/usr/lib/x86_64-linux-gnu/libraptor2.so -DSBOL_BUILD_PYTHON2=ON -DPYTHON_EXECUTABLE=/usr/bin/python -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 -DPYTHON_LIBRARY=/usr/lib/x86_64-linux-gnu/libpython2.7.so python2.7 -DSWIG_EXECUTABLE=/usr/bin/swig3.0 "$TRAVIS_BUILD_DIR"
   - make 
@@ -47,8 +47,12 @@ script:
   - make -j2 && make install
   #- cd ~/install_x64/test
   #- ./sbol_test
-  - cd ~/install_x64/wrapper/sbol
-  - python unit_tests.py
+  - ls ~
+  - ls ~/build
+  - ls ~/build/libSBOL
+  - ls ~/build/SynBioDex
+  - cd ~/build/SynBioDex/libSBOL/release/wrapper/Linux_64_2
+  - python -c "from sbol import *; testSBOL()"
 
 addons:
   apt:

CMakeLists.txt

@@ -21,8 +21,11 @@ ELSE()
 ENDIF()
 
 # set build options
-#OPTION( SBOL_BUILD_STATIC     "Build statically linked library"           TRUE )
-OPTION( SBOL_BUILD_SHARED     "Build dynamically linked library"           FALSE )
+IF (${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+    OPTION( SBOL_BUILD_SHARED     "Build dynamically linked library"           TRUE )
+ELSE()
+    OPTION( SBOL_BUILD_SHARED     "Build dynamically linked library"           FALSE )
+ENDIF()
 #OPTION( SBOL_BUILD_COMBINED  "Build libSBOL and Raptor RDF archives combined" FALSE )
 #OPTION( SBOL_DEBUG_STATEMENTS "Add some print statements for debugging"   FALSE )
 #OPTION( SBOL_BUILD_EXAMPLES   "Build the example programs"                FALSE )
@@ -36,6 +39,7 @@ endif()
 OPTION( SBOL_BUILD_PYTHON2  "Generate Python version 2 wrapper using SWIG" FALSE )
 OPTION( SBOL_BUILD_PYTHON3  "Generate Python version 3 wrapper using SWIG" FALSE )
 OPTION( SBOL_BUILD_MANUAL  "Generate SBOL documentation using Doxygen" FALSE )
+OPTION( SBOL_BUILD_RASQAL  "Use use Rasqal library if it is found" FALSE )
 OPTION( SBOL_BUILD_JSON  "Build JsonCpp library (for Linux users primarily)" FALSE )
 OPTION( SBOL_BUILD_OSX_DIST  "For pySBOL distributions on Mac, target frameworks back to OSX 10.9" FALSE )
 OPTION( SBOL_BUILD_TESTS      "Build the unit tests and example tests"    FALSE )

manual/Doxyfile

@@ -581,7 +581,7 @@ SORT_BRIEF_DOCS        = NO
 # detailed member documentation.
 # The default value is: NO.
 
-SORT_MEMBERS_CTORS_1ST = NO
+SORT_MEMBERS_CTORS_1ST = YES
 
 # If the SORT_GROUP_NAMES tag is set to YES then doxygen will sort the hierarchy
 # of group names into alphabetical order. If set to NO the group names will