admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename build_llvm_monorepo to just build_llvm. NFC. (#560)

Browse Source 
And build_llvm_fastcomp to just build_fastcomp (matches its name
in the json file.
This commit is contained in:
Sam Clegg
2020-07-20 17:33:54 -07:00
committed by GitHub
parent 3249417955
commit d8984b2a9d
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
emsdk.py
View File

@@ -1038,8 +1038,8 @@ def xcode_sdk_version():
return subprocess.checkplatform.mac_ver()[0].split('.') return subprocess.checkplatform.mac_ver()[0].split('.')
def build_llvm_fastcomp(tool): def build_fastcomp(tool):
debug_print('build_llvm_fastcomp(' + str(tool) + ')') debug_print('build_fastcomp(' + str(tool) + ')')
fastcomp_root = tool.installation_path() fastcomp_root = tool.installation_path()
fastcomp_src_root = os.path.join(fastcomp_root, 'src') fastcomp_src_root = os.path.join(fastcomp_root, 'src')
# Does this tool want to be git cloned from github? # Does this tool want to be git cloned from github?
@@ -1123,9 +1123,10 @@ def build_llvm_fastcomp(tool):
return success return success
# LLVM git source tree migrated to a single repository instead of multiple ones, build_llvm_monorepo() builds via that repository structure # LLVM git source tree migrated to a single repository instead of multiple
def build_llvm_monorepo(tool): # ones, build_llvm() builds via that repository structure
debug_print('build_llvm_monorepo(' + str(tool) + ')') def build_llvm(tool):
debug_print('build_llvm(' + str(tool) + ')')
llvm_root = tool.installation_path() llvm_root = tool.installation_path()
llvm_src_root = os.path.join(llvm_root, 'src') llvm_src_root = os.path.join(llvm_root, 'src')
success = git_clone_checkout_and_pull(tool.download_url(), llvm_src_root, tool.git_branch) success = git_clone_checkout_and_pull(tool.download_url(), llvm_src_root, tool.git_branch)
@@ -1841,9 +1842,9 @@ class Tool(object):
url = self.download_url() url = self.download_url()
if hasattr(self, 'custom_install_script') and self.custom_install_script == 'build_fastcomp': if hasattr(self, 'custom_install_script') and self.custom_install_script == 'build_fastcomp':
success = build_llvm_fastcomp(self) success = build_fastcomp(self)
elif hasattr(self, 'custom_install_script') and self.custom_install_script == 'build_llvm_monorepo': elif hasattr(self, 'custom_install_script') and self.custom_install_script == 'build_llvm':
success = build_llvm_monorepo(self) success = build_llvm(self)
elif hasattr(self, 'git_branch'): elif hasattr(self, 'git_branch'):
success = git_clone_checkout_and_pull(url, self.installation_path(), self.git_branch) success = git_clone_checkout_and_pull(url, self.installation_path(), self.git_branch)
elif url.endswith(ARCHIVE_SUFFIXES): elif url.endswith(ARCHIVE_SUFFIXES):
@@ -1869,7 +1870,7 @@ class Tool(object):
success = emscripten_post_install(self) success = emscripten_post_install(self)
elif self.custom_install_script == 'emscripten_npm_install': elif self.custom_install_script == 'emscripten_npm_install':
success = emscripten_npm_install(self, self.installation_path()) success = emscripten_npm_install(self, self.installation_path())
elif self.custom_install_script in ('build_fastcomp', 'build_llvm_monorepo'): elif self.custom_install_script in ('build_fastcomp', 'build_llvm'):
# 'build_fastcomp' is a special one that does the download on its # 'build_fastcomp' is a special one that does the download on its
# own, others do the download manually. # own, others do the download manually.
pass pass

4
emsdk_manifest.json
View File

@@ -7,7 +7,7 @@
"install_path": "llvm/git", "install_path": "llvm/git",
"git_branch": "master", "git_branch": "master",
"url": "https://github.com/llvm/llvm-project.git", "url": "https://github.com/llvm/llvm-project.git",
"custom_install_script": "build_llvm_monorepo", "custom_install_script": "build_llvm",
"only_supports_wasm": true, "only_supports_wasm": true,
"activated_path": "%installation_dir%/%fastcomp_build_bin_dir%", "activated_path": "%installation_dir%/%fastcomp_build_bin_dir%",
"activated_cfg": "LLVM_ROOT='%installation_dir%/%fastcomp_build_bin_dir%'", "activated_cfg": "LLVM_ROOT='%installation_dir%/%fastcomp_build_bin_dir%'",
@@ -21,7 +21,7 @@
"install_path": "llvm/git", "install_path": "llvm/git",
"git_branch": "master", "git_branch": "master",
"url": "https://github.com/llvm/llvm-project.git", "url": "https://github.com/llvm/llvm-project.git",
"custom_install_script": "build_llvm_monorepo", "custom_install_script": "build_llvm",
"only_supports_wasm": true, "only_supports_wasm": true,
"activated_path": "%installation_dir%/%fastcomp_build_bin_dir%", "activated_path": "%installation_dir%/%fastcomp_build_bin_dir%",
"activated_cfg": "LLVM_ROOT='%installation_dir%/%fastcomp_build_bin_dir%'", "activated_cfg": "LLVM_ROOT='%installation_dir%/%fastcomp_build_bin_dir%'",