Merge pull request #239 from urbanjost/runner

Add --runner option to Fortran fpm to match Haskell fpm

Author: LKedward

CONTRIBUTING.md

@@ -77,7 +77,7 @@ decisions. This is the workflow that we follow:
    one person disagrees.
    At this stage, the scope of the fix/feature, its behavior, and API if
    applicable should be defined.
-   Only when you have community concensus on these items you should proceed to
+   Only when you have community consensus on these items you should proceed to
    writing code and opening a PR.
    **When actively working on code towards a PR, please assign yourself to the
    issue on GitHub.**

PACKAGING.md

@@ -177,7 +177,7 @@ Based on the output of `fpm build`, *fpm* first ran `gfortran` to emit the
 binary object (`math_constants.o`) and module (`math_constants.mod`) files.
 Then it ran `ar` to create a static library archive `math_constants.a`.
 `build/debug/library` is thus both your include and library path, should you
-want to compile and link an exteranl program with this library.
+want to compile and link an external program with this library.
 
 For modules in the top-level (`src`) directory, *fpm* requires that:
 
@@ -585,7 +585,7 @@ And now, `fpm run` will output the following:
 ```
 
 Additionally, any users of your library will now automatically depend on your
-dependencies too. So if you don’t need that depedency for the library, like in
+dependencies too. So if you don’t need that dependency for the library, like in
 the above example, then you can specify it for the specific executable like
 below. Then fpm will still fetch and compile it when building your executable,
 but users of your library won’t have to.
@@ -677,7 +677,7 @@ the build script:
 * `FC` – The Fortran compiler to be used.
 * `FFLAGS` – The flags that should be passed to the Fortran compiler.
 * `BUILD_DIR` – Where the compiled files should be placed.
-* `INCLUDE_DIRS` – The folders where any dependencies can be found, space seperated.
+* `INCLUDE_DIRS` – The folders where any dependencies can be found, space separated.
 It is then the responsibility of the build script to generate the appropriate
 include flags.
 

README.md

@@ -63,7 +63,7 @@ with the following contents and initialized as a git repository.
 
 * `fpm.toml` – with your project’s name and some default standard meta-data
 * `README.md` – with your project’s name
-* `.gitgnore`
+* `.gitignore`
 * `src/project_name.f90` – with a simple hello world subroutine
 * `app/main.f90` (if `--with-executable` flag used) – a program that calls the subroutine
 * `test/main.f90` (if `--with-test` flag used) – an empty test program

fpm/fpm.toml

@@ -12,7 +12,7 @@ tag = "v0.2.1"
 
 [dependencies.M_CLI2]
 git = "https://github.com/urbanjost/M_CLI2.git"
-rev = "649075aceb97f997665a1a4656514fd2e9b4becc"
+rev = "893cac0ce374bf07a70ffb9556439c7390e58131"
 
 [[test]]
 name = "cli-test"

fpm/src/fpm.f90

@@ -84,7 +84,7 @@ subroutine add_dependencies(dependency_list)
         character(:), allocatable :: dependency_path
 
         do i=1,size(dependency_list)
-            
+
             if (dependency_list(i)%name .in. package_list) then
                 cycle
             end if
@@ -99,7 +99,7 @@ subroutine add_dependencies(dependency_list)
                 end if
 
             else if (allocated(dependency_list(i)%path)) then
-                
+
                 dependency_path = join_path(package_root,dependency_list(i)%path)
 
             end if
@@ -120,11 +120,11 @@ subroutine add_dependencies(dependency_list)
                 dependency%library%source_dir = "src"
             end if
 
-            
+
             call add_libsources_from_package(sources,link_libraries,package_list,dependency, &
                 package_root=dependency_path, &
                 dev_depends=.false., error=error)
-            
+
             if (allocated(error)) then
                 error%message = 'Error while processing sources for dependency package "'//&
                                 new_line('a')//dependency%name//'"'//&
@@ -322,7 +322,7 @@ subroutine cmd_run(settings,test)
             exe_source => exe_target%dependencies(1)%ptr%source
 
             if (exe_source%unit_scope == &
-                merge(FPM_SCOPE_TEST,FPM_SCOPE_APP,test)) then 
+                merge(FPM_SCOPE_TEST,FPM_SCOPE_APP,test)) then
 
                 col_width = max(col_width,len(basename(exe_target%output_file))+2)
 
@@ -336,7 +336,7 @@ subroutine cmd_run(settings,test)
                     do j=1,size(settings%name)
 
                         if (trim(settings%name(j))==exe_source%exe_name) then
-                            
+
                             found(j) = .true.
                             exe_cmd%s = exe_target%output_file
                             executables = [executables, exe_cmd]
@@ -346,7 +346,7 @@ subroutine cmd_run(settings,test)
                     end do
 
                 end if
-                
+
             end if
 
         end if
@@ -379,14 +379,14 @@ subroutine cmd_run(settings,test)
         do i=1,size(model%targets)
 
             exe_target => model%targets(i)%ptr
-    
+
             if (exe_target%target_type == FPM_TARGET_EXECUTABLE .and. &
                 allocated(exe_target%dependencies)) then
 
                 exe_source => exe_target%dependencies(1)%ptr%source
 
                 if (exe_source%unit_scope == &
-                    merge(FPM_SCOPE_TEST,FPM_SCOPE_APP,test)) then 
+                    merge(FPM_SCOPE_TEST,FPM_SCOPE_APP,test)) then
 
                     write(stderr,'(A)',advance=(merge("yes","no ",modulo(j,nCol)==0))) &
                                         & [character(len=col_width) :: basename(exe_target%output_file)]
@@ -415,9 +415,13 @@ subroutine cmd_run(settings,test)
         if (settings%list) then
             write(stderr,*) executables(i)%s
         else
-            
+
             if (exists(executables(i)%s)) then
-                call run(executables(i)%s//" "//settings%args)
+                if(settings%runner .ne. ' ')then
+                   call run(settings%runner//' '//executables(i)%s//" "//settings%args)
+                else
+                   call run(executables(i)%s//" "//settings%args)
+                endif
             else
                 write(stderr,*)'fpm::run<ERROR>',executables(i)%s,' not found'
                 stop 1