Skip to content

Commit

Permalink
Merge branch 'release/2022.1.2' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
melpon committed Jun 2, 2022
2 parents ca7cf66 + 9ab64e8 commit f168aa1
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
2 changes: 1 addition & 1 deletion CHANGES.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

## develop

## 2022.1.1
## 2022.1.2

- [FIX] ubuntu-22.04_x86_64 のリリースバイナリが含まれていなかったのを修正
- @melpon
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SORA_CPP_SDK_VERSION=2022.1.0
SORA_CPP_SDK_VERSION=2022.1.2
WEBRTC_BUILD_VERSION=m102.5005.7.5
BOOST_VERSION=1.79.0
CMAKE_VERSION=3.23.1
Expand Down
19 changes: 13 additions & 6 deletions run.py
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,16 @@ def clone_and_checkout(url, version, dir, fetch, fetch_force):
cmd(['git', 'checkout', '-f', version])


def git_clone_shallow(url, hash, dir):
rm_rf(dir)
mkdir_p(dir)
with cd(dir):
cmd(['git', 'init'])
cmd(['git', 'remote', 'add', 'origin', url])
cmd(['git', 'fetch', '--depth=1', 'origin', hash])
cmd(['git', 'reset', '--hard', 'FETCH_HEAD'])


@versioned
def install_webrtc(version, source_dir, install_dir, platform: str):
win = platform.startswith("windows_")
Expand Down Expand Up @@ -471,20 +481,17 @@ def install_llvm(version, install_dir,
mkdir_p(llvm_dir)
with cd(llvm_dir):
# tools の update.py を叩いて特定バージョンの clang バイナリを拾う
cmd(['git', 'clone', tools_url, 'tools'])
git_clone_shallow(tools_url, tools_commit, 'tools')
with cd('tools'):
cmd(['git', 'reset', '--hard', tools_commit])
cmd(['python3',
os.path.join('clang', 'scripts', 'update.py'),
'--output-dir', os.path.join(llvm_dir, 'clang')])

# 特定バージョンの libcxx を利用する
cmd(['git', 'clone', libcxx_url, 'libcxx'])
with cd('libcxx'):
cmd(['git', 'reset', '--hard', libcxx_commit])
git_clone_shallow(libcxx_url, libcxx_commit, 'libcxx')

# __config_site のために特定バージョンの buildtools を取得する
cmd(['git', 'clone', buildtools_url, 'buildtools'])
git_clone_shallow(buildtools_url, buildtools_commit, 'buildtools')
with cd('buildtools'):
cmd(['git', 'reset', '--hard', buildtools_commit])
shutil.copyfile(os.path.join(llvm_dir, 'buildtools', 'third_party', 'libc++', '__config_site'),
Expand Down

0 comments on commit f168aa1

Please sign in to comment.