Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix bugs intruduced by my previous PR #50

Merged
merged 1 commit into from
Jan 26, 2024
Merged

fix bugs intruduced by my previous PR #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions thirdparty/getFunction2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ def getFunction2(install, prefix, par):
cwd = os.getcwd()
folder = cwd + "/function2"
url = "https://github.com/Naios/function2.git"
function2_tag = "4.1.0"

if os.path.exists(folder) == False:
subprocess.run(("git clone --depth 1 " + url).split(), check=True)
subprocess.run(f"git clone --depth 1 --branch {function2_tag} {url}".split(), check=True)
os.chdir(folder)
subprocess.run("git checkout 3a0746bf5f601dfed05330aefcb6854354fce07d".split(), check=True)

sudo = ""
if(osStr == "Windows"):
Expand Down
6 changes: 3 additions & 3 deletions thirdparty/getJson.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@ def getJson(install, prefix, par):
osStr = (platform.system())
cwd = os.getcwd()
folder = cwd + "/json"
url = "https://github.com/nlohmann/json.git "
url = "https://github.com/nlohmann/json.git"
json_branch_or_tag = "develop"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, the previous version of the script to install nlohmann/json didn't explicitly specify a branch or tag or commit-id to pull, so it just pulled the default branch (develop). i have made this explicit in this PR. However, I don't know whether or not develop is stable, so if you think that it is appropriate you can change this to some release tag (e.g. v3.11.3)

Suggested change
json_branch_or_tag = "develop"
json_branch_or_tag = "v3.11.3"


if os.path.exists(folder) == False:
subprocess.run(("git clone --depth 1 " + url).split(), check=True)
subprocess.run(f"git clone --depth 1 --branch {json_branch_or_tag} {url}".split(), check=True)
os.chdir(folder)
#subprocess.run("git checkout 3a0746bf5f601dfed05330aefcb6854354fce07d".split(), check=True)

sudo = ""
if(osStr == "Windows"):
Expand Down
Loading