From 9cfe08d9c061e6e39caab9dc3a591deefa60737d Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sat, 25 Jan 2025 16:25:18 -0800 Subject: [PATCH 1/3] add FADO to init script --- externals/FADO | 2 +- meson_scripts/init.py | 9 +++++++++ preconfigure.py | 6 ++++++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/externals/FADO b/externals/FADO index de318644e81..ce7ee018e4e 160000 --- a/externals/FADO +++ b/externals/FADO @@ -1 +1 @@ -Subproject commit de318644e81037cfd20af3e12c51bf14dcdf77ba +Subproject commit ce7ee018e4e699af5028d69baa1939fea290e18a diff --git a/meson_scripts/init.py b/meson_scripts/init.py index e3df3e023ba..56114ebad35 100755 --- a/meson_scripts/init.py +++ b/meson_scripts/init.py @@ -48,6 +48,7 @@ def init_submodules( own_mpp=True, own_cool=True, own_mel=True, + own_fado=True, own_mlpcpp=True, ): @@ -71,6 +72,8 @@ def init_submodules( github_repo_coolprop = "https://github.com/CoolProp/CoolProp" sha_version_mel = "46205ab019e5224559091375a6d71aabae6bc5b9" github_repo_mel = "https://github.com/pcarruscag/MEL" + sha_version_fado = "ce7ee018e4e699af5028d69baa1939fea290e18a" + github_repo_fado = "https://github.com/pcarruscag/FADO" sha_version_mlpcpp = "6865a58b22f21a92977839d9c93eae9522402f55" github_repo_mlpcpp = "https://github.com/EvertBunschoten/MLPCpp" @@ -82,6 +85,7 @@ def init_submodules( mpp_name = "Mutationpp" coolprop_name = "CoolProp" mel_name = "MEL" + fado_name = "FADO" mlpcpp_name = "MLPCpp" base_path = cur_dir + os.path.sep + "externals" + os.path.sep @@ -91,6 +95,7 @@ def init_submodules( alt_name_meson = base_path + "meson" alt_name_ninja = base_path + "ninja" alt_name_mel = base_path + "mel" + alt_name_mel = base_path + "fado" alt_name_mpp = cur_dir + os.path.sep + "subprojects" + os.path.sep + "Mutationpp" alt_name_coolprop = cur_dir + os.path.sep + "subprojects" + os.path.sep + "CoolProp" alt_name_mlpcpp = cur_dir + os.path.sep + "subprojects" + os.path.sep + "MLPCpp" @@ -123,6 +128,8 @@ def init_submodules( submodule_status(alt_name_coolprop, sha_version_coolprop) if own_mel: submodule_status(alt_name_mel, sha_version_mel) + if own_fado: + submodule_status(alt_name_fado, sha_version_fado) if own_mlpcpp: submodule_status(alt_name_mlpcpp, sha_version_mlpcpp) # Otherwise download the zip file from git @@ -157,6 +164,8 @@ def init_submodules( ) if own_mel: download_module(mel_name, alt_name_mel, github_repo_mel, sha_version_mel) + if own_fado: + download_module(fado_name, alt_name_fado, github_repo_fado, sha_version_fado) if own_mlpcpp: download_module( mlpcpp_name, alt_name_mlpcpp, github_repo_mlpcpp, sha_version_mlpcpp diff --git a/preconfigure.py b/preconfigure.py index 51cb0599e6e..5dfe8acd8a9 100755 --- a/preconfigure.py +++ b/preconfigure.py @@ -81,6 +81,7 @@ def run( own_mpp=True, own_cool=True, own_mel=True, + own_fado=True, own_mlpcpp=True, ): @@ -94,6 +95,7 @@ def run( own_mpp=own_mpp, own_cool=own_cool, own_mel=own_mel, + own_fado=own_fado, own_mlpcpp=own_mlpcpp, ) @@ -137,6 +139,9 @@ def run( parser.add_argument( "--no-mel", help="do not download own copy of MEL", action="store_false" ) + parser.add_argument( + "--no-fado", help="do not download own copy of FADO", action="store_false" + ) parser.add_argument( "--no-mlpcpp", help="do not download copy of MLpCpp", @@ -152,5 +157,6 @@ def run( own_mpp=args.no_mpp, own_cool=args.no_coolprop, own_mel=args.no_mel, + own_fado=args.no_fado, own_mlpcpp=args.no_mlpcpp, ) From 423e3a33caf014daed21bd32c1b53e85ef0aed8d Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sat, 25 Jan 2025 16:55:35 -0800 Subject: [PATCH 2/3] fix --- meson_scripts/init.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meson_scripts/init.py b/meson_scripts/init.py index 56114ebad35..109c0232271 100755 --- a/meson_scripts/init.py +++ b/meson_scripts/init.py @@ -95,7 +95,7 @@ def init_submodules( alt_name_meson = base_path + "meson" alt_name_ninja = base_path + "ninja" alt_name_mel = base_path + "mel" - alt_name_mel = base_path + "fado" + alt_name_mel = base_path + "FADO" alt_name_mpp = cur_dir + os.path.sep + "subprojects" + os.path.sep + "Mutationpp" alt_name_coolprop = cur_dir + os.path.sep + "subprojects" + os.path.sep + "CoolProp" alt_name_mlpcpp = cur_dir + os.path.sep + "subprojects" + os.path.sep + "MLPCpp" @@ -165,7 +165,9 @@ def init_submodules( if own_mel: download_module(mel_name, alt_name_mel, github_repo_mel, sha_version_mel) if own_fado: - download_module(fado_name, alt_name_fado, github_repo_fado, sha_version_fado) + download_module( + fado_name, alt_name_fado, github_repo_fado, sha_version_fado + ) if own_mlpcpp: download_module( mlpcpp_name, alt_name_mlpcpp, github_repo_mlpcpp, sha_version_mlpcpp From 4a0b4cea87678a87cc861389dfc2f4f5f395569a Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sat, 25 Jan 2025 17:00:34 -0800 Subject: [PATCH 3/3] fix --- meson_scripts/init.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meson_scripts/init.py b/meson_scripts/init.py index 109c0232271..67a2e41a2ec 100755 --- a/meson_scripts/init.py +++ b/meson_scripts/init.py @@ -95,7 +95,7 @@ def init_submodules( alt_name_meson = base_path + "meson" alt_name_ninja = base_path + "ninja" alt_name_mel = base_path + "mel" - alt_name_mel = base_path + "FADO" + alt_name_fado = base_path + "FADO" alt_name_mpp = cur_dir + os.path.sep + "subprojects" + os.path.sep + "Mutationpp" alt_name_coolprop = cur_dir + os.path.sep + "subprojects" + os.path.sep + "CoolProp" alt_name_mlpcpp = cur_dir + os.path.sep + "subprojects" + os.path.sep + "MLPCpp"