merge upstream/dev

This commit is contained in:
Martin Kelm 2013-12-14 12:09:25 +01:00
commit dc49c7b396
253 changed files with 47632 additions and 157944 deletions

View file

@ -1,10 +1,12 @@
module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-concat-sourcemap');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-connect');
grunt.loadNpmTasks('grunt-contrib-qunit');
grunt.loadNpmTasks('grunt-contrib-yuidoc');
grunt.loadNpmTasks('grunt-contrib-watch');
var root = 'src/pixi/',
debug = 'bin/pixi.dev.js',
@ -31,10 +33,14 @@ module.exports = function(grunt) {
'<%= dirs.src %>/utils/Detector.js',
'<%= dirs.src %>/utils/Polyk.js',
'<%= dirs.src %>/renderers/webgl/WebGLShaders.js',
'<%= dirs.src %>/renderers/webgl/PixiShader.js',
'<%= dirs.src %>/renderers/webgl/StripShader.js',
'<%= dirs.src %>/renderers/webgl/PrimitiveShader.js',
'<%= dirs.src %>/renderers/webgl/WebGLGraphics.js',
'<%= dirs.src %>/renderers/webgl/WebGLRenderer.js',
'<%= dirs.src %>/renderers/webgl/WebGLBatch.js',
'<%= dirs.src %>/renderers/webgl/WebGLRenderGroup.js',
'<%= dirs.src %>/renderers/webgl/WebGLFilterManager.js',
'<%= dirs.src %>/renderers/canvas/CanvasRenderer.js',
'<%= dirs.src %>/renderers/canvas/CanvasGraphics.js',
'<%= dirs.src %>/primitives/Graphics.js',
@ -53,6 +59,22 @@ module.exports = function(grunt) {
'<%= dirs.src %>/loaders/ImageLoader.js',
'<%= dirs.src %>/loaders/BitmapFontLoader.js',
'<%= dirs.src %>/loaders/SpineLoader.js',
'<%= dirs.src %>/filters/AbstractFilter.js',
'<%= dirs.src %>/filters/ColorMatrixFilter.js',
'<%= dirs.src %>/filters/GrayFilter.js',
'<%= dirs.src %>/filters/DisplacementFilter.js',
'<%= dirs.src %>/filters/PixelateFilter.js',
'<%= dirs.src %>/filters/BlurXFilter.js',
'<%= dirs.src %>/filters/BlurYFilter.js',
'<%= dirs.src %>/filters/BlurFilter.js',
'<%= dirs.src %>/filters/InvertFilter.js',
'<%= dirs.src %>/filters/SepiaFilter.js',
'<%= dirs.src %>/filters/TwistFilter.js',
'<%= dirs.src %>/filters/ColorStepFilter.js',
'<%= dirs.src %>/filters/DotScreenFilter.js',
'<%= dirs.src %>/filters/CrossHatchFilter.js',
'<%= dirs.src %>/filters/RGBSplitFilter.js',
'<%= dirs.src %>/Outro.js'
], banner = [
'/**',
@ -74,7 +96,6 @@ module.exports = function(grunt) {
dirs: {
build: 'bin',
docs: 'docs',
examples: 'examples',
src: 'src/pixi',
test: 'test'
},
@ -93,6 +114,16 @@ module.exports = function(grunt) {
dest: '<%= files.build %>'
}
},
concat_sourcemap: {
dev: {
files: {
'<%= files.build %>': srcFiles
},
options: {
sourceRoot: '../'
}
}
},
jshint: {
beforeconcat: srcFiles,
test: ['<%= files.testBlob %>'],
@ -110,24 +141,6 @@ module.exports = function(grunt) {
dest: '<%= files.buildMin %>'
}
},
distribute: {
examples: [
'examples/example 1 - Basics',
'examples/example 2 - SpriteSheet',
'examples/example 3 - MovieClip',
'examples/example 4 - Balls',
'examples/example 5 - Morph',
'examples/example 6 - Interactivity',
'examples/example 7 - Transparent Background',
'examples/example 8 - Dragging',
'examples/example 9 - Tiling Texture',
'examples/example 10 - Text',
'examples/example 11 - RenderTexture',
'examples/example 12 - Spine',
'examples/example 13 - Graphics',
'examples/example 14 - Masking'
]
},
connect: {
qunit: {
options: {
@ -162,29 +175,23 @@ module.exports = function(grunt) {
outdir: '<%= dirs.docs %>'
}
}
},
watch: {
dev: {
files: ['Gruntfile.js', 'src/**/*.js', 'examples/**/*.html'],
tasks: ['build-debug'],
// We would need to inject <script> in each HTML...
// options: {
// livereload: true
// }
}
}
});
grunt.registerMultiTask(
'distribute',
'Copy built file to examples',
function(){
var pixi = grunt.file.read( debug );
var dests = this.data;
dests.forEach(function(filepath){
grunt.file.write(filepath + '/pixi.js', pixi);
});
grunt.log.writeln('Pixi copied to examples.');
}
)
grunt.registerTask('default', ['concat', 'uglify', 'distribute']);
grunt.registerTask('build', ['concat', 'uglify', 'distribute']);
grunt.registerTask('build-debug', ['concat_sourcemap', 'uglify'])
grunt.registerTask('default', ['concat', 'uglify']);
grunt.registerTask('build', ['concat', 'uglify']);
grunt.registerTask('test', ['build', 'connect:qunit', 'qunit']);
grunt.registerTask('docs', ['yuidoc']);