From bfd9b06249814ad7c4bc47c0f065d6337f87076c Mon Sep 17 00:00:00 2001
From: Laurence Kedward <laurence.kedward@bristol.ac.uk>
Date: Mon, 22 Nov 2021 16:13:01 +0000
Subject: Add: backend_output to manage pretty printing of build progress

---
 src/fpm_backend.f90 | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

(limited to 'src/fpm_backend.f90')

diff --git a/src/fpm_backend.f90 b/src/fpm_backend.f90
index 731763f..e0ed972 100644
--- a/src/fpm_backend.f90
+++ b/src/fpm_backend.f90
@@ -35,6 +35,7 @@ use fpm_model, only: fpm_model_t
 use fpm_strings, only: string_t, operator(.in.)
 use fpm_targets, only: build_target_t, build_target_ptr, FPM_TARGET_OBJECT, &
                        FPM_TARGET_C_OBJECT, FPM_TARGET_ARCHIVE, FPM_TARGET_EXECUTABLE
+use fpm_backend_output
 implicit none
 
 private
@@ -62,6 +63,8 @@ subroutine build_package(targets,model,verbose)
     type(string_t), allocatable :: build_dirs(:)
     type(string_t) :: temp
 
+    type(console_t) :: console
+    integer :: line, n_complete
     logical :: plain_output
 
     ! Need to make output directory for include (mod) files
@@ -92,16 +95,24 @@ subroutine build_package(targets,model,verbose)
     allocate(stat(size(queue)))
     stat(:) = 0
     build_failed = .false.
+    n_complete = 0
 
     ! Set output mode
     plain_output = (.not.(c_isatty()==1)) .or. verbose
+    call console%init(plain_output)
+    call output_init(plain_output)
+
     ! Loop over parallel schedule regions
     do i=1,size(schedule_ptr)-1
 
         ! Build targets in schedule region i
-        !$omp parallel do default(shared) private(skip_current) schedule(dynamic,1)
+        !$omp parallel do default(shared) private(skip_current,line) schedule(dynamic,1)
         do j=schedule_ptr(i),(schedule_ptr(i+1)-1)
 
+            ! Update console output
+            call output_status_compiling(console, line, queue(j)%ptr)
+            call output_progress(n_complete, size(queue),plain_output)
+
             ! Check if build already failed
             !$omp atomic read
             skip_current = build_failed
@@ -116,10 +127,15 @@ subroutine build_package(targets,model,verbose)
                 build_failed = .true.
             end if
 
+            ! Update console output
+            call output_status_complete(console, line, queue(j)%ptr,stat(j), n_complete)
+            call output_progress(n_complete, size(queue),plain_output)
+
         end do
 
         ! Check if this schedule region failed: exit with message if failed
         if (build_failed) then
+            write(*,*) ''
             do j=1,size(stat)
                 if (stat(j) /= 0) then
                     write(stderr,'(*(g0:,1x))') '<ERROR> Compilation failed for object "',basename(queue(j)%ptr%output_file),'"'
@@ -130,6 +146,8 @@ subroutine build_package(targets,model,verbose)
 
     end do
 
+    call output_progress_complete()
+
 end subroutine build_package
 
 
-- 
cgit v1.2.3