diff options
| -rw-r--r-- | fpm/app/main.f90 | 2 | ||||
| -rw-r--r-- | fpm/src/fpm.f90 | 4 | ||||
| -rw-r--r-- | fpm/src/fpm_cmd_new.f90 (renamed from fpm/src/fpm_new_subcommand.f90) | 9 | ||||
| -rw-r--r-- | fpm/test/cli_test/cli_test.f90 | 2 |
4 files changed, 8 insertions, 9 deletions
diff --git a/fpm/app/main.f90 b/fpm/app/main.f90 index 03904fe..9982028 100644 --- a/fpm/app/main.f90 +++ b/fpm/app/main.f90 @@ -8,7 +8,7 @@ use fpm_command_line, only: & fpm_install_settings, & get_command_line_settings use fpm, only: cmd_build, cmd_install, cmd_run, cmd_test -use fpm_new_subcommand, only: cmd_new +use fpm_cmd_new, only: cmd_new implicit none diff --git a/fpm/src/fpm.f90 b/fpm/src/fpm.f90 index 41867b8..4442923 100644 --- a/fpm/src/fpm.f90 +++ b/fpm/src/fpm.f90 @@ -4,8 +4,8 @@ use fpm_strings, only: string_t, str_ends_with use fpm_backend, only: build_package use fpm_command_line, only: fpm_build_settings, fpm_new_settings, & fpm_run_settings, fpm_install_settings, fpm_test_settings -use fpm_environment, only: run -use fpm_filesystem, only: is_dir, join_path, number_of_rows, list_files, exists, basename +use fpm_environment, only: run +use fpm_filesystem, only: is_dir, join_path, number_of_rows, list_files, exists, basename use fpm_model, only: srcfile_ptr, srcfile_t, fpm_model_t, & FPM_SCOPE_UNKNOWN, FPM_SCOPE_LIB, & FPM_SCOPE_DEP, FPM_SCOPE_APP, FPM_SCOPE_TEST diff --git a/fpm/src/fpm_new_subcommand.f90 b/fpm/src/fpm_cmd_new.f90 index d8a4282..03d9ed4 100644 --- a/fpm/src/fpm_new_subcommand.f90 +++ b/fpm/src/fpm_cmd_new.f90 @@ -1,4 +1,4 @@ -module fpm_new_subcommand +module fpm_cmd_new use fpm_command_line, only : fpm_new_settings use fpm_environment, only : run, OS_LINUX, OS_MACOS, OS_WINDOWS @@ -6,13 +6,12 @@ use fpm_filesystem, only : join_path, exists, basename, mkdir use,intrinsic :: iso_fortran_env, only : stderr=>error_unit implicit none private -public :: cmd_new +public :: cmd_new contains subroutine cmd_new(settings) ! --with-executable F --with-test F ' type(fpm_new_settings), intent(in) :: settings -integer :: ierr character(len=:),allocatable :: bname ! baeename of NAME character(len=:),allocatable :: message(:) character(len=:),allocatable :: littlefile(:) @@ -70,7 +69,7 @@ character(len=:),allocatable :: littlefile(:) &'source-dir="test" ', & &'main="main.f90" ', & &''] - + littlefile=[character(len=80) :: & &'program main', & &'implicit none', & @@ -162,4 +161,4 @@ end subroutine filewrite end subroutine cmd_new -end module fpm_new_subcommand +end module fpm_cmd_new diff --git a/fpm/test/cli_test/cli_test.f90 b/fpm/test/cli_test/cli_test.f90 index a12575f..b0140e1 100644 --- a/fpm/test/cli_test/cli_test.f90 +++ b/fpm/test/cli_test/cli_test.f90 @@ -194,7 +194,7 @@ use fpm_command_line, only: & fpm_install_settings, & get_command_line_settings use fpm, only: cmd_build, cmd_install, cmd_run, cmd_test -use fpm_new_subcommand, only: cmd_new +use fpm_cmd_new, only: cmd_new class(fpm_cmd_settings), allocatable :: cmd_settings ! duplicates the calls as seen in the main program for fpm call get_command_line_settings(cmd_settings) |