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

emoji: Move tools/setup/emoji_dump to tools/setup/emoji.

This commit is contained in:
Tim Abbott 2016-12-27 19:58:41 -08:00
parent 726e2649b4
commit 08dae5108e
8 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/THIRDPARTY
View File

@ -115,7 +115,7 @@ Copyright: 2013 Nijiko Yonskai
License: Apache-2.0 License: Apache-2.0
Comment: The software has been modified. Comment: The software has been modified.
Files: static/third/gemoji/images/emoji/unicode/* tools/setup/emoji_dump/*.ttf Files: static/third/gemoji/images/emoji/unicode/* tools/setup/emoji/*.ttf
Copyright: Google, Inc. Copyright: Google, Inc.
License: Apache-2.0 License: Apache-2.0
Comment: These are actually Noto Emoji, not gemoji. Comment: These are actually Noto Emoji, not gemoji.

2
docs/dev-setup-non-vagrant.md
View File

@ -318,7 +318,7 @@ Now run these commands:
``` ```
./tools/install-mypy ./tools/install-mypy
./tools/setup/emoji_dump/build_emoji ./tools/setup/emoji/build_emoji
./scripts/setup/generate_secrets.py --development ./scripts/setup/generate_secrets.py --development
if [ $(uname) = "OpenBSD" ]; then sudo cp ./puppet/zulip/files/postgresql/zulip_english.stop /var/postgresql/tsearch_data/; else sudo cp ./puppet/zulip/files/postgresql/zulip_english.stop /usr/share/postgresql/9.*/tsearch_data/; fi if [ $(uname) = "OpenBSD" ]; then sudo cp ./puppet/zulip/files/postgresql/zulip_english.stop /var/postgresql/tsearch_data/; else sudo cp ./puppet/zulip/files/postgresql/zulip_english.stop /usr/share/postgresql/9.*/tsearch_data/; fi
./scripts/setup/configure-rabbitmq ./scripts/setup/configure-rabbitmq

2
tools/provision.py
View File

@ -205,7 +205,7 @@ def main(options):
if not os.path.isdir(EMOJI_CACHE_PATH): if not os.path.isdir(EMOJI_CACHE_PATH):
run(["sudo", "mkdir", EMOJI_CACHE_PATH]) run(["sudo", "mkdir", EMOJI_CACHE_PATH])
run(["sudo", "chown", "%s:%s" % (user_id, user_id), EMOJI_CACHE_PATH]) run(["sudo", "chown", "%s:%s" % (user_id, user_id), EMOJI_CACHE_PATH])
run(["tools/setup/emoji_dump/build_emoji"]) run(["tools/setup/emoji/build_emoji"])
run(["scripts/setup/generate_secrets.py", "--development"]) run(["scripts/setup/generate_secrets.py", "--development"])
if options.is_travis and not options.is_production_travis: if options.is_travis and not options.is_production_travis:
run(["sudo", "service", "rabbitmq-server", "restart"]) run(["sudo", "service", "rabbitmq-server", "restart"])

0
tools/setup/emoji_dump/AndroidEmoji.ttf → tools/setup/emoji/AndroidEmoji.ttf
View File

0
tools/setup/emoji_dump/NotoColorEmoji.ttf → tools/setup/emoji/NotoColorEmoji.ttf
View File

2
tools/setup/emoji_dump/build_emoji → tools/setup/emoji/build_emoji
View File

@ -27,7 +27,7 @@ EMOJI_DUMP_DIR_PATH = os.path.join(ZULIP_PATH, 'var', 'emoji_dump')
EMOJI_DUMP_PATH = lambda p: os.path.join(EMOJI_DUMP_DIR_PATH, p) EMOJI_DUMP_PATH = lambda p: os.path.join(EMOJI_DUMP_DIR_PATH, p)
TARGET_EMOJI_DUMP = os.path.join(ZULIP_PATH, 'static', 'third', 'gemoji') TARGET_EMOJI_DUMP = os.path.join(ZULIP_PATH, 'static', 'third', 'gemoji')
EMOJI_CACHE_PATH = "/srv/zulip-emoji-cache" EMOJI_CACHE_PATH = "/srv/zulip-emoji-cache"
EMOJI_SCRIPT_DIR_PATH = os.path.join(ZULIP_PATH, 'tools', 'setup', 'emoji_dump') EMOJI_SCRIPT_DIR_PATH = os.path.join(ZULIP_PATH, 'tools', 'setup', 'emoji')
# change directory # change directory
os.chdir(EMOJI_SCRIPT_DIR_PATH) os.chdir(EMOJI_SCRIPT_DIR_PATH)

0
tools/setup/emoji_dump/emoji_map.json → tools/setup/emoji/emoji_map.json
View File

2
tools/update-prod-static
View File

@ -37,7 +37,7 @@ subprocess.check_call(['./tools/minify-js']
stdout=fp, stderr=fp) stdout=fp, stderr=fp)
# Build emoji # Build emoji
subprocess.check_call(['./tools/setup/emoji_dump/build_emoji'], subprocess.check_call(['./tools/setup/emoji/build_emoji'],
stdout=fp, stderr=fp) stdout=fp, stderr=fp)
# Collect the files that we're going to serve. # Collect the files that we're going to serve.