Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

proposal to close #525 by generating build/.gitignore #528

Merged
merged 3 commits into from Aug 4, 2021
Merged

proposal to close #525 by generating build/.gitignore #528

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbd6aa3
git-specific, but not git-dependent but is it better if managed direc…
urbanjost Jul 30, 2021
5ab9dab
put NAME/.gitignore back
urbanjost Jul 31, 2021
1eba840
no .gitignore generated by subcommand new
urbanjost Jul 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/fpm.f90
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ module fpm
fpm_run_settings, fpm_install_settings, fpm_test_settings
use fpm_dependency, only : new_dependency_tree
use fpm_environment, only: run, get_env
use fpm_filesystem, only: is_dir, join_path, number_of_rows, list_files, exists, basename
use fpm_filesystem, only: is_dir, join_path, number_of_rows, list_files, exists, basename, filewrite, mkdir
use fpm_model, only: fpm_model_t, srcfile_t, show_model, &
FPM_SCOPE_UNKNOWN, FPM_SCOPE_LIB, FPM_SCOPE_DEP, &
FPM_SCOPE_APP, FPM_SCOPE_EXAMPLE, FPM_SCOPE_TEST
Expand Down Expand Up @@ -58,6 +58,11 @@ subroutine build_model(model, settings, package, error)
call model%deps%add(package, error)
if (allocated(error)) return

! build/ directory should now exist
if (.not.exists("build/.gitignore")) then
call filewrite(join_path("build", ".gitignore"),["*"])
end if

if(settings%compiler.eq.'')then
model%fortran_compiler = 'gfortran'
else
Expand Down
3 changes: 0 additions & 3 deletions src/fpm/cmd/new.f90
View file
Open in desktop
Expand Up @@ -98,9 +98,6 @@ subroutine cmd_new(settings)
! like realpath() or getcwd().
bname=basename(settings%name)

! create NAME/.gitignore file
call warnwrite(join_path(settings%name, '.gitignore'), ['build/*'])
awvwgk marked this conversation as resolved.
Show resolved Hide resolved

littlefile=[character(len=80) :: '# '//bname, 'My cool new project!']

! create NAME/README.md
Expand Down
3 changes: 2 additions & 1 deletion src/fpm/cmd/update.f90
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@ module fpm_cmd_update
use fpm_command_line, only : fpm_update_settings
use fpm_dependency, only : dependency_tree_t, new_dependency_tree
use fpm_error, only : error_t, fpm_stop
use fpm_filesystem, only : exists, mkdir, join_path, delete_file
use fpm_filesystem, only : exists, mkdir, join_path, delete_file, filewrite
use fpm_manifest, only : package_config_t, get_package_data
implicit none
private
Expand All @@ -26,6 +26,7 @@ subroutine cmd_update(settings)

if (.not.exists("build")) then
call mkdir("build")
call filewrite(join_path("build", ".gitignore"),["*"])
end if

cache = join_path("build", "cache.toml")
Expand Down
7 changes: 2 additions & 5 deletions src/fpm_command_line.f90
View file
Open in desktop
Expand Up @@ -936,14 +936,11 @@ subroutine set_help()
' o runs the command "git init" in that directory ', &
' o populates the directory with the default project directories ', &
' o adds sample Fortran source files ', &
' o adds a ".gitignore" file for ignoring the build/ directory ', &
' (where fpm-generated output will be placed) ', &
' ', &
' The default file structure (that will be automatically scanned) is ', &
' ', &
' NAME/ ', &
' fpm.toml ', &
' .gitignore ', &
' src/ ', &
' NAME.f90 ', &
' app/ ', &
Expand Down Expand Up @@ -1004,8 +1001,8 @@ subroutine set_help()
' depend extensively on non-default build options. ', &
' ', &
' --bare A minimal manifest file ("fpm.toml") is created and ', &
' a ".gitignore" and "README.md" file is created but no ', &
' directories or sample Fortran is generated. ', &
' "README.md" file is created but no directories or ', &
' sample Fortran are generated. ', &
' ', &
' --help print this help and exit ', &
' --version print program version information and exit ', &
Expand Down