Merge branch 'master' into bootstrap_submodule_support

Author: everythingfunctional

ci/run_tests.bat

@@ -25,6 +25,30 @@ if errorlevel 1 exit 1
 if errorlevel 1 exit 1
 
 
+cd ..\hello_fpm
+if errorlevel 1 exit 1
+
+..\..\..\fpm\build\gfortran_debug\app\fpm build
+if errorlevel 1 exit 1
+
+.\build\gfortran_debug\app\hello_fpm
+if errorlevel 1 exit 1
+
+
+cd ..\circular_test
+if errorlevel 1 exit 1
+
+..\..\..\fpm\build\gfortran_debug\app\fpm build
+if errorlevel 1 exit 1
+
+
+cd ..\circular_example
+if errorlevel 1 exit 1
+
+..\..\..\fpm\build\gfortran_debug\app\fpm build
+if errorlevel 1 exit 1
+
+
 cd ..\hello_complex
 if errorlevel 1 exit 1
 

ci/run_tests.sh

@@ -12,6 +12,16 @@ cd ../example_packages/hello_world
 ../../fpm/build/gfortran_debug/app/fpm build
 ./build/gfortran_debug/app/hello_world
 
+cd ../hello_fpm
+../../../fpm/build/gfortran_debug/app/fpm build
+./build/gfortran_debug/app/hello_fpm
+
+cd ../circular_test
+../../../fpm/build/gfortran_debug/app/fpm build
+
+cd ../circular_example
+../../../fpm/build/gfortran_debug/app/fpm build
+
 cd ../hello_complex
 ../../fpm/build/gfortran_debug/app/fpm build
 ./build/gfortran_debug/app/say_Hello

example_packages/README.md

@@ -7,11 +7,11 @@ the features demonstrated in each package and which versions of fpm are supporte
 | Name                | Features                                                      | Bootstrap (Haskell) fpm | fpm |
 |---------------------|---------------------------------------------------------------|:-----------------------:|:---:|
 | auto_discovery_off  | Default layout with auto-discovery disabled                   |            N            |  Y  |
-| circular_example    | Local path dependency; circular dependency                    |            Y            |  N  |
-| circular_test       | Local path dependency; circular dependency                    |            Y            |  N  |
+| circular_example    | Local path dependency; circular dependency                    |            Y            |  Y  |
+| circular_test       | Local path dependency; circular dependency                    |            Y            |  Y  |
 | hello_complex       | Non-standard directory layout; multiple tests and executables |            Y            |  Y  |
 | hello_complex_2     | Auto-discovery of tests and executables with modules          |            N            |  Y  |
-| hello_fpm           | App-only; local path dependency                               |            Y            |  N  |
+| hello_fpm           | App-only; local path dependency                               |            Y            |  Y  |
 | hello_world         | App-only                                                      |            Y            |  Y  |
 | makefile_complex    | External build command (makefile); local path dependency      |            Y            |  N  |
 | program_with_module | App-only; module+program in single source file                |            Y            |  Y  |

example_packages/hello_complex_2/app/say_hello/app_hello_mod.f90

@@ -1,4 +1,6 @@
 module app_hello_mod
 implicit none
 
+integer :: hello_int = 42
+
 end module app_hello_mod

fpm/app/main.f90

@@ -7,7 +7,8 @@ program main
         fpm_test_settings, &
         fpm_install_settings, &
         get_command_line_settings
-use fpm, only: cmd_build, cmd_install, cmd_new, cmd_run, cmd_test
+use fpm, only: cmd_build, cmd_install, cmd_run, cmd_test
+use fpm_cmd_new, only: cmd_new
 
 implicit none