Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
f3482700
E
engine
项目概览
sxychenjing
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
前往新版Gitcode,体验更适合开发者的 AI 搜索 >>
未验证
提交
f3482700
编写于
7月 17, 2019
作者:
D
Dan Field
提交者:
GitHub
7月 17, 2019
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Simplify buildtools (#9875)
Move GN, only get clang
上级
8849d309
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
41 addition
and
36 deletion
+41
-36
.gitignore
.gitignore
+3
-0
DEPS
DEPS
+21
-13
ci/check_gn_format.py
ci/check_gn_format.py
+1
-1
ci/format.sh
ci/format.sh
+1
-1
ci/licenses_golden/tool_signature
ci/licenses_golden/tool_signature
+1
-1
tools/gn
tools/gn
+2
-9
tools/licenses/lib/main.dart
tools/licenses/lib/main.dart
+12
-11
未找到文件。
.gitignore
浏览文件 @
f3482700
...
...
@@ -23,3 +23,6 @@ pubspec.lock
.vscode/
docs/doxygen/
xcuserdata
third_party/gn/
DEPS
浏览文件 @
f3482700
...
...
@@ -107,8 +107,6 @@ vars = {
# Build bot tooling for iOS
'ios_tools_revision': '69b7c1b160e7107a6a98d948363772dc9caea46f',
'buildtools_revision': 'bac220c15490dcf7b7d8136f75100bbc77e8d217',
# Checkout Android dependencies only on platforms where we build for Android targets.
'download_android_deps': 'host_os == "mac" or host_os == "linux"',
...
...
@@ -163,9 +161,6 @@ deps = {
# As part of integrating with Fuchsia, we should eventually remove all these
# Chromium-style dependencies.
'src/buildtools':
Var('fuchsia_git') + '/buildtools' + '@' + Var('buildtools_revision'),
'src/ios_tools':
Var('chromium_git') + '/chromium/src/ios.git' + '@' + Var('ios_tools_revision'),
...
...
@@ -473,6 +468,27 @@ deps = {
'dep_type': 'cipd',
},
'src/flutter/third_party/gn': {
'packages': [
{
'package': 'gn/gn/${{platform}}',
'version': 'git_revision:bdb0fd02324b120cacde634a9235405061c8ea06'
},
],
'dep_type': 'cipd',
},
'src/buildtools/{host_os}-x64/clang': {
'packages': [
{
'package': 'fuchsia/clang/${{platform}}',
'version': 'git_revision:de39621f0f03f20633bdfa50bde97a3908bf6e98'
}
],
'condition': 'host_os == "mac" or host_os == "linux"',
'dep_type': 'cipd',
},
# Get the SDK from https://chrome-infra-packages.appspot.com/p/fuchsia/sdk/core at the 'latest' tag
# Get the toolchain from https://chrome-infra-packages.appspot.com/p/fuchsia/clang at the 'goma' tag
...
...
@@ -546,14 +562,6 @@ hooks = [
'src/flutter/tools/android_support/download_android_support.py',
],
},
{
'name': 'buildtools',
'pattern': '.',
'action': [
'python',
'src/tools/buildtools/update.py',
],
},
{
'name': 'generate_package_files',
'pattern': '.',
...
...
ci/check_gn_format.py
浏览文件 @
f3482700
...
...
@@ -43,7 +43,7 @@ def main():
if
subprocess
.
call
(
gn_command
+
[
gn_file
])
!=
0
:
print
"ERROR: '%s' is incorrectly formatted."
%
os
.
path
.
relpath
(
gn_file
,
args
.
root_directory
)
print
"Format the same with 'gn format' using the 'gn' binary in //buildtools."
print
"Or, run ./ci/check_gn_format.py with '--dry-run false'"
print
"Or, run ./ci/check_gn_format.py with '--dry-run false'"
return
-
1
return
0
...
...
ci/format.sh
浏览文件 @
f3482700
...
...
@@ -75,4 +75,4 @@ if [[ ! -z "$TRAILING_SPACES" ]]; then
fi
# Check GN format consistency
./ci/check_gn_format.py
--dry-run
true
--root-directory
.
--gn-binary
"
../buildtools/
$OS
/gn"
./ci/check_gn_format.py
--dry-run
true
--root-directory
.
--gn-binary
"
third_party/gn
/gn"
ci/licenses_golden/tool_signature
浏览文件 @
f3482700
Signature:
028d24b0ed18e117e64d68853b628ca9
Signature:
aceb453d2bca05fab3734ed5f7949c51
tools/gn
浏览文件 @
f3482700
...
...
@@ -345,17 +345,10 @@ def parse_args(args):
def
main
(
argv
):
args
=
parse_args
(
argv
)
if
sys
.
platform
.
startswith
((
'cygwin'
,
'win'
)):
subdir
=
'win'
elif
sys
.
platform
==
'darwin'
:
subdir
=
'mac-x64'
elif
sys
.
platform
.
startswith
(
'linux'
):
subdir
=
'linux-x64'
else
:
raise
Error
(
'Unknown platform: '
+
sys
.
platform
)
exe
=
'.exe'
if
sys
.
platform
.
startswith
((
'cygwin'
,
'win'
))
else
''
command
=
[
'%s/
buildtools/%s/gn'
%
(
SRC_ROOT
,
subdir
),
'%s/
flutter/third_party/gn/gn%s'
%
(
SRC_ROOT
,
exe
),
'gen'
,
'--check'
,
]
...
...
tools/licenses/lib/main.dart
浏览文件 @
f3482700
...
...
@@ -926,17 +926,18 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
List
<
_RepositoryDirectory
>
get
virtualSubdirectories
=>
<
_RepositoryDirectory
>[];
bool
shouldRecurse
(
fs
.
IoNode
entry
)
{
return
entry
.
name
!=
'.cipd'
&&
entry
.
name
!=
'.git'
&&
entry
.
name
!=
'.github'
&&
entry
.
name
!=
'.gitignore'
&&
entry
.
name
!=
'.vscode'
&&
entry
.
name
!=
'test'
&&
entry
.
name
!=
'test.disabled'
&&
entry
.
name
!=
'test_support'
&&
entry
.
name
!=
'tests'
&&
entry
.
name
!=
'javatests'
&&
entry
.
name
!=
'testing'
;
return
!
entry
.
fullName
.
endsWith
(
'third_party/gn'
)
&&
entry
.
name
!=
'.cipd'
&&
entry
.
name
!=
'.git'
&&
entry
.
name
!=
'.github'
&&
entry
.
name
!=
'.gitignore'
&&
entry
.
name
!=
'.vscode'
&&
entry
.
name
!=
'test'
&&
entry
.
name
!=
'test.disabled'
&&
entry
.
name
!=
'test_support'
&&
entry
.
name
!=
'tests'
&&
entry
.
name
!=
'javatests'
&&
entry
.
name
!=
'testing'
;
}
_RepositoryDirectory
createSubdirectory
(
fs
.
Directory
entry
)
{
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录