summaryrefslogtreecommitdiffstats
path: root/native_client_sdk
diff options
context:
space:
mode:
authorbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-21 04:54:36 +0000
committerbradnelson@google.com <bradnelson@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-21 04:54:36 +0000
commitb6d1307a3ea0db002df44e404546ecfc46073e18 (patch)
tree2e55576b174ebedefa8abb1c1060de38f611205a /native_client_sdk
parent4401ae8df7114cc9be65c1f6675893362953c020 (diff)
downloadchromium_src-b6d1307a3ea0db002df44e404546ecfc46073e18.zip
chromium_src-b6d1307a3ea0db002df44e404546ecfc46073e18.tar.gz
chromium_src-b6d1307a3ea0db002df44e404546ecfc46073e18.tar.bz2
Pulling stuff out of the sdk build that isn't in the chrome checkout.
BUG=None TEST=None R=noelallen@google.com Review URL: http://codereview.chromium.org/8473005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110881 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
-rwxr-xr-xnative_client_sdk/src/build_tools/generate_installers.py11
-rw-r--r--native_client_sdk/src/main.scons48
2 files changed, 0 insertions, 59 deletions
diff --git a/native_client_sdk/src/build_tools/generate_installers.py b/native_client_sdk/src/build_tools/generate_installers.py
index 348324c..48ebf6a 100755
--- a/native_client_sdk/src/build_tools/generate_installers.py
+++ b/native_client_sdk/src/build_tools/generate_installers.py
@@ -70,17 +70,6 @@ def main(argv):
env['NACL_SDK_ROOT'] = parent_dir
env['NACL_TARGET_PLATFORM'] = '.' # Use the repo's toolchain.
- # Build the experimental projects.
- bot.BuildStep('build experimental')
- bot.Print('generate_installers is building the experimental projects.')
- experimental_path = os.path.join(home_dir, 'src', 'experimental')
- scons_path = os.path.join(experimental_path, 'scons')
- scons_cmd = scons_path + ' --nacl-platform="."'
- subprocess.check_call(scons_cmd,
- cwd=experimental_path,
- env=env,
- shell=True)
-
# Use native tar to copy the SDK into the build location
# because copytree has proven to be error prone and is not supported on mac.
# We use a buffer for speed here. -1 causes the default OS size to be used.
diff --git a/native_client_sdk/src/main.scons b/native_client_sdk/src/main.scons
index 557333d..c83e448 100644
--- a/native_client_sdk/src/main.scons
+++ b/native_client_sdk/src/main.scons
@@ -40,7 +40,6 @@ Supported targets:
* debug_server_Win32 Build the out-of-process debug_server.
* docs Build all of the Doxygen documentation.
* examples Build the examples.
- * experimental Build the experimental projects.
* installer Build the SDK installer.
* nacl-bpad Build the native client crash reporting tool.
* sdk_tools Build nacl_sdk.zip and sdk_tools.tgz
@@ -121,10 +120,7 @@ base_env.Append(
BUILD_SCONSCRIPTS = [
# Keep in alphabetical order
'build_tools/build.scons',
- 'debugger/build.scons',
'documentation/build.scons',
- 'experimental/visual_studio_plugin/build.scons',
- 'experimental/webgtt/tests/nacltest/test.scons',
'project_templates/test.scons',
],
)
@@ -682,50 +678,6 @@ build_env.AddMethod(DependsOnExamples)
# ----------------------------------------------------------------------------
-# Add a builder for experimental projects. This adds an Alias() node named
-# 'experimental' that is always built. There is some special handling for the
-# clean mode, since SCons relies on actual build products for its clean
-# processing and will not run Alias() actions during clean unless they actually
-# produce something.
-
-
-def BuildExperimental(env, target, source):
- '''Build the experimental projects.
-
- This runs the build command in the 'experimental' directory.
-
- Args:
- env: The construction Environment() that is building the experimental
- projects.
- target: The target that triggered this build. Not used.
- source: The sources used for this build. Not used.
- '''
- subprocess.check_call(SconsBuildCommand(env),
- cwd='experimental',
- shell=True)
-
-
-def CleanExperimental(env, target, source):
- '''Clean the experimental projects.
-
- This runs the clean command in the 'experimental' directory.
-
- Args:
- env: The construction Environment() that is building the experimental
- projects.
- '''
- subprocess.check_call('%s --clean' % SconsBuildCommand(env),
- cwd='experimental',
- shell=True)
-
-
-experimental_builder = build_env.Alias('experimental', [toolchain_node],
- BuildExperimental)
-build_env.AlwaysBuild(experimental_builder)
-build_env.AddCleanAction(['experimental'], CleanExperimental, ['bot'],
- experimental_builder)
-
-# ----------------------------------------------------------------------------
# Add helper functions that build/clean a test by invoking scons under the
# test directory (|cwd|, when specified). These functions are meant to be
# called from corresponding project-specific 'Build<project>Test' and