From 8b0da77b2868583ec415b63ae6560148f2e8a37d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?B=C3=A1lint=20Aradi?= Date: Fri, 27 Sep 2024 13:07:25 +0200 Subject: [PATCH] Rename repo export script --- .github/workflows/ci.yml | 2 +- .../coarray => fpm-repo/coarray/addons}/fpm.toml | 0 .../coarray/rsync.ignore => fpm-repo/coarray/repo.ignore} | 0 .../coarray/rsync.include => fpm-repo/coarray/repo.include} | 0 .../fpm-export.sh => fpm-repo/export-fpm-repo.sh} | 6 +++--- devel/{fpm-export/mpi => fpm-repo/mpi/addons}/fpm.toml | 0 .../mpi/rsync.ignore => fpm-repo/mpi/repo.ignore} | 0 .../mpi/rsync.include => fpm-repo/mpi/repo.include} | 0 .../{fpm-export/serial => fpm-repo/serial/addons}/fpm.toml | 0 .../serial/rsync.ignore => fpm-repo/serial/repo.ignore} | 0 .../serial/rsync.include => fpm-repo/serial/repo.include} | 0 11 files changed, 4 insertions(+), 4 deletions(-) rename devel/{fpm-export/coarray => fpm-repo/coarray/addons}/fpm.toml (100%) rename devel/{fpm-export/coarray/rsync.ignore => fpm-repo/coarray/repo.ignore} (100%) rename devel/{fpm-export/coarray/rsync.include => fpm-repo/coarray/repo.include} (100%) rename devel/{fpm-export/fpm-export.sh => fpm-repo/export-fpm-repo.sh} (57%) rename devel/{fpm-export/mpi => fpm-repo/mpi/addons}/fpm.toml (100%) rename devel/{fpm-export/mpi/rsync.ignore => fpm-repo/mpi/repo.ignore} (100%) rename devel/{fpm-export/mpi/rsync.include => fpm-repo/mpi/repo.include} (100%) rename devel/{fpm-export/serial => fpm-repo/serial/addons}/fpm.toml (100%) rename devel/{fpm-export/serial/rsync.ignore => fpm-repo/serial/repo.ignore} (100%) rename devel/{fpm-export/serial/rsync.include => fpm-repo/serial/repo.include} (100%) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b75d60a..9cfa305 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -173,7 +173,7 @@ jobs: - name: Test fpm export run: | - ./devel/fpm-export/fpm-export.sh ${INTERFACE} ${FPM_EXPORT_DIR} + ./devel/fpm-repo/export-fpm-repo.sh ${INTERFACE} ${FPM_EXPORT_DIR} fpm run -C ${FPM_EXPORT_DIR}/test/export/${INTERFACE} testapp rm -rf ${FPM_EXPORT_DIR} diff --git a/devel/fpm-export/coarray/fpm.toml b/devel/fpm-repo/coarray/addons/fpm.toml similarity index 100% rename from devel/fpm-export/coarray/fpm.toml rename to devel/fpm-repo/coarray/addons/fpm.toml diff --git a/devel/fpm-export/coarray/rsync.ignore b/devel/fpm-repo/coarray/repo.ignore similarity index 100% rename from devel/fpm-export/coarray/rsync.ignore rename to devel/fpm-repo/coarray/repo.ignore diff --git a/devel/fpm-export/coarray/rsync.include b/devel/fpm-repo/coarray/repo.include similarity index 100% rename from devel/fpm-export/coarray/rsync.include rename to devel/fpm-repo/coarray/repo.include diff --git a/devel/fpm-export/fpm-export.sh b/devel/fpm-repo/export-fpm-repo.sh similarity index 57% rename from devel/fpm-export/fpm-export.sh rename to devel/fpm-repo/export-fpm-repo.sh index c7faf6e..c8fb705 100755 --- a/devel/fpm-export/fpm-export.sh +++ b/devel/fpm-repo/export-fpm-repo.sh @@ -12,8 +12,8 @@ fi rsync \ -av \ - --exclude-from=${SCRIPT_DIR}/${configdir}/rsync.ignore \ - --include-from=${SCRIPT_DIR}/${configdir}/rsync.include \ + --exclude-from=${SCRIPT_DIR}/${configdir}/repo.ignore \ + --include-from=${SCRIPT_DIR}/${configdir}/repo.include \ --exclude='*' \ ${SCRIPT_DIR}/../../ ${destdir} -cp ${SCRIPT_DIR}/${configdir}/fpm.toml ${destdir} \ No newline at end of file +rsync -av ${SCRIPT_DIR}/${configdir}/addons/ ${destdir} \ No newline at end of file diff --git a/devel/fpm-export/mpi/fpm.toml b/devel/fpm-repo/mpi/addons/fpm.toml similarity index 100% rename from devel/fpm-export/mpi/fpm.toml rename to devel/fpm-repo/mpi/addons/fpm.toml diff --git a/devel/fpm-export/mpi/rsync.ignore b/devel/fpm-repo/mpi/repo.ignore similarity index 100% rename from devel/fpm-export/mpi/rsync.ignore rename to devel/fpm-repo/mpi/repo.ignore diff --git a/devel/fpm-export/mpi/rsync.include b/devel/fpm-repo/mpi/repo.include similarity index 100% rename from devel/fpm-export/mpi/rsync.include rename to devel/fpm-repo/mpi/repo.include diff --git a/devel/fpm-export/serial/fpm.toml b/devel/fpm-repo/serial/addons/fpm.toml similarity index 100% rename from devel/fpm-export/serial/fpm.toml rename to devel/fpm-repo/serial/addons/fpm.toml diff --git a/devel/fpm-export/serial/rsync.ignore b/devel/fpm-repo/serial/repo.ignore similarity index 100% rename from devel/fpm-export/serial/rsync.ignore rename to devel/fpm-repo/serial/repo.ignore diff --git a/devel/fpm-export/serial/rsync.include b/devel/fpm-repo/serial/repo.include similarity index 100% rename from devel/fpm-export/serial/rsync.include rename to devel/fpm-repo/serial/repo.include