Merge pull request #1 from awvwgk/fpm-cd

Minor adjustments to deployment script

Author: zoziha

.github/workflows/fpm-deployment.yml

@@ -22,7 +22,7 @@ jobs:
 
     - name: Generate stdlib-fpm package 🔧
       run: |
-        sh ./ci/fpm-deployment.sh
+        bash ./ci/fpm-deployment.sh
 
     - name: Install GFortran
       run: |
@@ -48,4 +48,4 @@ jobs:
       if: github.event_name != 'pull_request'
       with:
         BRANCH: stdlib-fpm
-        FOLDER: stdlib-fpm
+        FOLDER: stdlib-fpm

.gitignore

@@ -39,6 +39,7 @@ API-doc/
 
 # Build directory for out-of-tree builds
 /build
+/stdlib-fpm
 
 # Emacs backup files
 *~

ci/fpm-deployment.sh

@@ -1,31 +1,50 @@
 #!/usr/bin/env bash
-#
-#
+
 set -ex
 
-DESTDIR="stdlib-fpm"
+# Target directory to deploy stdlib to
+destdir="${DESTDIR:-stdlib-fpm}"
+
+# Get fypp preprocessor
+fypp="${FYPP:-$(which fypp)}"
+
+# Arguments for the fypp preprocessor
+fyflags="${FYFLAGS:--DMAXRANK=4}"
 
-FYFLAGS="-DMAXRANK=4"
+# Number of parallel jobs for preprocessing
+njob="$(nproc)"
 
-mkdir -p $DESTDIR/src
-mkdir -p $DESTDIR/test
+# Additional files to include
+include=(
+  "ci/fpm.toml"
+  "LICENSE"
+)
+
+# Files to remove from collection
+prune=(
+  "$destdir/test/test_always_fail.f90"
+  "$destdir/test/test_always_skip.f90"
+  "$destdir/test/test_mean_f03.f90"
+  "$destdir/src/common.f90"
+  "$destdir/src/f18estop.f90"
+)
+
+mkdir -p "$destdir/src" "$destdir/test"
 
 # Preprocess stdlib sources
-ls src/*.fypp | cut -f1 -d. | xargs -i{} fypp {}.fypp {}.f90 $FYFLAGS
+find src -maxdepth 1 -iname "*.fypp" \
+  | cut -f1 -d. | xargs -P "$njob" -I{} "$fypp" "{}.fypp" "$destdir/{}.f90" $fyflags
+
+# Collect stdlib source files
+find src -maxdepth 1 -iname "*.f90" -exec cp {} "$destdir/src/" \;
+find src/tests -name "test_*.f90" -exec cp {} "$destdir/test/" \;
+find src/tests -name "*.dat" -exec cp {} "$destdir/" \;
 
-# Collect stdlib files
-find src -maxdepth 1 -iname "*.f90" -exec cp {} $DESTDIR/src/ \;
-find src/tests -name "test_*.f90" -exec cp {} $DESTDIR/test/ \;
-find src/tests -name "*.dat" -exec cp {} $DESTDIR/ \;
-cp LICENSE $DESTDIR/
-cp ci/fpm.toml $DESTDIR/
+# Include additional files
+cp "${include[@]}" "$destdir/"
 
 # Source file workarounds for fpm
-rm $DESTDIR/test/test_always_fail.f90
-rm $DESTDIR/test/test_always_skip.f90
-rm $DESTDIR/test/test_mean_f03.f90
-rm $DESTDIR/src/common.f90
-rm $DESTDIR/src/f18estop.f90
+rm "${prune[@]}"
 
 # List stdlib-fpm package contents
-ls -R $DESTDIR
+ls -R "$destdir"

ci/fpm.toml

@@ -1,5 +1,5 @@
-name      = "stdlib"
-version   = "0.0.0"
-license   = "MIT"
-author    = "stdlib contributors"
-copyright = "2019-2021 stdlib contributors"
+name = "stdlib"
+version = "0.0.0"
+license = "MIT"
+author = "stdlib contributors"
+copyright = "2019-2021 stdlib contributors"