Merge pull request #170 from jacobwilliams/split

Split + thread-safe

Author: jacobwilliams

.travis.yml

@@ -41,10 +41,11 @@ env:
       DEPLOY_DOCUMENTATION="no"
 
       # build with build.sh, make documentation, run unit tests and perform coverage analysis
+      # JW note: disabled coverage for testing purposes !!!! need to fix !!!!
     - >
-      BUILD_SCRIPT="./build.sh --coverage --skip-documentation &&
-      ./build.sh --coverage --enable-unicode"
-      CODE_COVERAGE="yes"
+      BUILD_SCRIPT="./build.sh --skip-documentation &&
+      ./build.sh --enable-unicode"
+      CODE_COVERAGE="no"
       DEPLOY_DOCUMENTATION="yes"
 
 install:

CMakeLists.txt

@@ -44,7 +44,12 @@ message ( STATUS "CMake build configuration for JSON-Fortran ${VERSION_MAJOR}.${
 #-------------------------------------
 # Collect source files for the library
 #-------------------------------------
-set ( JF_LIB_SRCS  src/json_module.F90 )
+set ( JF_LIB_SRCS  src/json_kinds.F90
+                   src/json_parameters.F90
+                   src/json_string_utilities.F90
+                   src/json_value_module.F90
+                   src/json_file_module.F90
+                   src/json_module.F90 )
 file ( GLOB JF_TEST_SRCS "src/tests/jf_test_*.f90" )
 set ( JF_TEST_UCS4_SUPPORT_SRC "${CMAKE_SOURCE_DIR}/src/tests/introspection/test_iso_10646_support.f90")
 

CONTRIBUTING.md

@@ -99,6 +99,5 @@ git rebase upstream/master
 - *Do NOT* allow your editor to make a bunch of indentation or white space changes, that will introduce non-substantive changes on lines that you have not actually edited.
 - The coding style is modern free-form Fortran, consistent with the Fortran 2008 standard.  Note that the two supported compilers (ifort and gfortran) do not currently include the entire Fortran 2008 standard. Therefore, only those language features supported by Gfortran 4.9 and Intel 13.1.0 are currently allowed.  This also means that previous versions of these compilers are not supported, and major changes to the code to support earlier compilers (or Fortran 95) will not be accepted.  At some point in the future (when compiler support has improved), all Fortran 2008 features will be allowed.
 - All subroutines and functions *must* be properly documented.  This includes useful inline comments as well as comment blocks using the [FORD](https://github.com/cmacmackin/ford/wiki/Writing-Documentation) syntax.
-- For simplicity, JSON-Fortran currently consists of one module file. It is not envisioned that it will ever need to expand to include multiple files (if it does, there would need to be a very good reason).
 
 [top](#contributing-to-json-fortran)

LICENSE

@@ -1,7 +1,7 @@
 JSON-Fortran: A Fortran 2008 JSON API
 <https://github.com/jacobwilliams/json-fortran>
 
-Copyright (c) 2014-2015, Jacob Williams
+Copyright (c) 2014-2016, Jacob Williams
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,

json-fortran.md

@@ -20,9 +20,9 @@ display: public
          private
 source: true
 graph: true
+exclude_dir: tests
 extra_mods: iso_fortran_env:https://gcc.gnu.org/onlinedocs/gfortran/ISO_005fFORTRAN_005fENV.html
-md_extensions: markdown.extensions.toc(anchorlink=True)
-               markdown.extensions.smarty(smart_quotes=False)
+md_extensions: markdown.extensions.smarty(smart_quotes=False)
 ---
 
 --------------------