summaryrefslogtreecommitdiffstats
path: root/native_client_sdk/src/build_tools/build_projects.py
diff options
context:
space:
mode:
authorbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-06 18:36:28 +0000
committerbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-06 18:36:28 +0000
commit07ec0acf438dd4b53dbb27fbc4a55db25d8459c2 (patch)
treee4bd799ce5469ba8ffa0be1f304decf702d6f775 /native_client_sdk/src/build_tools/build_projects.py
parentae3b19fcd7fc940f8141408c7ee5cf913ec35004 (diff)
downloadchromium_src-07ec0acf438dd4b53dbb27fbc4a55db25d8459c2.zip
chromium_src-07ec0acf438dd4b53dbb27fbc4a55db25d8459c2.tar.gz
chromium_src-07ec0acf438dd4b53dbb27fbc4a55db25d8459c2.tar.bz2
[NaCl SDK] Create a resources/ directory and move files to it.
* Move files out of the roout of examples/ to resources/ * Move files from examples/resources to resources/ * Move Makefile templates to resources/ and rename them. BUG=none R=sbc@chromium.org Review URL: https://codereview.chromium.org/23919004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221741 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk/src/build_tools/build_projects.py')
-rwxr-xr-xnative_client_sdk/src/build_tools/build_projects.py18
1 files changed, 6 insertions, 12 deletions
diff --git a/native_client_sdk/src/build_tools/build_projects.py b/native_client_sdk/src/build_tools/build_projects.py
index 953b56f..4758460 100755
--- a/native_client_sdk/src/build_tools/build_projects.py
+++ b/native_client_sdk/src/build_tools/build_projects.py
@@ -13,7 +13,7 @@ import build_version
import generate_make
import parse_dsc
-from build_paths import NACL_DIR, SDK_SRC_DIR, OUT_DIR, SDK_EXAMPLE_DIR
+from build_paths import NACL_DIR, SDK_SRC_DIR, OUT_DIR, SDK_RESOURCE_DIR
from build_paths import GSTORE
from generate_index import LandingPage
@@ -54,14 +54,10 @@ def UpdateHelpers(pepperdir, clobber=False):
buildbot_common.RemoveDir(exampledir)
buildbot_common.MakeDir(exampledir)
- # Copy files for individual bild and landing page
- files = ['favicon.ico', 'httpd.cmd']
- CopyFilesFromTo(files, SDK_EXAMPLE_DIR, exampledir)
-
- resourcesdir = os.path.join(SDK_EXAMPLE_DIR, 'resources')
- files = ['index.css', 'index.js', 'button_close.png',
- 'button_close_hover.png']
- CopyFilesFromTo(files, resourcesdir, exampledir)
+ # Copy files for individual build and landing page
+ files = ['favicon.ico', 'httpd.cmd', 'index.css', 'index.js',
+ 'button_close.png', 'button_close_hover.png']
+ CopyFilesFromTo(files, SDK_RESOURCE_DIR, exampledir)
# Copy tools scripts and make includes
buildbot_common.CopyDir(os.path.join(SDK_SRC_DIR, 'tools', '*.py'),
@@ -133,9 +129,7 @@ def UpdateProjects(pepperdir, project_tree, toolchains,
if landing_page:
# Generate the landing page text file.
index_html = os.path.join(pepperdir, 'examples', 'index.html')
- example_resources_dir = os.path.join(SDK_EXAMPLE_DIR, 'resources')
- index_template = os.path.join(example_resources_dir,
- 'index.html.template')
+ index_template = os.path.join(SDK_RESOURCE_DIR, 'index.html.template')
with open(index_html, 'w') as fh:
out = landing_page.GeneratePage(index_template)
fh.write(out)