revert files modification

add sudo to MacOS actions (install) add python to Windows
FreeFem · Dec 8, 2023 · c14672c · c14672c
1 parent 8791364
commit c14672c
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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