Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
angle
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
angle
Commits
bd79517a
Commit
bd79517a
authored
Nov 20, 2013
by
Geoff Lang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update gclient configuation for DEPS and git repository.
Change-Id: I49845a0a4e660027dd817b7a783163c1aa5d04d7
parent
1afb883a
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
32 additions
and
8 deletions
+32
-8
.gclient
.gclient
+8
-0
DEPS
DEPS
+7
-7
gyp_angle
build/gyp_angle
+1
-1
build_tests.gyp
tests/build_tests.gyp
+16
-0
No files found.
.gclient
0 → 100644
View file @
bd79517a
solutions = [ {
u'managed': False,
u'name': u'.',
u'url': u'https://chromium.googlesource.com/angle/angle',
u'custom_deps': { },
u'deps_file': u'DEPS'
} ]
\ No newline at end of file
DEPS
View file @
bd79517a
deps = {
deps = {
"t
runk/t
hird_party/gyp":
"third_party/gyp":
"http://gyp.googlecode.com/svn/trunk@1
564
",
"http://gyp.googlecode.com/svn/trunk@1
767
",
"t
runk/t
hird_party/googletest":
"third_party/googletest":
"http://googletest.googlecode.com/svn/trunk@
573", #release 1.6.0
"http://googletest.googlecode.com/svn/trunk@
629",
"t
runk/t
hird_party/googlemock":
"third_party/googlemock":
"http://googlemock.googlecode.com/svn/trunk@
387", #release 1.6.0
"http://googlemock.googlecode.com/svn/trunk@
410",
}
}
hooks = [
hooks = [
{
{
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
# A change to a .gyp, .gypi, or to GYP itself should run the generator.
"pattern": ".",
"pattern": ".",
"action": ["python", "
trunk/
build/gyp_angle"],
"action": ["python", "build/gyp_angle"],
},
},
]
]
build/gyp_angle
View file @
bd79517a
...
@@ -25,7 +25,7 @@ if __name__ == '__main__':
...
@@ -25,7 +25,7 @@ if __name__ == '__main__':
# Set the depth to get the top-level Makefile generated into the
# Set the depth to get the top-level Makefile generated into the
# correct directory. This only has an effect on Linux.
# correct directory. This only has an effect on Linux.
args
.
append
(
'--depth'
);
args
.
append
(
'--depth'
);
args
.
append
(
'.
/trunk
'
);
args
.
append
(
'.'
);
# Add common.gypi to the include path.
# Add common.gypi to the include path.
args
.
append
(
'-I'
+
os
.
path
.
join
(
script_dir
,
'common.gypi'
))
args
.
append
(
'-I'
+
os
.
path
.
join
(
script_dir
,
'common.gypi'
))
# Add all.gyp as the main gyp file to be generated.
# Add all.gyp as the main gyp file to be generated.
...
...
tests/build_tests.gyp
View file @
bd79517a
...
@@ -14,6 +14,14 @@
...
@@ -14,6 +14,14 @@
'sources': [
'sources': [
'../third_party/googletest/src/gtest-all.cc',
'../third_party/googletest/src/gtest-all.cc',
],
],
'defines': [
'_VARIADIC_MAX=10',
],
'direct_dependent_settings': {
'defines': [
'_VARIADIC_MAX=10',
],
},
},
},
{
{
'target_name': 'gmock',
'target_name': 'gmock',
...
@@ -26,6 +34,14 @@
...
@@ -26,6 +34,14 @@
'sources': [
'sources': [
'../third_party/googlemock/src/gmock-all.cc',
'../third_party/googlemock/src/gmock-all.cc',
],
],
'defines': [
'_VARIADIC_MAX=10',
],
'direct_dependent_settings': {
'defines': [
'_VARIADIC_MAX=10',
],
},
},
},
{
{
'target_name': 'preprocessor_tests',
'target_name': 'preprocessor_tests',
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment