Moved to grunt compile

Author: jabbany

.gitignore

@@ -1,8 +1,6 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-#
-# If you find yourself ignoring temporary files generated by your text editor
-# or operating system, you probably want to add a global ignore instead:
-#   git config --global core.excludesfile ~/.gitignore_global
-#
+# IDEA
+/.idea
 *.iml
+
+# Ignore Node Modules
 /node_modules/*

BUILDING.md

@@ -31,9 +31,10 @@ CommentCoreLibrary在库外提供了很多可扩展的空间，你可以相对
 
 即可按照默认模板编译。除此之外，你还可以改变编译目标：
 
-- build ： 只编译项目，不会clean掉 build文件夹下的产物
+- build ： 只编译项目，不会clean掉build文件夹下的产物
 - build-core ： 只编译弹幕核心，不包括Acfun和Bilibili的解析器。这个更加适用各种二次开发不需要
     已有的弹幕格式的
+- build-scripting ： 只编译代码弹幕支持
 
 默认模式会自动看管 `src` 源码文件夹，并且在产生变化的时候自动生成新版。
 
@@ -43,8 +44,9 @@ CommentCoreLibrary在库外提供了很多可扩展的空间，你可以相对
 
 ### 代码弹幕（Scripting Engine）
 默认的代码弹幕支持需要使用 TypeScript 编译。这需要你安装 TypeScript 支持，通过 
-`npm install -g typescript` 即可安装。代码弹幕部分临时还在使用旧的 `make` 系统，未来也会
-逐渐过渡到使用 Grunt。目前编译项目不会引入代码弹幕支持（考虑到架设难度的增高和潜在受众面相对于
-弹幕支持要少一些），相关库需要手动引入。
+`npm install -g typescript` 即可安装。目前编译项目不会引入代码弹幕支持（考虑到架设难度的增高
+，编译速度降低和潜在受众面相对于弹幕支持要少一些），相关库需要手动引入。
+
+如果希望直接 Grunt 编译现在也已经支持。
 
 参考 `docs/scripting` 了解代码弹幕系统和它的编译方法。

Gruntfile.coffee

@@ -15,30 +15,44 @@ module.exports = (grunt) ->
     'src/CommentCoreLibrary.js'
   ]
 
-  SRC_TRANSITION = [
-    'src/CCLComment.js'
-    'src/CommentFilter.js'
-    'src/CommentTransitionSpaceAllocator.js'
-    'src/CommentTransitionLibrary.js'
-  ]
+  SRC_SCRIPTING_KAGEROU =
+    display: 'src/scripting/api/Display/Display.ts'
+    runtime: 'src/scripting/api/Runtime/Runtime.ts'
+    player:  'src/scripting/api/Player/Player.ts'
+    utils:   'src/scripting/api/Utils/Utils.ts'
+    tween:   'src/scripting/api/Tween/Tween.ts'
 
   SRC_PARSER = [
     'src/parsers/AcfunFormat.js'
     'src/parsers/BilibiliFormat.js'
   ]
 
+  # Dynamically generate the ts targets
+  kagerou_config = { }
+  for target,src of SRC_SCRIPTING_KAGEROU
+    kagerou_config['kagerou_engine_' + target] = 
+      options: 
+        target: 'es5'
+        basePath: src.split('/')[0..-1].join('/')
+      src: src
+      dest: 'build/scripting/api/' + src.split('/').pop().split('.')[0] + '.js'
+  
   # Core concatenated with libraries
   # Actual concat ordering does not/should not matter
   SRC_CORELIB = SRC_CORE.concat(SRC_PARSER)
 
   grunt.initConfig(
     clean:
+      scripting: ['build/scripting']
       build: ['build']
 
     # Concat CSS and JS files
     # core_only : builds CCL without parsers
     # all       : builds CCL with everything
     concat:
+      scripting:
+        files:
+          'build/scripting/Host.js': ['src/scripting/Host.js','src/scripting/Unpacker.js']
       core_only:
         files:
           'build/style.css':       CSS
@@ -47,7 +61,18 @@ module.exports = (grunt) ->
         files:
           'build/style.css':             CSS
           'build/CommentCoreLibrary.js': SRC_CORELIB
-
+    
+    # Compile TypeScript
+    typescript: kagerou_config
+    
+    # Copy
+    copy:
+      scripting:
+        files:[
+          {expand: true, cwd:'src/scripting/api/', src: ['*.js'],  dest:'build/scripting/api/'},
+          {expand: true, cwd:'src/scripting/', src: ['OOAPI.js','Worker.js'],  dest:'build/scripting/'}
+        ]
+    
     # Auto-prefix CSS properties using Can I Use?
     autoprefixer:
       options:
@@ -82,6 +107,7 @@ module.exports = (grunt) ->
   )
 
   # Register our tasks
+  grunt.registerTask 'build-scripting', ['clean:scripting','concat:scripting', 'copy:scripting', 'typescript']
   grunt.registerTask 'build-core', ['concat:core_only', 'autoprefixer', 'cssmin', 'uglify:core_only']
   grunt.registerTask 'build', ['concat:all', 'autoprefixer', 'cssmin', 'uglify:all']
   grunt.registerTask 'default', ['clean', 'build', 'watch']

src/scripting/build/Host.js build/scripting/Host.jssrc/scripting/build/Host.js renamed to build/scripting/Host.js

@@ -298,6 +298,7 @@ var CCLScripting = function(workerUrl){
 		self.getContext().registerObject("__root", {"class":"SpriteRoot"});
 	};
 })();
+
 /** Define some Unpackers **/
 (function(){
 	/** This is the DOM Manipulation Library **/