From 5b3bc4436a928c5a596395e774d96e3e5a6ba67a Mon Sep 17 00:00:00 2001 From: Simon Garnotel Date: Mon, 10 Jun 2024 15:49:19 +0200 Subject: [PATCH] missing conflict --- 3rdparty/getall | 295 +++++++++++++++++++++++++----------------- 3rdparty/perltidy.ERR | 5 - 2 files changed, 173 insertions(+), 127 deletions(-) delete mode 100644 3rdparty/perltidy.ERR diff --git a/3rdparty/getall b/3rdparty/getall index 9d2530e64..6fd042c77 100755 --- a/3rdparty/getall +++ b/3rdparty/getall @@ -111,82 +111,139 @@ download( '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'); +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.math.upmc.fr/frey/ftp/archives/freeyams.2012.02.05.tgz', - 'https://www.ljll.math.upmc.fr/frey/software.html', - 'freeyams.2012.02.05.tgz', - 'b7c82a256a3e59beeb2b578de93a4e0b'); -download('Gmm++','https://www.ljll.fr/hecht/pkg/gmm-4.2.tar.gz', - 'https://www.ljll.fr/hecht/pkg/', - 'gmm-4.2.tar.gz', - '35fe900f7459c49f4b4337dc691c8cdf'); -download('Ipopt','http://www.coin-or.org/download/source/Ipopt/Ipopt-3.12.4.tgz', - 'https://projects.coin-or.org/Ipopt', - 'Ipopt-3.12.4.tgz', - '12a8ecaff8dd90025ddea6c65b49cb03'); -download('METIS','http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz', - 'http://www.netlib.org/linalg/', - 'metis-5.1.0.tar.gz', - '5465e67079419a69e0116de24fce58fe'); -download('ParMETIS','http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz', - 'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/', - 'ParMetis-4.0.3.tar.gz', - 'f69c479586bf6bb7aff6a9bc0c739628'); -download('MMG3D','http://www.math.u-bordeaux1.fr/~dobrzyns/logiciels/download/mmg3d4.0.tgz', - 'http://www.math.u-bordeaux1.fr/~dobrzyns/logiciels/mmg3d.php', - 'mmg3d4.0.tgz', - 'bfc2b0373bc208e0512415d1aa2e76a1'); -download('mshmet','https://www.ljll.math.upmc.fr/frey/ftp/archives/mshmet.2012.04.25.tgz', - 'https://www.ljll.math.upmc.fr/frey/software.html', - 'mshmet.2012.04.25.tgz', - '427f397e0602efc56aa897d38a8e9bfa'); -download('MUMPS','http://mumps.enseeiht.fr/MUMPS_5.0.2.tar.gz', - 'http://mumps.enseeiht.fr/', - 'MUMPS_5.0.2.tar.gz', - '591bcb2c205dcb0283872608cdf04927'); -download('NLopt','http://ab-initio.mit.edu/nlopt/nlopt-2.2.4.tar.gz', - 'http://ab-initio.mit.edu/wiki/index.php/NLopt', - 'nlopt-2.2.4.tar.gz', - '9c60c6380a10c6d2a06895f0e8756d4f'); -download('ScaLAPACK','http://www.netlib.org/scalapack/scalapack-2.1.0.tgz', - 'http://www.netlib.org/scalapack/', - 'scalapack-2.1.0.tgz', - '3b239ef80353c67354a0a62d54946fa8'); -download('Scotch','https://gitlab.inria.fr/scotch/scotch/-/archive/v6.1.0/scotch-v6.1.0.tar.gz', - 'https://gitlab.inria.fr/scotch/', - 'scotch-v6.1.0.tar.gz', - '7bfad4aaa851af6815b2160da7ebe36a'); # web certificate from gforge.inria.fr is rejected -download('SuiteSparse','http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.4.tar.gz', - 'http://faculty.cse.tamu.edu/davis/SuiteSparse/', - 'SuiteSparse-4.4.4.tar.gz', - 'e0af74476935c9ff6d971df8bb6b82fc') ; +download( + 'freeYams', + 'https://www.ljll.math.upmc.fr/frey/ftp/archives/freeyams.2012.02.05.tgz', + 'https://www.ljll.math.upmc.fr/frey/software.html', + 'freeyams.2012.02.05.tgz', + 'b7c82a256a3e59beeb2b578de93a4e0b' +); +download( + 'Gmm++', + 'https://www.ljll.fr/hecht/pkg/gmm-4.2.tar.gz', + 'https://www.ljll.fr/hecht/pkg/', + 'gmm-4.2.tar.gz', + '35fe900f7459c49f4b4337dc691c8cdf' +); +download( + 'Ipopt', + 'http://www.coin-or.org/download/source/Ipopt/Ipopt-3.12.4.tgz', + 'https://projects.coin-or.org/Ipopt', + 'Ipopt-3.12.4.tgz', + '12a8ecaff8dd90025ddea6c65b49cb03' +); +download( + 'METIS', + 'http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/metis-5.1.0.tar.gz', + 'http://www.netlib.org/linalg/', + 'metis-5.1.0.tar.gz', + '5465e67079419a69e0116de24fce58fe' +); +download( + 'ParMETIS', + 'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/parmetis-4.0.3.tar.gz', + 'http://glaros.dtc.umn.edu/gkhome/fetch/sw/parmetis/', + 'ParMetis-4.0.3.tar.gz', + 'f69c479586bf6bb7aff6a9bc0c739628' +); +download( + 'MMG3D', + 'http://www.math.u-bordeaux1.fr/~dobrzyns/logiciels/download/mmg3d4.0.tgz', + 'http://www.math.u-bordeaux1.fr/~dobrzyns/logiciels/mmg3d.php', + 'mmg3d4.0.tgz', + 'bfc2b0373bc208e0512415d1aa2e76a1' +); +download( + 'mshmet', + 'https://www.ljll.math.upmc.fr/frey/ftp/archives/mshmet.2012.04.25.tgz', + 'https://www.ljll.math.upmc.fr/frey/software.html', + 'mshmet.2012.04.25.tgz', + '427f397e0602efc56aa897d38a8e9bfa' +); +download( + 'MUMPS', + 'http://mumps.enseeiht.fr/MUMPS_5.0.2.tar.gz', + 'http://mumps.enseeiht.fr/', + 'MUMPS_5.0.2.tar.gz', + '591bcb2c205dcb0283872608cdf04927' +); +download( + 'NLopt', + 'http://ab-initio.mit.edu/nlopt/nlopt-2.2.4.tar.gz', + 'http://ab-initio.mit.edu/wiki/index.php/NLopt', + 'nlopt-2.2.4.tar.gz', + '9c60c6380a10c6d2a06895f0e8756d4f' +); +download( + 'ScaLAPACK', + 'http://www.netlib.org/scalapack/scalapack-2.1.0.tgz', + 'http://www.netlib.org/scalapack/', + 'scalapack-2.1.0.tgz', + '3b239ef80353c67354a0a62d54946fa8' +); +download( + 'Scotch', +'https://gitlab.inria.fr/scotch/scotch/-/archive/v6.1.0/scotch-v6.1.0.tar.gz', + 'https://gitlab.inria.fr/scotch/', + 'scotch-v6.1.0.tar.gz', + '7bfad4aaa851af6815b2160da7ebe36a' +); # web certificate from gforge.inria.fr is rejected +download( + 'SuiteSparse', + 'http://faculty.cse.tamu.edu/davis/SuiteSparse/SuiteSparse-4.4.4.tar.gz', + 'http://faculty.cse.tamu.edu/davis/SuiteSparse/', + 'SuiteSparse-4.4.4.tar.gz', + 'e0af74476935c9ff6d971df8bb6b82fc' +); + #download('SuperLU','https://github.com/xiaoyeli/superlu/archive/4f2da83a24c52641c1f7ab06f57c00b8954cf215.zip', # 'https://github.com/xiaoyeli/superlu', # 'superlu.zip', # '596927f39d28a7d6eb396764f46455b2'); -download('SuperLU','https://github.com/xiaoyeli/superlu/archive/v5.2.2.zip', - 'https://github.com/xiaoyeli/superlu', - 'superlu-5.2.2.zip', - '6e24842b0aa07f457d929b162e09ca6c'); -download('TetGen','http://www.tetgen.org/1.5/src/tetgen1.5.1-beta1.tar.gz', - 'http://www.tetgen.org/1.5/src/', - 'tetgen1.5.1-beta1.tar.gz', - '3d55c197bcbfc611b7ced6f343643756'); -download('mmg','https://github.com/MmgTools/mmg/archive/a90b665e909a3921490d3e281f7afa2d243a5ba0.zip', - 'https://github.com/MmgTools', - 'mmg.zip', - 'd824d08dac0544caff20a915194da0fe'); -download('parmmg','https://github.com/MmgTools/ParMmg/archive/f78f4e3e1019137787588aab7a8052fbc60dada2.zip', - 'https://github.com/MmgTools', - 'parmmg.zip', - '9a76fef6be1ab66af3a813409a0388c9'); -download('PETSc','https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-3.21.2.tar.gz', - 'https://web.cels.anl.gov/projects/petsc/download/release-snapshots', - 'petsc-3.21.2.tar.gz', - '0bb68b348861a796ddfc2e94e3fcd02d'); +download( + 'SuperLU', + 'https://github.com/xiaoyeli/superlu/archive/v5.2.2.zip', + 'https://github.com/xiaoyeli/superlu', + 'superlu-5.2.2.zip', + '6e24842b0aa07f457d929b162e09ca6c' +); +download( + 'TetGen', + 'http://www.tetgen.org/1.5/src/tetgen1.5.1-beta1.tar.gz', + 'http://www.tetgen.org/1.5/src/', + 'tetgen1.5.1-beta1.tar.gz', + '3d55c197bcbfc611b7ced6f343643756' +); +download( + 'mmg', +'https://github.com/MmgTools/mmg/archive/a90b665e909a3921490d3e281f7afa2d243a5ba0.zip', + 'https://github.com/MmgTools', + 'mmg.zip', + 'd824d08dac0544caff20a915194da0fe' +); +download( + 'parmmg', +'https://github.com/MmgTools/ParMmg/archive/f78f4e3e1019137787588aab7a8052fbc60dada2.zip', + 'https://github.com/MmgTools', + 'parmmg.zip', + '9a76fef6be1ab66af3a813409a0388c9' +); +download( + 'PETSc', +'https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-3.21.2.tar.gz', + 'https://web.cels.anl.gov/projects/petsc/download/release-snapshots', + 'petsc-3.21.2.tar.gz', + '0bb68b348861a796ddfc2e94e3fcd02d' +); download( 'freeYams', @@ -340,21 +397,13 @@ download( 'bb0e3ee1ad06174c80a69bc0756034e7' ); -<<<<<<< HEAD download( 'libpthread-google', -'https://github.com/FreeFem/FreeFEM-3rdparties/raw/main/libpthread-google.tar.gz', - 'http://pkgs.freefem.org/', + 'https://www.ljll.fr/hecht/pkg/libpthread-google.tar.gz', + 'https://www.ljll.fr/hecht/pkg/', 'libpthread-google.tar.gz', - '751874eb5d14d4f445a94df1aa0c56b6' + '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'); - ->>>>>>> develop # run all downloads concurrently @@ -405,44 +454,46 @@ sub download { push @downloads, "$url,$pkg,$md5,$opts"; } -sub downloadone{ - ## correct rescue server for done load - my($url,$pkg,$md5,$opts)=split(/,/,$_[0]);# warning just $pkg without pkg/$pkg - my $cmd="../bin/build/download $url pkg/$pkg $opts"; - print "$cmd\n"; - system $cmd; - if($?){ - print "Download failed from $url of $pkg\n"; - my $url="https://www.ljll.fr/hecht/pkg/$pkg"; - my $cmd="../bin/build/download $url pkg/$pkg $opts"; - print "Try other site: $url\n"; - system $cmd; - if($?){ - print "Download 2 times failed from $url of $pkg\n"; - my $url="http://104.46.50.187/pkg/$pkg"; - my $cmd="../bin/build/download $url pkg/$pkg $opts"; - print "Try (2 times) other site: $url\n"; - system $cmd; - if ($?){ - $errors.="ERROR: $cmd FAILED\n" - } - } - - } - # check if resulting package contents are valid - my $md5check=md5_hex(`cat pkg/$pkg`); - if( ( $md5 ne "none") && ($md5check ne $md5)){ - print "Download failed (MD5 check) from $url of $pkg\n"; - my $url="https://www.ljll.fr/hecht/pkg/$pkg"; - my $cmd="../bin/build/download $url pkg/$pkg $opts"; - print "Try other site: $url\n"; - system $cmd; - if($?){ - $errors.="ERROR 2: $cmd FAILED\n" - } - else { $md5check=md5_hex(`cat pkg/$pkg`);} - if( ($md5check ne $md5)) - { - $errors.="ERROR2: INVALID MD5 for $pkg $md5check\n"} - } +sub downloadone { + ## correct rescue server for done load + my ( $url, $pkg, $md5, $opts ) = + split( /,/, $_[0] ); # warning just $pkg without pkg/$pkg + my $cmd = "../bin/build/download $url pkg/$pkg $opts"; + print "$cmd\n"; + system $cmd; + if ($?) { + print "Download failed from $url of $pkg\n"; + my $url = "https://www.ljll.fr/hecht/pkg/$pkg"; + my $cmd = "../bin/build/download $url pkg/$pkg $opts"; + print "Try other site: $url\n"; + system $cmd; + if ($?) { + print "Download 2 times failed from $url of $pkg\n"; + my $url = "http://104.46.50.187/pkg/$pkg"; + my $cmd = "../bin/build/download $url pkg/$pkg $opts"; + print "Try (2 times) other site: $url\n"; + system $cmd; + if ($?) { + $errors .= "ERROR: $cmd FAILED\n"; + } + } + + } + + # check if resulting package contents are valid + my $md5check = md5_hex(`cat pkg/$pkg`); + if ( ( $md5 ne "none" ) && ( $md5check ne $md5 ) ) { + print "Download failed (MD5 check) from $url of $pkg\n"; + my $url = "https://www.ljll.fr/hecht/pkg/$pkg"; + my $cmd = "../bin/build/download $url pkg/$pkg $opts"; + print "Try other site: $url\n"; + system $cmd; + if ($?) { + $errors .= "ERROR 2: $cmd FAILED\n"; + } + else { $md5check = md5_hex(`cat pkg/$pkg`); } + if ( ( $md5check ne $md5 ) ) { + $errors .= "ERROR2: INVALID MD5 for $pkg $md5check\n"; + } + } } diff --git a/3rdparty/perltidy.ERR b/3rdparty/perltidy.ERR deleted file mode 100644 index cb01232ac..000000000 --- a/3rdparty/perltidy.ERR +++ /dev/null @@ -1,5 +0,0 @@ -Perltidy version is 20230309 - -: Begin Error Output Stream -343: Use of bare << to mean <<"" is deprecated -343: Use of bare << to mean <<"" is deprecated