Makefile - Issue 451993002: Synchronize GTest/GMock dependencies with Chromium.

Side by Side Diff: Makefile

Issue 451993002: Synchronize GTest/GMock dependencies with Chromium. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Created 6 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »

OLD	NEW
1 # Copyright 2012 the V8 project authors. All rights reserved.	1 # Copyright 2012 the V8 project authors. All rights reserved.

2 # Redistribution and use in source and binary forms, with or without	2 # Redistribution and use in source and binary forms, with or without

3 # modification, are permitted provided that the following conditions are	3 # modification, are permitted provided that the following conditions are

4 # met:	4 # met:

5 #	5 #

6 # * Redistributions of source code must retain the above copyright	6 # * Redistributions of source code must retain the above copyright

7 # notice, this list of conditions and the following disclaimer.	7 # notice, this list of conditions and the following disclaimer.

8 # * Redistributions in binary form must reproduce the above	8 # * Redistributions in binary form must reproduce the above

9 # copyright notice, this list of conditions and the following	9 # copyright notice, this list of conditions and the following

10 # disclaimer in the documentation and/or other materials provided	10 # disclaimer in the documentation and/or other materials provided

(...skipping 466 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
477 if svn info third_party/icu 2>&1 \| grep -q icu46 ; then \	477 if svn info third_party/icu 2>&1 \| grep -q icu46 ; then \

478 svn switch --force \	478 svn switch --force \

479 https://src.chromium.org/chrome/trunk/deps/third_party/icu52 \	479 https://src.chromium.org/chrome/trunk/deps/third_party/icu52 \

480 third_party/icu --revision 277999 ; \	480 third_party/icu --revision 277999 ; \

481 else \	481 else \

482 svn checkout --force \	482 svn checkout --force \

483 https://src.chromium.org/chrome/trunk/deps/third_party/icu52 \	483 https://src.chromium.org/chrome/trunk/deps/third_party/icu52 \

484 third_party/icu --revision 277999 ; \	484 third_party/icu --revision 277999 ; \

485 fi	485 fi

486 svn checkout --force http://googletest.googlecode.com/svn/trunk \	486 svn checkout --force http://googletest.googlecode.com/svn/trunk \

487 » testing/gtest --revision 643	487 » testing/gtest --revision 692

488 svn checkout --force http://googlemock.googlecode.com/svn/trunk \	488 svn checkout --force http://googlemock.googlecode.com/svn/trunk \

489 » testing/gmock --revision 410	489 » testing/gmock --revision 485

490	490

491 dependencies: builddeps	491 dependencies: builddeps

492 # The spec is a copy of the hooks in v8's DEPS file.	492 # The spec is a copy of the hooks in v8's DEPS file.

493 gclient sync -r fb782d4369d5ae04f17a2fceef7de5a63e50f07b --spec="solutio ns = [{u'managed': False, u'name': u'buildtools', u'url': u'https://chromium.goo glesource.com/chromium/buildtools.git', u'custom_deps': {}, u'custom_hooks': [{u 'name': u'clang_format_win',u'pattern': u'.',u'action': [u'download_from_google_ storage',u'--no_resume',u'--platform=win32',u'--no_auth',u'--bucket',u'chromium- clang-format',u'-s',u'buildtools/win/clang-format.exe.sha1']},{u'name': u'clang_ format_mac',u'pattern': u'.',u'action': [u'download_from_google_storage',u'--no_ resume',u'--platform=darwin',u'--no_auth',u'--bucket',u'chromium-clang-format',u '-s',u'buildtools/mac/clang-format.sha1']},{u'name': u'clang_format_linux',u'pat tern': u'.',u'action': [u'download_from_google_storage',u'--no_resume',u'--platf orm=linux*',u'--no_auth',u'--bucket',u'chromium-clang-format',u'-s',u'buildtools /linux64/clang-format.sha1']}],u'deps_file': u'.DEPS.git', u'safesync_url': u''} ]"	493 gclient sync -r fb782d4369d5ae04f17a2fceef7de5a63e50f07b --spec="solutio ns = [{u'managed': False, u'name': u'buildtools', u'url': u'https://chromium.goo glesource.com/chromium/buildtools.git', u'custom_deps': {}, u'custom_hooks': [{u 'name': u'clang_format_win',u'pattern': u'.',u'action': [u'download_from_google_ storage',u'--no_resume',u'--platform=win32',u'--no_auth',u'--bucket',u'chromium- clang-format',u'-s',u'buildtools/win/clang-format.exe.sha1']},{u'name': u'clang_ format_mac',u'pattern': u'.',u'action': [u'download_from_google_storage',u'--no_ resume',u'--platform=darwin',u'--no_auth',u'--bucket',u'chromium-clang-format',u '-s',u'buildtools/mac/clang-format.sha1']},{u'name': u'clang_format_linux',u'pat tern': u'.',u'action': [u'download_from_google_storage',u'--no_resume',u'--platf orm=linux*',u'--no_auth',u'--bucket',u'chromium-clang-format',u'-s',u'buildtools /linux64/clang-format.sha1']}],u'deps_file': u'.DEPS.git', u'safesync_url': u''} ]"

OLD	NEW