diff --git a/build.js b/build.js index 196248c2dbd..9f8309a86c5 100644 --- a/build.js +++ b/build.js @@ -161,6 +161,7 @@ var filesToInclude = [ 'src/log.js', ifSpecifiedInclude('animation', 'src/util/animate.js'), + ifSpecifiedInclude('animation', 'src/util/animate_color.js'), //'src/util/animate.js', ifSpecifiedInclude('easing', 'src/util/anim_ease.js'), diff --git a/create_build_script.js b/create_build_script.js deleted file mode 100644 index 71ac68bbb05..00000000000 --- a/create_build_script.js +++ /dev/null @@ -1,64 +0,0 @@ -var fs = require('fs'), - //execSync = require('execSync').exec; - execSync = require('child_process').execSync; - -var modules = [ - 'text', - 'itext', - 'textbox', - 'animation', - 'gestures', - 'easing', - 'parser', - 'freedrawing', - 'interaction', - 'serialization', - 'image_filters', - 'gradient', - 'pattern', - 'shadow', - 'node' -]; - -// http://stackoverflow.com/questions/5752002/find-all-possible-subset-combos-in-an-array -var combine = function(a, min) { - var fn = function(n, src, got, all) { - if (n === 0) { - if (got.length > 0) { - all[all.length] = got; - } - return; - } - for (var j = 0, len = src.length; j < len; j++) { - fn(n - 1, src.slice(j + 1), got.concat([src[j]]), all); - } - return; - }; - var all = []; - for (var i = min, _len = a.length; i < _len; i++) { - fn(i, a, [], all); - } - all.push(a); - return all; -}; - -var combinations = combine(modules, 1); -var startTime = new Date; - -fs.writeFile('build.sh', '#!/usr/bin/env sh\n\n', function() { - - for (var i = 0, len = combinations.length; i < len; i++) { - - var modulesStr = combinations[i].join(','); - var command = 'node build.js build-sh modules=' + modulesStr; - - execSync(command); - - if (i % 100 === 0) { - console.log(i + '/' + len); - } - } - - // create basic (minimal) build - execSync('node build.js build-sh modules='); -}); diff --git a/package.json b/package.json index 0c59694ff4d..869627d22cd 100644 --- a/package.json +++ b/package.json @@ -41,7 +41,7 @@ "test": "node test.js", "lint": "eslint --config .eslintrc.json src", "lint_tests": "eslint test/unit --config .eslintrc_tests", - "export_dist_to_site": "cp dist/fabric.js ../fabricjs.com/lib/fabric.js", + "export_dist_to_site": "cp dist/fabric.js ../fabricjs.com/lib/fabric.js && cp -r src HEADER.js lib ../fabricjs.com/build/files/", "export_tests_to_site": "cp test/unit/*.js ../fabricjs.com/test/unit", "all": "npm run build && npm run test && npm run lint && npm run lint_tests && npm run export_dist_to_site && npm run export_tests_to_site" },