SGarnotel misc changes

- Don't seem to impact CI directly
- Most appear to be formatting changes

Author: simonlegrand

.gitignore

@@ -40,6 +40,7 @@
 *freefem++.pref
 WHERE*
 CheckAll-out
+build
 examples/*/*.b
 examples/*/*.dat
 examples/*/*.dt

3rdparty/getall

@@ -24,17 +24,17 @@
 
 use strict;
 use Getopt::Std;
-use Digest::MD5 qw(md5_hex); # [[http://perldoc.perl.org/Digest/MD5.html]]
+use Digest::MD5 qw(md5_hex);    # [[http://perldoc.perl.org/Digest/MD5.html]]
 
 # This download script needs to be able to work on platforms that do not have threads (eg Mingw).
 
-my $can_use_threads=eval 'use threads;use threads::shared;1';
+my $can_use_threads = eval 'use threads;use threads::shared;1';
 
 my %opts;
-getopts('afho:',\%opts);
+getopts( 'afho:', \%opts );
 
-if($opts{h}){
-	print <<EOF;
+if ( $opts{h} ) {
+    print <<EOF;
 getall [options]: Download third-party packages independently of the FreeFEM configuration procedure
 
 Available options:
@@ -45,34 +45,34 @@ Available options:
 -o name,name,... = only download packages with the given names
 
 EOF
-	exit 0;
+    exit 0;
 }
 
 # Accumulate errors and print them all at the end of the script
 
-my $errors='';
-if($can_use_threads){share(\$errors)}
+my $errors = '';
+if ($can_use_threads) { share( \$errors ) }
 
 # Accumulate errors and print them all at the end of the script
 
-my $errors='';
-if($can_use_threads){share(\$errors)}
+my $errors = '';
+if ($can_use_threads) { share( \$errors ) }
 
 # list required packages
-my $only=0;
+my $only = 0;
 my %packs;
-if(defined $opts{o}){
-	$only=1;
-	foreach(split(/,/,$opts{o})){$packs{$_}=1}
+if ( defined $opts{o} ) {
+    $only = 1;
+    foreach ( split( /,/, $opts{o} ) ) { $packs{$_} = 1 }
 }
 
 # can be run from the parent directory
 
-if(-x "3rdparty/getall"){chdir "3rdparty"}
+if ( -x "3rdparty/getall" ) { chdir "3rdparty" }
 
 # can be run from any of the child directories
 
-if(-x "../getall"){chdir ".."}
+if ( -x "../getall" ) { chdir ".." }
 
 system "mkdir -p pkg";
 my @downloads;
@@ -99,9 +99,6 @@ download('OpenBLAS','http://github.com/xianyi/OpenBLAS/archive/v0.3.6.tar.gz',
 	'8a110a25b819a4b94e8a9580702b6495',
 	'BAD_CERT');
 
-download('FFTW','http://www.fftw.org/fftw-3.3.8.tar.gz',
-	'http://www.fftw.org',
-	'fftw-3.3.8.tar.gz','8aac833c943d8e90d51b697b27d4384d');
 # 3.3.2	'6977ee770ed68c85698c7168ffa6e178');
 download('freeYams','https://www.ljll.fr/frey/ftp/archives/freeyams.2012.02.05.tgz',
 	'https://www.ljll.fr/frey/software.html',
@@ -181,11 +178,13 @@ download('htool','https://github.com/htool-ddm/htool/archive/f9a7e48eaa90cad7e23
 		'htool.zip',
 		'f0b977c3ab24f26e23b5e7398577d0f4');
 
-	
-download('hpddm','https://codeload.github.com/hpddm/hpddm/zip/7113b9a6b77fceee3f52490cb27941a87b96542f',
-	'https://codeload.github.com/hpddm',
-	'hpddm.zip',
-	'6910b7b974f0b60d9c247c666e7f3862');
+download(
+    'hpddm',
+'https://codeload.github.com/hpddm/hpddm/zip/7113b9a6b77fceee3f52490cb27941a87b96542f',
+    'https://codeload.github.com/hpddm',
+    'hpddm.zip',
+    '6910b7b974f0b60d9c247c666e7f3862'
+);
 
 download('bemtool','https://github.com/PierreMarchand20/BemTool/archive/6e61fbf86d8cd53994d9f597e60fde537650ba14.zip',
 	'https://github.com/PierreMarchand20/BemTool',
@@ -203,53 +202,61 @@ download('libpthread-google','https://www.ljll.fr/hecht/pkg/libpthread-google.ta
 		'libpthread-google.tar.gz',
 		'945c006d898983d1a710aabf52a32d9c');
 
+download(
+    'libpthread-google',
+    'https://www.ljll.fr/hecht/pkg/libpthread-google.tar.gz',
+    'https://www.ljll.fr/hecht/pkg/',
+    'libpthread-google.tar.gz',
+    '945c006d898983d1a710aabf52a32d9c'
+);
 
 # run all downloads concurrently
 
-if($can_use_threads){
-	my @threads;
-	foreach(@downloads){push @threads,threads->create(\&downloadone,$_)}
-	foreach(@threads){$_->join()}
+if ($can_use_threads) {
+    my @threads;
+    foreach (@downloads) { push @threads, threads->create( \&downloadone, $_ ) }
+    foreach (@threads)   { $_->join() }
 }
-else{
-	foreach(@downloads){downloadone($_)}
+else {
+    foreach (@downloads) { downloadone($_) }
 }
 
-if($errors ne ''){
-	print "\n$errors";
-	exit 1;
+if ( $errors ne '' ) {
+    print "\n$errors";
+    exit 1;
 }
 
-sub download{
-	my($title,$url,$lic,$pkg,$md5,$opts)=@_;
-
-	# skip packages that have not been requested explicitely
-	return if($only && !defined $packs{$title});
-
-	# skip packages that are already present
-	if(-f "pkg/$pkg" && !$opts{f}){
-		my $md5check=md5_hex(`cat pkg/$pkg`);
-		if( ( $md5 eq "none") || ($md5check eq $md5)){
-			print "$title $pkg done\n";
-			return;
-		}
-		else {
-			print "$title $pkg  md5 change => reget \n";
-		}
-	}
-
-	# we do not store the answers to these questions. To repeat the same downloads without manual input, options "-a" and
-	# "-o names" are provided.
-
-	if(!$opts{a}){
-		print "$title: please check the licence at $lic. Do you want to download $url? (yN)\n";
-		my $ans=uc <STDIN>;
-		chomp $ans;
-		return if $ans ne 'Y';
-	}
-
-	# uses [[file:../bin/build/download]]
-	push @downloads,"$url,$pkg,$md5,$opts";
+sub download {
+    my ( $title, $url, $lic, $pkg, $md5, $opts ) = @_;
+
+    # skip packages that have not been requested explicitely
+    return if ( $only && !defined $packs{$title} );
+
+    # skip packages that are already present
+    if ( -f "pkg/$pkg" && !$opts{f} ) {
+        my $md5check = md5_hex(`cat pkg/$pkg`);
+        if ( ( $md5 eq "none" ) || ( $md5check eq $md5 ) ) {
+            print "$title $pkg done\n";
+            return;
+        }
+        else {
+            print "$title $pkg  md5 change => reget \n";
+        }
+    }
+
+# we do not store the answers to these questions. To repeat the same downloads without manual input, options "-a" and
+# "-o names" are provided.
+
+    if ( !$opts{a} ) {
+        print
+"$title: please check the licence at $lic. Do you want to download $url? (yN)\n";
+        my $ans = uc <STDIN>;
+        chomp $ans;
+        return if $ans ne 'Y';
+    }
+
+    # uses [[file:../bin/build/download]]
+    push @downloads, "$url,$pkg,$md5,$opts";
 }
 
 sub downloadone{
@@ -260,7 +267,7 @@ sub downloadone{
 	system $cmd;
 	if($?){
 		print "Download failed from $url of $pkg\n";
-		my $url="https://www.ljll.fr/hecht/pkg/$pkg";
+		my $url="https://joliv.et/freefem/pkg/$pkg";
 		my $cmd="../bin/build/download $url pkg/$pkg $opts";
 		print "Try other site: $url\n";
 		system $cmd;
@@ -280,7 +287,7 @@ sub downloadone{
 	my $md5check=md5_hex(`cat pkg/$pkg`);
 	if( ( $md5 ne "none") && ($md5check ne $md5)){
 		print "Download failed (MD5 check $md5check ) from $url of $pkg\n";
-		my $url="https://www.ljll.fr/hecht/pkg/$pkg";
+		my $url="https://joliv.et/freefem/pkg/$pkg";
 		my $cmd="../bin/build/download $url pkg/$pkg $opts";
 		print "Try other site: $url\n";
 		system $cmd;

bin/change-dylib-gfortran

@@ -1,8 +1,8 @@
-#!/bin/bash 
-##  change path gfortran lib in freefem install 
+#!/bin/bash
+##  change path gfortran lib in freefem install
 ## usage : change-dylibgfortran oldlibdir newlibdir  libnam1 libnam2   list of dylyb file pathname to change ...
-## F. hecht sep. 2023 on MoOS Ventura , Monterey 
-## remark the file $oldlibdir/$libnam1 , ... must exist ... 
+## F. hecht sep. 2023 on MoOS Ventura , Monterey
+## remark the file $oldlibdir/$libnam1 , ... must exist ...
 olddir=$1
 shift
 newdir=$1
@@ -14,36 +14,35 @@ shift
 lib3=$1
 shift
 
-
-if test -f "$olddir/$lib1" -a  -f "$olddir/$lib2" -a  -f "$olddir/$lib3" \
-    -a  -f "$newdir/$lib1" -a  -f "$newdir/$lib2" -a  -f "$newdir/$lib3" ; then 
-for ff in $@; do
-ch=0
-for lib in $lib1 $lib2 $lib3; do 
-  old=$olddir/$lib	
-  new=$newdir/$lib	
-  nnl=`otool -L $ff|grep $lib|awk '{print $1}'`
-  case $nnl in
-	  /* ) old=$nnl
-  esac
-#  echo "old .. " $old  $nnl
-#  otool -L $ff|awk "/$lib/ "'{print $1}'
-  nn=`otool -L $ff|grep $old|wc -l`
-#  echo "nn=" $nn $nnl $old
-  otool -L $ff| grep brew	  
-  if test $nn -ne 0  ; then
-#    echo ..change $old to $new in $ff
-    ch=1
-    echo change  $old to  $new1 in $ff
-    install_name_tool -change $old $new $ff
-  fi
-  done
-  if test $ch -eq 1  ; then
-    codesign  --remove-signature $ff
-    codesign -s -  $ff
-  fi
-  done 
+if test -f "$olddir/$lib1" -a -f "$olddir/$lib2" -a -f "$olddir/$lib3" \
+	-a -f "$newdir/$lib1" -a -f "$newdir/$lib2" -a -f "$newdir/$lib3"; then
+	for ff in $@; do
+		ch=0
+		for lib in $lib1 $lib2 $lib3; do
+			old=$olddir/$lib
+			new=$newdir/$lib
+			nnl=$(otool -L $ff | grep $lib | awk '{print $1}')
+			case $nnl in
+			/*) old=$nnl ;;
+			esac
+			#  echo "old .. " $old  $nnl
+			#  otool -L $ff|awk "/$lib/ "'{print $1}'
+			nn=$(otool -L $ff | grep $old | wc -l)
+			#  echo "nn=" $nn $nnl $old
+			otool -L $ff | grep brew
+			if test $nn -ne 0; then
+				#    echo ..change $old to $new in $ff
+				ch=1
+				echo change $old to $new1 in $ff
+				install_name_tool -change $old $new $ff
+			fi
+		done
+		if test $ch -eq 1; then
+			codesign --remove-signature $ff
+			codesign -s - $ff
+		fi
+	done
 else
-	echo "$olddir/$lib1"  "$olddir/$lib2"  "$olddir/$lib3"  do some not exist!
-	echo "$newdir/$lib1"  "$newdir/$lib2"  "$newdir/$lib3" do not exist!
-fi
+	echo "$olddir/$lib1" "$olddir/$lib2" "$olddir/$lib3" do some not exist!
+	echo "$newdir/$lib1" "$newdir/$lib2" "$newdir/$lib3" do not exist!
+fi