mirror of https://github.com/zulip/zulip.git
Move tools/emoji_dump to tools/setup/.
This commit is contained in:
parent
b85526576a
commit
1161862b07
|
@ -38,8 +38,8 @@ event_queues.json
|
|||
static/js/bundle.js
|
||||
static/third/gemoji/
|
||||
static/third/zxcvbn/
|
||||
tools/emoji_dump/bitmaps/
|
||||
tools/emoji_dump/*.ttx
|
||||
tools/setup/emoji_dump/bitmaps/
|
||||
tools/setup/emoji_dump/*.ttx
|
||||
tools/phantomjs
|
||||
node_modules
|
||||
npm-debug.log
|
||||
|
|
|
@ -122,7 +122,7 @@ Copyright: 2013 Nijiko Yonskai
|
|||
License: Apache-2.0
|
||||
Comment: The software has been modified.
|
||||
|
||||
Files: static/third/gemoji/images/emoji/unicode/* tools/emoji_dump/*.ttf
|
||||
Files: static/third/gemoji/images/emoji/unicode/* tools/setup/emoji_dump/*.ttf
|
||||
Copyright: Google, Inc.
|
||||
License: Apache-2.0
|
||||
Comment: These are actually Noto Emoji, not gemoji.
|
||||
|
|
|
@ -168,7 +168,7 @@ def main():
|
|||
else:
|
||||
run(["tools/install-phantomjs"])
|
||||
run(["tools/setup/download-zxcvbn"])
|
||||
run(["tools/emoji_dump/build_emoji"])
|
||||
run(["tools/setup/emoji_dump/build_emoji"])
|
||||
run(["scripts/setup/generate_secrets.py", "-d"])
|
||||
if "--travis" in sys.argv:
|
||||
run(["sudo", "service", "rabbitmq-server", "restart"])
|
||||
|
|
|
@ -3,7 +3,7 @@ set -e
|
|||
set -x
|
||||
|
||||
rm -rf static/third/gemoji/images
|
||||
(cd tools/emoji_dump && python ./emoji_dump.py)
|
||||
(cd tools/setup/emoji_dump && python ./emoji_dump.py)
|
||||
mkdir -p static/third/gemoji/images
|
||||
mv tools/emoji_dump/out static/third/gemoji/images/emoji
|
||||
mv tools/setup/emoji_dump/out static/third/gemoji/images/emoji
|
||||
cp -RPp assets/zulip-emoji/* static/third/gemoji/images/emoji/
|
|
@ -34,7 +34,7 @@ subprocess.check_call(['python', 'tools/minify-js']
|
|||
stdout=fp, stderr=fp)
|
||||
|
||||
# Build emoji
|
||||
subprocess.check_call(['bash', '-ex', 'tools/emoji_dump/build_emoji'],
|
||||
subprocess.check_call(['bash', '-ex', 'tools/setup/emoji_dump/build_emoji'],
|
||||
stdout=fp, stderr=fp)
|
||||
|
||||
# Download and include zxcvbn.js
|
||||
|
|
Loading…
Reference in New Issue