- webrtc build 官方
更新
- 参考
- 目录执行在 /webrtc-checkout/src
zhangbin@DESKTOP-152DH8F MINGW64 /j/WEBRWTCSTORE/webrtc-checkout/src (zhangbin-branch-com)
$ git rebase-update
Fetching origin
remote: Counting objects: 1544, done
remote: Finding sources: 100% (3193/3193)
remote: Total 3193 (delta 1735), reused 3191 (delta 1735)
Receiving objects: 100% (3193/3193), 4.28 MiB | 587.00 KiB/s, done.
Resolving deltas: 100% (1735/1735), completed with 505 local objects.
From https://webrtc.googlesource.com/src
ae10029bff..c8ff1600d3 master -> origin/master
fe35045f3d..691dcc2d23 infra/config -> origin/infra/config
768c5f438c..c8ff1600d3 lkgr -> origin/lkgr
Rebasing: master
Rebasing: zhangbin-branch-com
Deleted branch master (was c8ff1600d3).
Deleted branch zhangbin-branch-com (was c8ff1600d3).
'zhangbin-branch-com' was merged with its parent, checking out 'origin/master' instead.
zhangbin@DESKTOP-152DH8F MINGW64 /j/WEBRWTCSTORE/webrtc-checkout/src ((c8ff1600d3...))
$
gclient sync
zhangbin@DESKTOP-152DH8F MINGW64 /j/WEBRWTCSTORE/webrtc-checkout/src ((c8ff1600d3...))
$ gclient sync
Syncing projects: 16% ( 6/37) src/tools
[0:04:34] Still working on:
[0:04:34] src/third_party
[0:04:44] Still working on:
[0:04:44] src/third_party
[0:04:54] Still working on:
[0:04:54] src/third_party
[0:05:04] Still working on:
[0:05:04] src/third_party
[0:05:14] Still working on:
[0:05:14] src/third_party
[0:05:24] Still working on:
[0:05:24] src/third_party
[0:05:28] Still working on:
[0:05:28] src/third_party
Syncing projects: 18% ( 7/37) src/third_party
src/buildtools (ERROR)
----------------------------------------
[0:00:00] Started.
[0:00:00] Finished running: git config remote.origin.url
[0:00:00] Finished running: git rev-list -n 1 HEAD
[0:00:01] Finished running: git rev-parse --abbrev-ref=strict HEAD
From https://chromium.googlesource.com/chromium/src/buildtools
[0:00:05] fa02977..afc5b79 master -> origin/master
[0:00:05] Finished running: git rev-parse --verify FETCH_HEAD
[0:00:05] Finished running: git rev-parse afc5b798c72905e85f9991152be878714c579958
----------------------------------------
Error: 4>
4> ____ src\buildtools at afc5b798c72905e85f9991152be878714c579958
4> You have unstaged changes.
4> Please commit, stash, or reset.
zhangbin@DESKTOP-152DH8F MINGW64 /j/WEBRWTCSTORE/webrtc-checkout/src ((c8ff1600d3...))
$ git status
HEAD detached at origin/master
Untracked files:
(use "git add <file>..." to include in what will be committed)
out0/
nothing added to commit but untracked files present (use "git add" to track)
zhangbin@DESKTOP-152DH8F MINGW64 /j/WEBRWTCSTORE/webrtc-checkout/src ((c8ff1600d3...))
$
处理冲突
- 我发现我自己的分支不见了
zhangbin@DESKTOP-152DH8F MINGW64 /j/WEBRWTCSTORE/webrtc-checkout/src ((c8ff1600d3...))
$ git branch -a
* (HEAD detached at origin/master)
remotes/origin/HEAD -> origin/master
remotes/origin/infra/config
remotes/origin/lkgr
remotes/origin/master
zhangbin@DESKTOP-152DH8F MINGW64 /j/WEBRWTCSTORE/webrtc-checkout/src ((c8ff1600d3...))
$ git reset --hard origin master
fatal: Cannot do hard reset with paths.
zhangbin@DESKTOP-152DH8F MINGW64 /j/WEBRWTCSTORE/webrtc-checkout/src ((c8ff1600d3...))
$ git reset --hard
HEAD is now at c8ff1600d3 Don't crash when renegotiating after the peer rejects data channels
zhangbin@DESKTOP-152DH8F MINGW64 /j/WEBRWTCSTORE/webrtc-checkout/src ((c8ff1600d3...))
$ git pull origin master
From https://webrtc.googlesource.com/src
* branch master -> FETCH_HEAD
Already up to date.
zhangbin@DESKTOP-152DH8F MINGW64 /j/WEBRWTCSTORE/webrtc-checkout/src ((c8ff1600d3...))
$ git branch -a
* (HEAD detached at origin/master)
remotes/origin/HEAD -> origin/master
remotes/origin/infra/config
remotes/origin/lkgr
remotes/origin/master
zhangbin@DESKTOP-152DH8F MINGW64 /j/WEBRWTCSTORE/webrtc-checkout/src ((c8ff1600d3...))
$
- 上面 解决不了，
- : gclient sync -f 可以
转载一个很实用
- https://www.ppkanshu.com/index.php/post/2583.html
##一，本地分支查看问题
首先进入代码的SRC目录下，执行GIT中分支查看本机代码所在的GIT中分支，会发现一般有两个（一个是版本号的，另一个主），代码所在的分支就是在带版本号的目录下;
//更新源码
cd src
git pull
gclinet sync
出现xcode-select: error: tool “xcodebuild” requires Xcode, but active developer directory “/Library/Developer/CommandLineTools” is a command line tools instanceTraceback (most recent call last):
解决：
sudo xcode-select -s /Applications/Xcode.app/Contents/Developer
同步代码出现
Error: 14>
14> ____ src/buildtools/third_party/libc++/trunk at e713cc0acf1ae8b82f451bf58ebef67a46ceddfb
14> You have unstaged changes.
14> Please commit, stash, or reset.
解决: gclient sync -f
5: 运行gclient sync，提示錯誤，client not configured see “gclient config”，需要生成.gclient的配置文件，
gclient config https://webrtc.googlesource.com/src.git
//or
从其他webrtc源码中和“SRC/”平级目录下cp;如下图
gClient sync出错解决1
二，获取最新分支代码
- 切换回master
cd 到src目录
执行:git remote
执行：git checkout master
执行： git pull
等待获取最新代码
切换到最新分支
执行上面步骤1后：
cd src
git branch -r //查看远程分支
git checkout <branch_name> //例如：git checkout branch-heads/50
gclient sync
更新了
zhangbin@DESKTOP-152DH8F MINGW64 /j/WEBRWTCSTORE/webrtc-checkout
$ gclient sync -f
Syncing projects: 29% (11/37) src/tools/luci-go:infra/tools/luci/isolate/${platSyncing projects: 32% (12/37) src/tools/luci-go:infra/tools/luci/isolated/${plaSyncing projects: 35% (13/37) src/tools/luci-go:infra/tools/luci/swarming/${plaSyncing projects: 37% (14/37) src/buildtools/third_party/libc++/trunk 32>WARNING: subprocess '"git" "-c" "core.deltaBaseCacheLimit=2g" "fetch" "origin" "--prune" "--no-tags"' in J:\WEBRWTCSTORE\webrtc-checkout\src\third_party\libyuv failed; will retry after a short nap...
Syncing projects: 100% (37/37), done.
Hook 'vpython.bat src/build/landmines.py --landmine-scripts src/tools_webrtc/get_landmines.py --src-dir src' took 40.32 secs
Running hooks: 54% (12/22) clang
________ running 'vpython.bat src/tools/clang/scripts/update.py' in 'J:\WEBRWTCSTORE\webrtc-checkout'
Downloading https://commondatastorage.googleapis.com/chromium-browser-clang/Win/clang-n332890-c2443155-2.tgz .......... Done.
Copying C:\Program Files (x86)/Microsoft Visual Studio/2019/Enterprise\DIA SDK\bin\amd64\msdia140.dll to J:\WEBRWTCSTORE\webrtc-checkout\src\third_party\llvm-build\Release+Asserts\bin
Hook 'vpython.bat src/tools/clang/scripts/update.py' took 87.69 secs
Hook 'download_from_google_storage --directory --recursive --num_threads=10 --no_auth --quiet --bucket chromium-webrtc-resources src/resources' took 59.50 secs
Running hooks: 100% (22/22), done.
zhangbin@DESKTOP-152DH8F MINGW64 /j/WEBRWTCSTORE/webrtc-checkout
$
构建
zhangbin@DESKTOP-152DH8F MINGW64 /j/WEBRWTCSTORE/webrtc-checkout/src (master)
$ gn gen out/x64-vs2019/Debug --args="is_debug=true use_rtti=true target_cpu=\"x64\"" --ide=vs2019
Generating Visual Studio projects took 8221ms
Done. Made 1032 targets from 212 files in 17977ms
