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_projects.py

Issue 23919004: [NaCl SDK] Create a resources/ directory and move files to it. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: move httpd.cmd too Created 7 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
Index: native_client_sdk/src/build_tools/build_projects.py
diff --git a/native_client_sdk/src/build_tools/build_projects.py b/native_client_sdk/src/build_tools/build_projects.py
index 953b56fa28fafad2d141d1d90aab6fd9d51e6352..4758460ebaff65afaffdc8571515aaf19969c83c 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)
« no previous file with comments | « native_client_sdk/src/build_tools/build_paths.py ('k') | native_client_sdk/src/build_tools/generate_make.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698