Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-09-21 09:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/v0.6.0' into v0.7.0

Browse Source
This commit is contained in:
Thomas Krijnen
2019-08-03 14:48:25 +02:00
parent fd9c57b77d 188b20533b
commit 5ccc7213a0
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nix/build-all.py
+6 -3
View File
@@ -341,11 +341,14 @@ def git_clone_or_pull_repository(clone_url, target_dir, revision=None):
run([git, "clone", clone_url, target_dir]) run([git, "clone", clone_url, target_dir])
else: else:
logger.info("directory '%s' already cloned. Pulling latest changes." % (target_dir,)) logger.info("directory '%s' already cloned. Pulling latest changes." % (target_dir,))
run([git, "pull", clone_url], cwd=target_dir)
# detect whether we are on a branch and pull
if run([git, "rev-parse", "--abbrev-ref", "HEAD"], cwd=target_dir) != "HEAD":
run([git, "pull", clone_url], cwd=target_dir)
if revision != None: if revision != None:
run([git, "checkout", revision], cwd=target_dir) run([git, "checkout", revision], cwd=target_dir)
run([git, "pull"], cwd=target_dir)
def build_dependency(name, mode, build_tool_args, download_url, download_name, download_tool=download_tool_default, revision=None, patch=None, additional_files={}, no_append_name=False): def build_dependency(name, mode, build_tool_args, download_url, download_name, download_tool=download_tool_default, revision=None, patch=None, additional_files={}, no_append_name=False):
"""Handles building of dependencies with different tools (which are """Handles building of dependencies with different tools (which are