Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

tools: Move generate-custom-icon-webfont to a subdirectory.

This commit is contained in:
Tim Abbott 2018-08-09 15:32:21 -07:00
parent 2bb04fc720
commit c2e5cc99a4
7 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/development/setup-advanced.md
View File

@ -350,7 +350,7 @@ sudo mkdir /srv/zulip-emoji-cache
sudo chown -R `whoami`:`whoami` /srv/zulip-emoji-cache sudo chown -R `whoami`:`whoami` /srv/zulip-emoji-cache
./tools/setup/emoji/build_emoji ./tools/setup/emoji/build_emoji
./tools/inline-email-css ./tools/inline-email-css
./tools/generate-custom-icon-webfont ./tools/setup/generate-custom-icon-webfont
./tools/setup/build_pygments_data ./tools/setup/build_pygments_data
./tools/setup/generate_zulip_bots_static_files ./tools/setup/generate_zulip_bots_static_files
./scripts/setup/generate_secrets.py --development ./scripts/setup/generate_secrets.py --development

2
static/.gitignore vendored
View File

@ -13,7 +13,7 @@
/generated/pygments_data.js /generated/pygments_data.js
# From `tools/update-authors-json` # From `tools/update-authors-json`
/generated/github-contributors.json /generated/github-contributors.json
# From tools/generate-custom-icon-webfont # From tools/setup/generate-custom-icon-webfont
/generated/icons/ /generated/icons/
# Generated i18n data # Generated i18n data

2
static/icons/fonts/template.hbs
View File

@ -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-face {
font-family: '{{fontName}}'; font-family: '{{fontName}}';

6
tools/lib/provision.py
View File

@ -291,12 +291,12 @@ def main(options):
# copy over static files from the zulip_bots package # copy over static files from the zulip_bots package
run(["tools/setup/generate_zulip_bots_static_files"]) 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/*') webfont_paths += glob.glob('static/assets/icons/*')
if file_or_package_hash_updated(webfont_paths, "webfont_files_hash", options.is_force): 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: 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"] build_pygments_data_paths = ["tools/setup/build_pygments_data", "tools/setup/lang.json"]
from pygments import __version__ as pygments_version from pygments import __version__ as pygments_version

2
tools/linter_lib/custom_check.py
View File

@ -223,7 +223,7 @@ def build_custom_checkers(by_lang):
'frontend_tests/casper_lib/common.js', 'frontend_tests/casper_lib/common.js',
'frontend_tests/node_tests', 'frontend_tests/node_tests',
'static/js/debug.js', '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'}, 'description': 'console.log and similar should not be used in webapp'},
{'pattern': r'''[.]text\(["'][a-zA-Z]''', {'pattern': r'''[.]text\(["'][a-zA-Z]''',
'description': 'Strings passed to $().text should be wrapped in i18n.t() for internationalization', 'description': 'Strings passed to $().text should be wrapped in i18n.t() for internationalization',

0
tools/generate-custom-icon-webfont → tools/setup/generate-custom-icon-webfont
View File

2
tools/update-prod-static
View File

@ -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) run(['./tools/setup/generate_zulip_bots_static_files'], stdout=fp, stderr=fp)
# Generate custom icon webfont # 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 # Build pygment data
run(['./tools/setup/build_pygments_data'], stdout=fp, stderr=fp) run(['./tools/setup/build_pygments_data'], stdout=fp, stderr=fp)