refactor: change in structure of stdlib in order to compiler it using fypp script

API-doc-FORD-file.md

@@ -3,6 +3,7 @@ project: Fortran-lang/stdlib
 summary: A community driven standard library for (modern) Fortran
 src_dir: src
 include: src
+ include
 exclude_dir: src/tests
 output_dir: API-doc
 page_dir: doc

CMakeLists.txt

@@ -64,6 +64,7 @@ list(
  "-DPROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}"
  "-DPROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR}"
  "-DPROJECT_VERSION_PATCH=${PROJECT_VERSION_PATCH}"
+ "-I${PROJECT_SOURCE_DIR}/include"
 )
 
 add_subdirectory(src)

README.md

@@ -199,6 +199,21 @@ To use `stdlib` within your `fpm` project, add the following lines to your `fpm.
 stdlib = { git="https://github.com/fortran-lang/stdlib", branch="stdlib-fpm" }
 ```
 
+### Build with [fypp-script](https://github.com/fortran-lang/fpm/pull/729)
+
+Fortran Package Manager has a compiler wrapper `fypp-script` that can be used to compile stdlib without 
+switching to `stdlib-fpm` branch.
+
+```sh
+git clone https://github.com/fortran-lang/fpm.git
+```
+
+```
+fpm run -- build --compiler "$PWD/fypp-gfortran.py" -C stdlib
+```
+
+**Note** : At this stage, building using `stdlib-fpm` branch should be the preferred way of using `stdlib` with `fpm`.
+
 ## Using stdlib in your project
 
 The stdlib project exports CMake package files and pkg-config files to make stdlib usable for other projects.

ci/fpm-deployment.sh

@@ -27,17 +27,14 @@ include=(
 
 # Files to remove from collection
 prune=(
- "$destdir/test/test_always_fail.f90"
- "$destdir/test/test_always_skip.f90"
  "$destdir/test/test_hash_functions.f90"
- "$destdir/src/common.f90"
  "$destdir/src/f18estop.f90"
 )
 
 major=$(cut -d. -f1 VERSION)
 minor=$(cut -d. -f2 VERSION)
 patch=$(cut -d. -f3 VERSION)
-fyflags="${fyflags} -DPROJECT_VERSION_MAJOR=${major} -DPROJECT_VERSION_MINOR=${minor} -DPROJECT_VERSION_PATCH=${patch}"
+fyflags="${fyflags} -DPROJECT_VERSION_MAJOR=${major} -DPROJECT_VERSION_MINOR=${minor} -DPROJECT_VERSION_PATCH=${patch} -I include"
 
 mkdir -p "$destdir/src" "$destdir/test" "$destdir/example"
 

fpm.toml

@@ -0,0 +1,16 @@
+name = "stdlib"
+
+[dev-dependencies]
+test-drive.git = "https://github.com/fortran-lang/test-drive.git"
+
+[build]
+auto-examples = false
+auto-tests = true
+
+[preprocess.cpp]
+macros = [
+ "PROJECT_VERSION_MAJOR=0",
+ "PROJECT_VERSION_MINOR=1",
+ "PROJECT_VERSION_PATCH=0",
+ "MAXRANK=4",
+]

src/f08estop.f90

@@ -1,4 +1,4 @@
-submodule (stdlib_error) estop
+submodule (stdlib_error) f08estop
 
 implicit none
 

src/f18estop.f90

@@ -1,4 +1,4 @@
-submodule (stdlib_error) estop
+submodule (stdlib_error) f18estop
 
 implicit none
 
@@ -26,4 +26,4 @@
 endif
 end procedure
 
-end submodule estop
+end submodule f18estop

test/CMakeLists.txt

@@ -10,11 +10,6 @@ macro(ADDTEST name)
  WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 endmacro(ADDTEST)
 
-list(
- APPEND fyppFlags
- "-I${PROJECT_SOURCE_DIR}/src"
-)
-
 add_subdirectory(array)
 add_subdirectory(ascii)
 add_subdirectory(bitsets)
@@ -34,8 +29,3 @@ add_subdirectory(system)
 add_subdirectory(quadrature)
 add_subdirectory(math)
 add_subdirectory(stringlist)
-
-ADDTEST(always_skip)
-set_tests_properties(always_skip PROPERTIES SKIP_RETURN_CODE 77)
-ADDTEST(always_fail)
-set_tests_properties(always_fail PROPERTIES WILL_FAIL true)