Move tools/emoji_dump to tools/setup/.

majidebraa · May 26, 2016 · 1161862 · 1161862
1 parent b855265
commit 1161862
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -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

diff --git a/THIRDPARTY b/THIRDPARTY
@@ -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.

diff --git a/provision.py b/provision.py
@@ -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"])

diff --git a/tools/emoji_dump/AndroidEmoji.ttf → tools/setup/emoji_dump/AndroidEmoji.ttf b/tools/emoji_dump/AndroidEmoji.ttf → tools/setup/emoji_dump/AndroidEmoji.ttf
diff --git a/tools/emoji_dump/NotoColorEmoji.ttf → tools/setup/emoji_dump/NotoColorEmoji.ttf b/tools/emoji_dump/NotoColorEmoji.ttf → tools/setup/emoji_dump/NotoColorEmoji.ttf
diff --git a/tools/emoji_dump/build_emoji → tools/setup/emoji_dump/build_emoji b/tools/emoji_dump/build_emoji → tools/setup/emoji_dump/build_emoji
@@ -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/
diff --git a/tools/emoji_dump/emoji_dump.py → tools/setup/emoji_dump/emoji_dump.py b/tools/emoji_dump/emoji_dump.py → tools/setup/emoji_dump/emoji_dump.py
diff --git a/tools/emoji_dump/emoji_map.json → tools/setup/emoji_dump/emoji_map.json b/tools/emoji_dump/emoji_map.json → tools/setup/emoji_dump/emoji_map.json
diff --git a/tools/update-prod-static b/tools/update-prod-static
@@ -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