Skip to content

Commit 5409778

Browse files
minhqdaominhqdao
committed
Rename to config_file
1 parent 607c95f commit 5409778

File tree

1 file changed

+25
-25
lines changed

1 file changed

+25
-25
lines changed

‎src/fpm_command_line.f90

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ subroutine get_command_line_settings(cmd_settings)
222222
type(fpm_install_settings), allocatable :: install_settings
223223
type(version_t) :: version
224224
character(len=:), allocatable :: common_args, compiler_args, run_args, working_dir, &
225-
& c_compiler, cxx_compiler, archiver, version_s, token_s, global_config
225+
& c_compiler, cxx_compiler, archiver, version_s, token_s, config_file
226226

227227
character(len=*), parameter :: fc_env = "FC", cc_env = "CC", ar_env = "AR", &
228228
& fflags_env = "FFLAGS", cflags_env = "CFLAGS", cxxflags_env = "CXXFLAGS", ldflags_env = "LDFLAGS", &
@@ -291,7 +291,7 @@ subroutine get_command_line_settings(cmd_settings)
291291
call set_args(common_args // compiler_args // run_args //'&
292292
& --all F &
293293
& --example F &
294-
& --global-config " " &
294+
& --config-file " " &
295295
& --',help_run,version_text)
296296

297297
call check_build_vals()
@@ -321,7 +321,7 @@ subroutine get_command_line_settings(cmd_settings)
321321
c_compiler = sget('c-compiler')
322322
cxx_compiler = sget('cxx-compiler')
323323
archiver = sget('archiver')
324-
global_config = sget('global-config')
324+
config_file = sget('config-file')
325325
allocate(fpm_run_settings :: cmd_settings)
326326
val_runner=sget('runner')
327327
if(specified('runner') .and. val_runner=='')val_runner='echo'
@@ -333,7 +333,7 @@ subroutine get_command_line_settings(cmd_settings)
333333
& c_compiler=c_compiler, &
334334
& cxx_compiler=cxx_compiler, &
335335
& archiver=archiver, &
336-
& path_to_config=global_config, &
336+
& path_to_config=config_file, &
337337
& flag=val_flag, &
338338
& cflag=val_cflag, &
339339
& cxxflag=val_cxxflag, &
@@ -350,15 +350,15 @@ subroutine get_command_line_settings(cmd_settings)
350350
& --list F &
351351
& --show-model F &
352352
& --tests F &
353-
& --global-config " " &
353+
& --config-file " " &
354354
& --',help_build,version_text)
355355

356356
call check_build_vals()
357357

358358
c_compiler = sget('c-compiler')
359359
cxx_compiler = sget('cxx-compiler')
360360
archiver = sget('archiver')
361-
global_config = sget('global-config')
361+
config_file = sget('config-file')
362362

363363
allocate( fpm_build_settings :: cmd_settings )
364364
cmd_settings=fpm_build_settings( &
@@ -368,7 +368,7 @@ subroutine get_command_line_settings(cmd_settings)
368368
& c_compiler=c_compiler, &
369369
& cxx_compiler=cxx_compiler, &
370370
& archiver=archiver, &
371-
& path_to_config=global_config, &
371+
& path_to_config=config_file, &
372372
& flag=val_flag, &
373373
& cflag=val_cflag, &
374374
& cxxflag=val_cxxflag, &
@@ -513,15 +513,15 @@ subroutine get_command_line_settings(cmd_settings)
513513
& --libdir "lib" &
514514
& --bindir "bin" &
515515
& --includedir "include" &
516-
& --global-config " " &
516+
& --config-file " " &
517517
&', help_install, version_text)
518518

519519
call check_build_vals()
520520

521521
c_compiler = sget('c-compiler')
522522
cxx_compiler = sget('cxx-compiler')
523523
archiver = sget('archiver')
524-
global_config = sget('global-config')
524+
config_file = sget('config-file')
525525
allocate(install_settings, source=fpm_install_settings(&
526526
list=lget('list'), &
527527
profile=val_profile,&
@@ -530,7 +530,7 @@ subroutine get_command_line_settings(cmd_settings)
530530
c_compiler=c_compiler, &
531531
cxx_compiler=cxx_compiler, &
532532
archiver=archiver, &
533-
path_to_config=global_config, &
533+
path_to_config=config_file, &
534534
flag=val_flag, &
535535
cflag=val_cflag, &
536536
cxxflag=val_cxxflag, &
@@ -556,7 +556,7 @@ subroutine get_command_line_settings(cmd_settings)
556556

557557
case('test')
558558
call set_args(common_args // compiler_args // run_args // '&
559-
& --global-config " " &
559+
& --config-file " " &
560560
& -- ', help_test,version_text)
561561

562562
call check_build_vals()
@@ -581,7 +581,7 @@ subroutine get_command_line_settings(cmd_settings)
581581
c_compiler = sget('c-compiler')
582582
cxx_compiler = sget('cxx-compiler')
583583
archiver = sget('archiver')
584-
global_config = sget('global-config')
584+
config_file = sget('config-file')
585585

586586
allocate(fpm_test_settings :: cmd_settings)
587587
val_runner=sget('runner')
@@ -594,7 +594,7 @@ subroutine get_command_line_settings(cmd_settings)
594594
& c_compiler=c_compiler, &
595595
& cxx_compiler=cxx_compiler, &
596596
& archiver=archiver, &
597-
& path_to_config=global_config, &
597+
& path_to_config=config_file, &
598598
& flag=val_flag, &
599599
& cflag=val_cflag, &
600600
& cxxflag=val_cxxflag, &
@@ -610,7 +610,7 @@ subroutine get_command_line_settings(cmd_settings)
610610
call set_args(common_args // '&
611611
& --fetch-only F &
612612
& --clean F &
613-
& --global-config " " &
613+
& --config-file " " &
614614
&', help_update, version_text)
615615

616616
if( size(unnamed) > 1 )then
@@ -619,23 +619,23 @@ subroutine get_command_line_settings(cmd_settings)
619619
names=[character(len=len(names)) :: ]
620620
endif
621621

622-
global_config = sget('global-config')
622+
config_file = sget('config-file')
623623

624624
allocate(fpm_update_settings :: cmd_settings)
625625
cmd_settings=fpm_update_settings(name=names, &
626626
& fetch_only=lget('fetch-only'), &
627627
& verbose=lget('verbose'), &
628-
& path_to_config=global_config, &
628+
& path_to_config=config_file, &
629629
& clean=lget('clean'))
630630

631631
case('clean')
632632
call set_args(common_args // '&
633633
& --skip &
634634
& --all &
635-
& --global-config " " &
635+
& --config-file " " &
636636
&', help_clean, version_text)
637637

638-
global_config = sget('global-config')
638+
config_file = sget('config-file')
639639

640640
allocate(fpm_clean_settings :: cmd_settings)
641641
call get_current_directory(working_dir, error)
@@ -644,7 +644,7 @@ subroutine get_command_line_settings(cmd_settings)
644644
& calling_dir=working_dir, &
645645
& clean_skip=lget('skip'), &
646646
& clean_call=lget('all'), &
647-
& path_to_config=global_config &
647+
& path_to_config=config_file &
648648
&)
649649

650650
case('publish')
@@ -656,15 +656,15 @@ subroutine get_command_line_settings(cmd_settings)
656656
& --list F &
657657
& --show-model F &
658658
& --tests F &
659-
& --global-config " " &
659+
& --config-file " " &
660660
& --', help_publish, version_text)
661661

662662
call check_build_vals()
663663

664664
c_compiler = sget('c-compiler')
665665
cxx_compiler = sget('cxx-compiler')
666666
archiver = sget('archiver')
667-
global_config = sget('global-config')
667+
config_file = sget('config-file')
668668
token_s = sget('token')
669669

670670
allocate(fpm_publish_settings :: cmd_settings)
@@ -685,7 +685,7 @@ subroutine get_command_line_settings(cmd_settings)
685685
& list=lget('list'),&
686686
& show_model=lget('show-model'),&
687687
& build_tests=lget('tests'),&
688-
& path_to_config=global_config, &
688+
& path_to_config=config_file, &
689689
& verbose=lget('verbose'),&
690690
& token=token_s)
691691

@@ -1324,7 +1324,7 @@ subroutine set_help()
13241324
'', &
13251325
'SYNOPSIS', &
13261326
' fpm update [--fetch-only] [--clean] [--verbose] [NAME(s)] ', &
1327-
' [--global-config PATH] ', &
1327+
' [--config-file PATH] ', &
13281328
'', &
13291329
'DESCRIPTION', &
13301330
' Manage and update project dependencies. If no dependency names are', &
@@ -1346,7 +1346,7 @@ subroutine set_help()
13461346
'SYNOPSIS', &
13471347
' fpm install [--profile PROF] [--flag FFLAGS] [--list] [--no-rebuild]', &
13481348
' [--prefix DIR] [--bindir DIR] [--libdir DIR] [--includedir DIR]', &
1349-
' [--verbose] [--global-config PATH]', &
1349+
' [--verbose] [--config-file PATH]', &
13501350
'', &
13511351
'DESCRIPTION', &
13521352
' Subcommand to install fpm projects. Running install will export the', &
@@ -1409,7 +1409,7 @@ subroutine set_help()
14091409
'', &
14101410
'SYNOPSIS', &
14111411
' fpm publish [--token TOKEN] [--show-package-version] [--show-upload-data]', &
1412-
' [--dry-run] [--verbose] [--global-config PATH]', &
1412+
' [--dry-run] [--verbose] [--config-file PATH]', &
14131413
'', &
14141414
' fpm publish --help|--version', &
14151415
'', &

0 commit comments

Comments
 (0)