From c14672c6fbec757c7ba0547bc981088fb7ac1056 Mon Sep 17 00:00:00 2001 From: Simon Garnotel Date: Fri, 8 Dec 2023 17:35:25 +0100 Subject: [PATCH] revert files modification add sudo to MacOS actions (install) add python to Windows --- .github/workflows/job1.yml | 2 +- .github/workflows/job2.yml | 2 +- .github/workflows/job3.yml | 2 +- .github/workflows/job4-mpich.yml | 2 +- .github/workflows/job4-msmpi.yml | 2 ++ .github/workflows/job4-openmpi.yml | 2 +- .github/workflows/job5-mpich.yml | 2 +- .github/workflows/job5-msmpi.yml | 2 ++ .github/workflows/job5-openmpi.yml | 2 +- Makefile.am | 2 +- bin/script/PostInstall.m4 | 9 ++++----- etc/config/FreeFem++.scrpt-txt.in | 2 +- 12 files changed, 17 insertions(+), 14 deletions(-) diff --git a/.github/workflows/job1.yml b/.github/workflows/job1.yml index 7a4922cf9..1d1028f10 100644 --- a/.github/workflows/job1.yml +++ b/.github/workflows/job1.yml @@ -75,7 +75,7 @@ jobs: - name: Check continue-on-error: true - run: make check + run: sudo make check #TODO should work without sudo - name: Install run: make install diff --git a/.github/workflows/job2.yml b/.github/workflows/job2.yml index d77191de5..5e4a3fcc6 100644 --- a/.github/workflows/job2.yml +++ b/.github/workflows/job2.yml @@ -80,7 +80,7 @@ jobs: run: make check - name: Install - run: make install + run: sudo make check #TODO should work without sudo windows: name: Job2 - Windows diff --git a/.github/workflows/job3.yml b/.github/workflows/job3.yml index bd0074c04..e7ed45fa4 100644 --- a/.github/workflows/job3.yml +++ b/.github/workflows/job3.yml @@ -83,7 +83,7 @@ jobs: run: make check - name: Install - run: make install + run: sudo make check #TODO should work without sudo windows: name: Job3 - Windows diff --git a/.github/workflows/job4-mpich.yml b/.github/workflows/job4-mpich.yml index 3742eb254..a95b78248 100644 --- a/.github/workflows/job4-mpich.yml +++ b/.github/workflows/job4-mpich.yml @@ -97,4 +97,4 @@ jobs: run: make check - name: Install - run: make install + run: sudo make check #TODO should work without sudo diff --git a/.github/workflows/job4-msmpi.yml b/.github/workflows/job4-msmpi.yml index 953029594..187cb8ee2 100644 --- a/.github/workflows/job4-msmpi.yml +++ b/.github/workflows/job4-msmpi.yml @@ -41,6 +41,8 @@ jobs: tar mingw-w64-x86_64-cmake mingw-w64-x86_64-msmpi + python + mingw-w64-x86_64-python - uses: actions/checkout@v4 diff --git a/.github/workflows/job4-openmpi.yml b/.github/workflows/job4-openmpi.yml index 39dbbdaf6..dc611480e 100644 --- a/.github/workflows/job4-openmpi.yml +++ b/.github/workflows/job4-openmpi.yml @@ -98,4 +98,4 @@ jobs: run: make check - name: Install - run: make install + run: sudo make check #TODO should work without sudo diff --git a/.github/workflows/job5-mpich.yml b/.github/workflows/job5-mpich.yml index 96c0991c9..c130a6a63 100644 --- a/.github/workflows/job5-mpich.yml +++ b/.github/workflows/job5-mpich.yml @@ -97,4 +97,4 @@ jobs: run: make check - name: Install - run: make install + run: sudo make check #TODO should work without sudo diff --git a/.github/workflows/job5-msmpi.yml b/.github/workflows/job5-msmpi.yml index 92bb2e1b4..a521f8dd2 100644 --- a/.github/workflows/job5-msmpi.yml +++ b/.github/workflows/job5-msmpi.yml @@ -41,6 +41,8 @@ jobs: tar mingw-w64-x86_64-cmake mingw-w64-x86_64-msmpi + python + mingw-w64-x86_64-python - uses: actions/checkout@v4 diff --git a/.github/workflows/job5-openmpi.yml b/.github/workflows/job5-openmpi.yml index 6baba3a74..94d72cc89 100644 --- a/.github/workflows/job5-openmpi.yml +++ b/.github/workflows/job5-openmpi.yml @@ -98,4 +98,4 @@ jobs: run: make check - name: Install - run: make install + run: sudo make check #TODO should work without sudo diff --git a/Makefile.am b/Makefile.am index 3cabb0378..ced1c9cec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -296,7 +296,7 @@ install-exec-local:: bin/script/PostInstall.sh FreeFEM-documentation.pdf if [ -f $$i ]; then $(INSTALL) -m 555 $$i "$(DESTDIR)$(ff_prefix_dir)/idp"; fi; done bin/script/PostInstall.sh:./Makefile bin/script/PostInstall.m4 - m4 "-DFF__FVER=$(PACKAGE_VERSION)" "-DFF_BINDIR=$(bindir)" "-DFF__DATADIR=$(pkgdatadir)" "-DFF__DESTDIR=$(DESTDIR)" bin/script/PostInstall.m4 > bin/script/PostInstall.sh + m4 "-DFF__FVER=$(PACKAGE_VERSION)" "-DFF_BINDIR=$(bindir)" "-DFF__DATADIR=$(pkgdatadir)" bin/script/PostInstall.m4 > bin/script/PostInstall.sh chmod a+x bin/script/PostInstall.sh FreeFEM-documentation.pdf:Makefile diff --git a/bin/script/PostInstall.m4 b/bin/script/PostInstall.m4 index 5667304a1..553a2ec9c 100644 --- a/bin/script/PostInstall.m4 +++ b/bin/script/PostInstall.m4 @@ -2,18 +2,17 @@ # "-DFF__FVER=$(PACKAGE_VERSION)" # "-DFF_BINDIR=$(bindir)" # "-DFF__DATADIR=$(pkgdatadir) -# "-DFF__DESTDIR=$(DESTDIR)" # "FFBIN="@prefix@"/bin if [ "$(uname)" = "Darwin" ]; then ff_desktop="$HOME/Desktop/FreeFem++-""FF__FVER" - mkdir -p -m 0755 "FF__DESTDIR"/etc/paths.d + mkdir -p -m 0755 /etc/paths.d ln -sf "FF__DATADIR"/"FreeFEM-documentation.pdf" "$HOME/Desktop" test -e "$ff_desktop" || ln -sf "FF__DATADIR"/"FF__FVER" "$ff_desktop" - echo Install "FF__DESTDIR"/etc/paths.d/FreeFem++ file: "FF_BINDIR" + echo Install /etc/paths.d/FreeFem++ file: "FF_BINDIR" - echo "FF_BINDIR" > "FF__DESTDIR"/etc/paths.d/FreeFem++ - chmod a+r "FF__DESTDIR"/etc/paths.d/FreeFem++ + echo "FF_BINDIR" > /etc/paths.d/FreeFem++ + chmod a+r /etc/paths.d/FreeFem++ fi echo " Try to Clean old file version " diff --git a/etc/config/FreeFem++.scrpt-txt.in b/etc/config/FreeFem++.scrpt-txt.in index 24c4b6a23..50061f145 100644 --- a/etc/config/FreeFem++.scrpt-txt.in +++ b/etc/config/FreeFem++.scrpt-txt.in @@ -48,7 +48,7 @@ on freefem(edpfile) if not (exists window 1) then reopen activate try - do shell script "/usr/bin/env bash -c 'export PATH=\"$PATH:$(cat "$(DESTDIR)/etc/paths.d/FreeFem++")\";cd \"" & edpdir & "\";FreeFem++-CoCoa \"" & edppath & "\"'" + do shell script "/usr/bin/env bash -c 'export PATH=\"$PATH:$(cat /etc/paths.d/FreeFem++)\";cd \"" & edpdir & "\";FreeFem++-CoCoa \"" & edppath & "\"'" end try end tell end freefem