Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(10)

Unified Diff: native_client_sdk/src/build_tools/build_sdk.py

Issue 608673002: [NaCl SDK] Update naclports revision. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: native_client_sdk/src/build_tools/build_sdk.py
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 509143ef82234e7275b6fdebdc637544b7f4f8ef..925eb74c8eda19cb240b2f5eaa72822bce78727c 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -56,8 +56,8 @@ NACL_TOOLCHAINTARS_DIR = os.path.join(NACL_TOOLCHAIN_DIR, '.tars')
CYGTAR = os.path.join(BUILD_DIR, 'cygtar.py')
PKGVER = os.path.join(BUILD_DIR, 'package_version', 'package_version.py')
-NACLPORTS_URL = 'https://naclports.googlecode.com/svn/trunk/src'
-NACLPORTS_REV = 1293
+NACLPORTS_URL = 'https://chromium.googlesource.com/external/naclports.git'
+NACLPORTS_REV = '99f2417'
GYPBUILD_DIR = 'gypbuild'
@@ -808,13 +808,15 @@ def BuildStepSyncNaClPorts():
buildbot_common.BuildStep('Sync naclports')
if not os.path.exists(NACLPORTS_DIR):
# checkout new copy of naclports
- cmd = ['svn', 'checkout', '-q', '-r', str(NACLPORTS_REV), NACLPORTS_URL,
- 'naclports']
+ cmd = ['git', 'clone', NACLPORTS_URL, 'naclports']
buildbot_common.Run(cmd, cwd=os.path.dirname(NACLPORTS_DIR))
else:
- # sync existing copy to pinned revision.
- cmd = ['svn', 'update', '-r', str(NACLPORTS_REV)]
- buildbot_common.Run(cmd, cwd=NACLPORTS_DIR)
+ # checkout new copy of naclports
+ buildbot_common.Run(['git', 'fetch'], cwd=NACLPORTS_DIR)
+
+ # sync to required revision
+ cmd = ['git', 'checkout', str(NACLPORTS_REV)]
+ buildbot_common.Run(cmd, cwd=NACLPORTS_DIR)
def BuildStepBuildNaClPorts(pepper_ver, pepperdir):
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698