Moved example project code to tests folder. The build script now uses the latest FoBiS version (1.2.5) and no longer compiles the json-fortran module twice.

Author: jacobwilliams

CMakeLists.txt

@@ -43,7 +43,7 @@ set ( VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
 # Collect source files for the library
 #-------------------------------------
 set ( JF_LIB_SRCS  src/json_module.f90  )
-set ( JF_TEST_SRCS src/json_example.f90 )
+set ( JF_TEST_SRCS tests/json_example.f90 )
 
 #-----------------------------------------
 # Collect all the mod files into their own

README.md

@@ -22,7 +22,7 @@ compiler](http://gcc.gnu.org/wiki/GFortran/News#GCC4.9).
 Currently, several ways are provided to build the jsonfortran library
 (libjsonfortran). 
 
-* A build script, `build.sh` is provided in the project root directory. This script uses [FoBiS](https://github.com/szaghi/FoBiS) to build the json-fortran library and the example program.  Edit the script to use either the Intel compiler or gfortran.
+* A build script, `build.sh` is provided in the project root directory. This script uses [FoBiS](https://github.com/szaghi/FoBiS) to build the json-fortran library and the example program.  Edit the script to use either the Intel compiler or gfortran.  Note that version 1.2.5 of FoBiS (or later) is required.
 
 * A Visual Studio 2010 project is included for building the library (and example program) on Windows with the Intel compiler.  The project has been tested with Visual Studio 2010 and 2013.
 

SConstruct

@@ -31,7 +31,7 @@ env.Library(ar, src,
 
 
 ## this builds the example program and places it in bin/
-env.Program(exe, join('src','json_example.f90'), LIBS=['jsonfortran',], LIBPATH=['lib'])
+env.Program(exe, join('tests','json_example.f90'), LIBS=['jsonfortran',], LIBPATH=['lib'])
 
 env.Requires(exe, mod)
 

build.sh

@@ -4,8 +4,8 @@
 #  Build the json-fortran library and example program.
 #
 #  Requires: 
-#    FoBiS.py : https://github.com/szaghi/FoBiS
-#    RoboDoc  : http://rfsber.home.xs4all.nl/Robo/
+#    FoBiS.py : https://github.com/szaghi/FoBiS      [version 1.2.5 or later required]
+#    RoboDoc  : http://rfsber.home.xs4all.nl/Robo/   [version 4.99.38 is the one tested]
 #
 #  Jacob Williams : 12/27/2014
 #
@@ -15,7 +15,8 @@ use_ifort=0
 
 PROJECTNAME='jsonfortran'       # project name for robodoc (example: jsonfortran_2.0.0)
 DOCDIR='./documentation/'       # build directory for documentation
-SRCDIR='./src/'                 # source directory
+SRCDIR='./src/'                 # library source directory
+EXAMPLEDIR='./tests/'           # example source directory
 BINDIR='./bin/'                 # build directory for example
 LIBDIR='./lib/'                 # build directory for library
 MODCODE='json_module.f90'       # json module file name
@@ -46,12 +47,12 @@ fi
 #build the stand-alone library:
 echo ""
 echo "Building library..."
-./FoBiS.py build -compiler ${FCOMPILER} -cflags "${FCOMPILERFLAGS}" -dbld ${LIBDIR} -s ${SRCDIR} -dmod ./ -dobj ./ -t ${MODCODE} -o ${LIBOUT} -mklib static
+FoBiS.py build -compiler ${FCOMPILER} -cflags "${FCOMPILERFLAGS}" -dbld ${LIBDIR} -s ${SRCDIR} -dmod ./ -dobj ./ -t ${MODCODE} -o ${LIBOUT} -mklib static -colors 
 
-#build the example program:
+#build the example program (uses the above library):
 echo ""
 echo "Building example program..."
-./FoBiS.py build -compiler ${FCOMPILER} -cflags "${FCOMPILERFLAGS}" -dbld ${BINDIR} -s ${SRCDIR} -dmod ./ -dobj ./ -t ${EXAMPLECODE} -o json
+FoBiS.py build -compiler ${FCOMPILER} -cflags "${FCOMPILERFLAGS}" -dbld ${BINDIR} -s ${EXAMPLEDIR} -i ${LIBDIR} -libs ${LIBDIR}/${LIBOUT} -dmod ./ -dobj ./ -t ${EXAMPLECODE} -o json -colors 
 
 #build the documentation with RoboDoc:
 echo ""

src/json_example.f90 renamed to tests/json_example.f90

@@ -25,5 +25,5 @@
 				<Tool Name="VFManifestTool" SuppressStartupBanner="true"/></Configuration></Configurations>
 	<Files>
 		<Filter Name="src" Filter="f90;for;f;fpp;ftn;def;odl;idl">
-		<File RelativePath="..\src\json_example.f90"/></Filter></Files>
+		<File RelativePath="..\tests\json_example.f90"/></Filter></Files>
 	<Globals/></VisualStudioProject>