From c2e5cc99a4c8fe9c34899310450783609c6f8128 Mon Sep 17 00:00:00 2001 From: Tim Abbott Date: Thu, 9 Aug 2018 15:32:21 -0700 Subject: [PATCH] tools: Move generate-custom-icon-webfont to a subdirectory. --- docs/development/setup-advanced.md | 2 +- static/.gitignore | 2 +- static/icons/fonts/template.hbs | 2 +- tools/lib/provision.py | 6 +++--- tools/linter_lib/custom_check.py | 2 +- tools/{ => setup}/generate-custom-icon-webfont | 0 tools/update-prod-static | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) rename tools/{ => setup}/generate-custom-icon-webfont (100%) diff --git a/docs/development/setup-advanced.md b/docs/development/setup-advanced.md index c1d69f34bf..5c771f3cb0 100644 --- a/docs/development/setup-advanced.md +++ b/docs/development/setup-advanced.md @@ -350,7 +350,7 @@ sudo mkdir /srv/zulip-emoji-cache sudo chown -R `whoami`:`whoami` /srv/zulip-emoji-cache ./tools/setup/emoji/build_emoji ./tools/inline-email-css -./tools/generate-custom-icon-webfont +./tools/setup/generate-custom-icon-webfont ./tools/setup/build_pygments_data ./tools/setup/generate_zulip_bots_static_files ./scripts/setup/generate_secrets.py --development diff --git a/static/.gitignore b/static/.gitignore index d47dbe1b1b..aae34a3f10 100644 --- a/static/.gitignore +++ b/static/.gitignore @@ -13,7 +13,7 @@ /generated/pygments_data.js # From `tools/update-authors-json` /generated/github-contributors.json -# From tools/generate-custom-icon-webfont +# From tools/setup/generate-custom-icon-webfont /generated/icons/ # Generated i18n data diff --git a/static/icons/fonts/template.hbs b/static/icons/fonts/template.hbs index 95d89206e7..577fa8e9c6 100644 --- a/static/icons/fonts/template.hbs +++ b/static/icons/fonts/template.hbs @@ -1,4 +1,4 @@ -/* Custom Zulip icons generated with ./tools/generate-custom-icon-webfont */ +/* Custom Zulip icons generated with ./tools/setup/generate-custom-icon-webfont */ @font-face { font-family: '{{fontName}}'; diff --git a/tools/lib/provision.py b/tools/lib/provision.py index 1d7ec99a0b..5d155fbaba 100755 --- a/tools/lib/provision.py +++ b/tools/lib/provision.py @@ -291,12 +291,12 @@ def main(options): # copy over static files from the zulip_bots package run(["tools/setup/generate_zulip_bots_static_files"]) - webfont_paths = ["tools/generate-custom-icon-webfont", "static/icons/fonts/template.hbs"] + webfont_paths = ["tools/setup/generate-custom-icon-webfont", "static/icons/fonts/template.hbs"] webfont_paths += glob.glob('static/assets/icons/*') if file_or_package_hash_updated(webfont_paths, "webfont_files_hash", options.is_force): - run(["tools/generate-custom-icon-webfont"]) + run(["tools/setup/generate-custom-icon-webfont"]) else: - print("No need to run `tools/generate-custom-icon-webfont`.") + print("No need to run `tools/setup/generate-custom-icon-webfont`.") build_pygments_data_paths = ["tools/setup/build_pygments_data", "tools/setup/lang.json"] from pygments import __version__ as pygments_version diff --git a/tools/linter_lib/custom_check.py b/tools/linter_lib/custom_check.py index a299c37eee..b94607cd72 100644 --- a/tools/linter_lib/custom_check.py +++ b/tools/linter_lib/custom_check.py @@ -223,7 +223,7 @@ def build_custom_checkers(by_lang): 'frontend_tests/casper_lib/common.js', 'frontend_tests/node_tests', 'static/js/debug.js', - 'tools/generate-custom-icon-webfont']), + 'tools/setup/generate-custom-icon-webfont']), 'description': 'console.log and similar should not be used in webapp'}, {'pattern': r'''[.]text\(["'][a-zA-Z]''', 'description': 'Strings passed to $().text should be wrapped in i18n.t() for internationalization', diff --git a/tools/generate-custom-icon-webfont b/tools/setup/generate-custom-icon-webfont similarity index 100% rename from tools/generate-custom-icon-webfont rename to tools/setup/generate-custom-icon-webfont diff --git a/tools/update-prod-static b/tools/update-prod-static index e23329bb7c..3772149dc4 100755 --- a/tools/update-prod-static +++ b/tools/update-prod-static @@ -46,7 +46,7 @@ run(['./tools/inline-email-css'], stdout=fp, stderr=fp) run(['./tools/setup/generate_zulip_bots_static_files'], stdout=fp, stderr=fp) # Generate custom icon webfont -run(['./tools/generate-custom-icon-webfont'], stdout=fp, stderr=fp) +run(['./tools/setup/generate-custom-icon-webfont'], stdout=fp, stderr=fp) # Build pygment data run(['./tools/setup/build_pygments_data'], stdout=fp, stderr=fp)