Merge branch 'fortran-lang:main' into fpm-registry

.github/workflows/meta.yml

@@ -84,7 +84,7 @@ jobs:
         Remove-Item "oneAPI" -Force -Recurse
 
     - name: (Ubuntu) Install gfortran
-      if: contains(matrix.os,'ubuntu') && (!contains(matrix.mpi,'intel'))
+      if: contains(matrix.os,'ubuntu') 
       run: |
         sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-${GCC_V} 100 \
         --slave /usr/bin/gfortran gfortran /usr/bin/gfortran-${GCC_V} \
@@ -209,14 +209,6 @@ jobs:
         mv $(which fpm) fpm-bootstrap${{ matrix.exe }}
         echo "BOOTSTRAP=$PWD/fpm-bootstrap" >> $GITHUB_ENV
 
-    - name: Use Intel compiler for the metapackage tests
-      if: contains(matrix.mpi,'intel')
-      shell: bash
-      run: |
-        echo "FPM_FC=ifx" >> $GITHUB_ENV
-        echo "FPM_CC=icx"   >> $GITHUB_ENV
-        echo "FPM_CXX=icpx" >> $GITHUB_ENV
-
     - name: (macOS) Use gcc/g++ instead of Clang for C/C++
       if: contains(matrix.os,'macOS')
       shell: bash
@@ -300,6 +292,14 @@ jobs:
       env:
         EXE: fpm-${{ env.VERSION }}-${{ matrix.os-arch }}${{ matrix.exe }}
 
+    - name: Use Intel compiler for the metapackage tests
+      if: contains(matrix.mpi,'intel')
+      shell: bash
+      run: |
+        echo "FPM_FC=ifx" >> $GITHUB_ENV
+        echo "FPM_CC=icx"   >> $GITHUB_ENV
+        echo "FPM_CXX=icpx" >> $GITHUB_ENV
+
     - name: Run metapackage tests using the release version
       shell: bash
       run: |

app/main.f90

@@ -4,6 +4,7 @@ program main
         fpm_cmd_settings, &
         fpm_new_settings, &
         fpm_build_settings, &
+        fpm_export_settings, &
         fpm_run_settings, &
         fpm_test_settings, &
         fpm_install_settings, &
@@ -15,6 +16,7 @@ program main
 use fpm_filesystem, only: exists, parent_dir, join_path
 use fpm, only: cmd_build, cmd_run, cmd_clean
 use fpm_cmd_install, only: cmd_install
+use fpm_cmd_export, only: cmd_export
 use fpm_cmd_new, only: cmd_new
 use fpm_cmd_update, only : cmd_update
 use fpm_cmd_publish, only: cmd_publish
@@ -76,6 +78,8 @@ program main
     call cmd_run(settings,test=.false.)
 type is (fpm_test_settings)
     call cmd_run(settings,test=.true.)
+type is (fpm_export_settings)
+    call cmd_export(settings)
 type is (fpm_install_settings)
     call cmd_install(settings)
 type is (fpm_update_settings)

manifest-reference.md

@@ -1,3 +1,3 @@
 # 301 - Moved
 
-This document now lives at https://fpm.fortran-lang.org/en/spec/manifest.html.
+This document now lives at https://fpm.fortran-lang.org/spec/manifest.html

src/filesystem_utilities.c

@@ -1,7 +1,7 @@
 #include <sys/stat.h>
 #include <dirent.h>
 
-#if defined(__APPLE__) && !defined(__aarch64__) && !defined(__POWERPC__)
+#if defined(__APPLE__) && !defined(__aarch64__) && !defined(__ppc__) && !defined(__i386__)
 DIR * opendir$INODE64( const char * dirName );
 struct dirent * readdir$INODE64( DIR * dir );
 #define opendir opendir$INODE64

src/fpm.f90

@@ -21,6 +21,7 @@ module fpm
 use fpm_manifest, only : get_package_data, package_config_t
 use fpm_meta, only : resolve_metapackages
 use fpm_error, only : error_t, fatal_error, fpm_stop
+use fpm_toml, only: name_is_json
 use, intrinsic :: iso_fortran_env, only : stdin => input_unit, &
                                         & stdout => output_unit, &
                                         & stderr => error_unit
@@ -449,6 +450,12 @@ subroutine cmd_build(settings)
     call fpm_stop(1,'*cmd_build* Target error: '//error%message)
 end if
 
+!> Dump model to file
+if (len_trim(settings%dump)>0) then
+    call model%dump(trim(settings%dump),error,json=name_is_json(trim(settings%dump)))
+    if (allocated(error)) call fpm_stop(1,'*cmd_build* Model dump error: '//error%message)
+endif
+
 if(settings%list)then
     do i=1,size(targets)
         write(stderr,*) targets(i)%ptr%output_file

src/fpm/cmd/export.f90

@@ -0,0 +1,83 @@
+module fpm_cmd_export
+  use fpm_command_line, only : fpm_export_settings
+  use fpm_dependency, only : dependency_tree_t, new_dependency_tree
+  use fpm_error, only : error_t, fpm_stop
+  use fpm_filesystem, only : join_path
+  use fpm_manifest, only : package_config_t, get_package_data
+  use fpm_toml, only: name_is_json
+  use fpm_model, only: fpm_model_t
+  use fpm, only: build_model
+  implicit none
+  private
+  public :: cmd_export
+
+contains
+
+  !> Entry point for the export subcommand
+  subroutine cmd_export(settings)
+    !> Representation of the command line arguments
+    type(fpm_export_settings), intent(inout) :: settings
+    type(package_config_t) :: package
+    type(dependency_tree_t) :: deps
+    type(fpm_model_t) :: model
+    type(error_t), allocatable :: error
+
+    integer :: ii
+    character(len=:), allocatable :: filename
+
+    if (len_trim(settings%dump_manifest)<=0 .and. &
+        len_trim(settings%dump_model)<=0 .and. &
+        len_trim(settings%dump_dependencies)<=0) then
+        call fpm_stop(0,'*cmd_export* exiting: no manifest/model/dependencies keyword provided')
+    end if
+
+    !> Read in manifest
+    call get_package_data(package, "fpm.toml", error, apply_defaults=.true.)
+    call handle_error(error)
+
+    !> Export manifest
+    if (len_trim(settings%dump_manifest)>0) then
+       filename = trim(settings%dump_manifest)
+       call package%dump(filename, error, json=name_is_json(filename))
+    end if
+
+    !> Export dependency tree
+    if (len_trim(settings%dump_dependencies)>0) then
+
+        !> Generate dependency tree
+        filename = join_path("build", "cache.toml")
+        call new_dependency_tree(deps, cache=filename, verbosity=merge(2, 1, settings%verbose))
+        call deps%add(package, error)
+        call handle_error(error)
+
+        !> Export dependency tree
+        filename = settings%dump_dependencies
+        call deps%dump(filename, error, json=name_is_json(filename))
+        call handle_error(error)
+    end if
+
+    !> Export full model
+    if (len_trim(settings%dump_model)>0) then
+
+        call build_model(model, settings%fpm_build_settings, package, error)
+        if (allocated(error)) then
+            call fpm_stop(1,'*cmd_export* Model error: '//error%message)
+        end if
+
+        filename = settings%dump_model
+        call model%dump(filename, error, json=name_is_json(filename))
+        call handle_error(error)
+    end if
+
+  end subroutine cmd_export
+
+  !> Error handling for this command
+  subroutine handle_error(error)
+    !> Potential error
+    type(error_t), intent(in), optional :: error
+    if (present(error)) then
+      call fpm_stop(1, '*cmd_export* error: '//error%message)
+    end if
+  end subroutine handle_error
+
+end module fpm_cmd_export

src/fpm/cmd/update.f90

@@ -4,6 +4,7 @@ module fpm_cmd_update
   use fpm_error, only : error_t, fpm_stop
   use fpm_filesystem, only : exists, mkdir, join_path, delete_file, filewrite
   use fpm_manifest, only : package_config_t, get_package_data
+  use fpm_toml, only: name_is_json
   implicit none
   private
   public :: cmd_update
@@ -14,10 +15,10 @@ module fpm_cmd_update
   subroutine cmd_update(settings)
     !> Representation of the command line arguments
     type(fpm_update_settings), intent(in) :: settings
+
     type(package_config_t) :: package
     type(dependency_tree_t) :: deps
     type(error_t), allocatable :: error
-
     integer :: ii
     character(len=:), allocatable :: cache
 
@@ -57,14 +58,19 @@ subroutine cmd_update(settings)
       end do
     end if
 
+    if (len_trim(settings%dump)>0) then
+        call deps%dump(trim(settings%dump), error, json=name_is_json(trim(settings%dump)))
+        call handle_error(error)
+    end if
+
   end subroutine cmd_update
 
   !> Error handling for this command
   subroutine handle_error(error)
     !> Potential error
     type(error_t), intent(in), optional :: error
     if (present(error)) then
-      call fpm_stop(1, error%message)
+      call fpm_stop(1, '*cmd_update* error: '//error%message)
     end if
   end subroutine handle_error