diff --git a/build.js b/build.js index 275f9c30..22cd88fe 100644 --- a/build.js +++ b/build.js @@ -123,7 +123,8 @@ var filesToInclude = [ 'src/util/dom_misc.js', 'src/util/dom_request.js', - ifSpecifiedInclude('animation', 'src/util/animate.js'), + //ifSpecifiedInclude('animation', 'src/util/animate.js'), + 'src/util/animate.js', ifSpecifiedInclude('easing', 'src/util/anim_ease.js'), ifSpecifiedInclude('parser', 'src/parser.js'), @@ -160,7 +161,8 @@ var filesToInclude = [ ifSpecifiedInclude('interaction', 'src/mixins/object_interactivity.mixin.js'), - ifSpecifiedInclude('animation', 'src/mixins/animation.mixin.js'), + // ifSpecifiedInclude('animation', 'src/mixins/animation.mixin.js'), + 'src/mixins/animation.mixin.js', 'src/shapes/line.class.js', 'src/shapes/circle.class.js', diff --git a/build_all b/build_all index 2ee69107..b76e06bf 100755 --- a/build_all +++ b/build_all @@ -1,6 +1,19 @@ -node build.js build-minified; # builds minified src files -node create_build_script.js; # creates build.sh with all module combinations (minified and not) -rm -rf ../fabricjs.com/build/files/*; # remove all previous module files -./build.sh; # builds actual distribution files with all module combinations (minified and not) -rm -rf tmp/*; # remove tmp files -echo "" > build.sh; # erase build.sh +echo 'building minified src files'; +node build.js build-minified; + +echo 'creating build.sh with all module combinations (minified and not)'; +node create_build_script.js; + +echo 'removing all previous module files'; +rm -rf ../fabricjs.com/build/files; +mkdir ../fabricjs.com/build/files; + +echo 'building actual distribution files with all module combinations (minified and not)'; +./build.sh; + +echo 'removing tmp files'; +rm -rf tmp; +mkdir tmp; + +echo 'erasing build.sh'; +echo "" > build.sh; diff --git a/create_build_script.js b/create_build_script.js index 8b2ccf90..6e7ac52f 100644 --- a/create_build_script.js +++ b/create_build_script.js @@ -50,6 +50,10 @@ fs.writeFile('build.sh', '#!/usr/bin/env sh\n\n', function() { var command = 'node build.js build-sh modules=' + modulesStr; execSync(command); + + if (i % 100 === 0) { + console.log(i + '/' + len); + } } // create basic (minimal) build