Language categorization (common/others split) moved entirely to build.py

jgallen23 · Sep 19, 2011 · f06f3dc · f06f3dc
1 parent ab921fe
commit f06f3dc
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 15 deletions.
diff --git a/src/languages/bash.js b/src/languages/bash.js
@@ -1,7 +1,6 @@
 /*
 Language: Bash
 Author: vah <vahtenberg@gmail.com>
-Category: common
 */
 
 hljs.LANGUAGES.bash = function(){

diff --git a/src/languages/cpp.js b/src/languages/cpp.js
@@ -1,6 +1,5 @@
 /*
 Language: C++
-Category: common
 */
 
 hljs.LANGUAGES.cpp = function(){

diff --git a/src/languages/cs.js b/src/languages/cs.js
@@ -1,7 +1,6 @@
 /*
 Language: C#
 Author: Jason Diamond <jason@diamond.name>
-Category: common
 */
 
 hljs.LANGUAGES.cs  = {

diff --git a/src/languages/css.js b/src/languages/css.js
@@ -1,6 +1,5 @@
 /*
 Language: CSS
-Category: common
 */
 
 hljs.LANGUAGES.css = function() {

diff --git a/src/languages/diff.js b/src/languages/diff.js
@@ -2,7 +2,6 @@
 Language: Diff
 Description: Unified and context diff
 Author: Vasily Polovnyov <vast@whiteants.net>
-Category: common
 */
 
 hljs.LANGUAGES.diff = {

diff --git a/src/languages/ini.js b/src/languages/ini.js
@@ -1,6 +1,5 @@
 /*
 Language: Ini
-Category: common
 */
 
 hljs.LANGUAGES.ini = {

diff --git a/src/languages/java.js b/src/languages/java.js
@@ -1,7 +1,6 @@
 /*
 Language: Java
 Author: Vsevolod Solovyov <vsevolod.solovyov@gmail.com>
-Category: common
 */
 
 hljs.LANGUAGES.java  = {

diff --git a/src/languages/javascript.js b/src/languages/javascript.js
@@ -1,6 +1,5 @@
 /*
 Language: Javascript
-Category: common
 */
 
 hljs.LANGUAGES.javascript = {

diff --git a/src/languages/perl.js b/src/languages/perl.js
@@ -1,7 +1,6 @@
 /*
 Language: Perl
 Author: Peter Leonov <gojpeg@yandex.ru>
-Category: common
 */
 
 hljs.LANGUAGES.perl = function(){

diff --git a/src/languages/php.js b/src/languages/php.js
@@ -1,7 +1,6 @@
 /*
 Language: PHP
 Author: Victor Karamzin <Victor.Karamzin@enterra-inc.com>
-Category: common
 */
 
 hljs.LANGUAGES.php = {

diff --git a/src/languages/python.js b/src/languages/python.js
@@ -1,6 +1,5 @@
 /*
 Language: Python
-Category: common
 */
 
 hljs.LANGUAGES.python = function() {

diff --git a/src/languages/ruby.js b/src/languages/ruby.js
@@ -2,7 +2,6 @@
 Language: Ruby
 Author: Anton Kovalyov <anton@kovalyov.net>
 Contributors: Peter Leonov <gojpeg@yandex.ru>, Vasily Polovnyov <vast@whiteants.net>, Loren Segal <lsegal@soen.ca>
-Category: common
 */
 
 hljs.LANGUAGES.ruby = function(){

diff --git a/src/languages/sql.js b/src/languages/sql.js
@@ -1,6 +1,5 @@
 /*
 Language: SQL
-Category: common
 */
 
 hljs.LANGUAGES.sql = {

diff --git a/src/languages/xml.js b/src/languages/xml.js
@@ -1,6 +1,5 @@
 /*
 Language: HTML, XML
-Category: common
 */
 
 hljs.LANGUAGES.xml = function(){

diff --git a/tools/build.py b/tools/build.py
@@ -54,6 +54,10 @@
     'keywordGroups': 'kG',
 }
 
+CATEGORIES = {
+    'common': ['bash', 'java', 'ini', 'sql', 'diff', 'php', 'cs', 'cpp', 'ruby', 'python', 'css', 'perl', 'xml', 'javascript'],
+}
+
 def compress_content(tools_path, content):
     cmd = 'java -jar %s --type js' % os.path.join(tools_path, 'yuicompressor.jar')
 
@@ -102,9 +106,15 @@ def language_filenames(src_path, languages):
         categories = set(l for l in languages if l.startswith(':'))
         languages = set(languages) - categories
         categories = set(c.strip(':') for c in categories)
+        cat_languages = reduce(
+            lambda a, b: set(a) | set(b),
+            [l for c, l in CATEGORIES.items() if c in categories],
+            set()
+        )
+        languages |= cat_languages
         infos = [
             (i, f) for i, f in infos
-            if os.path.splitext(f)[0] in languages or i.get('Category') in categories
+            if os.path.splitext(f)[0] in languages
         ]
 
     def append(filename):