add a test for built files

Author: nightwing

Makefile.dryice.js

@@ -106,7 +106,7 @@ function ace() {
 
     console.log('# ace ---------');
     for (var i = 0; i < 4; i++)
-        buildAce({compress: i & 2, noconflict: i & 1});
+        buildAce({compress: i & 2, noconflict: i & 1, check: true});
 }
 
 function demo() {
@@ -261,11 +261,7 @@ function buildAceModuleInternal(opts, callback) {
             code = result.codeMin;
         }
 
-        var targetDir =  BUILD_DIR + "/src";
-        if (opts.compress)
-            targetDir += "-min";
-        if (opts.noconflict)
-            targetDir += "-noconflict";
+        var targetDir = getTargetDir(opts);
 
         var to = /^([\\/]|\w:)/.test(opts.outputFile)
             ? opts.outputFile
@@ -341,13 +337,13 @@ function buildAce(options) {
     var snippetFiles = jsFileList("lib/ace/snippets");
     var modeNames = modeList();
 
-    buildCore(options, {outputFile: "ace.js"}),
+    buildCore(options, {outputFile: "ace.js"}, addCb()),
     // modes
     modeNames.forEach(function(name) {
         buildSubmodule(options, {
             projectType: "mode",
             require: ["ace/mode/" + name]
-        }, "mode-" + name);
+        }, "mode-" + name, addCb());
     });
     // snippets
     modeNames.forEach(function(name) {
@@ -356,28 +352,28 @@ function buildAce(options) {
 
         buildSubmodule(options, {
             require: ["ace/snippets/" + name],
-        }, "snippets/" + name);
+        }, "snippets/" + name, addCb());
     });
     // themes
     jsFileList("lib/ace/theme").forEach(function(name) {
         buildSubmodule(options, {
             projectType: "theme",
             require: ["ace/theme/" + name]
-        }, "theme-" +  name);
+        }, "theme-" +  name, addCb());
     });
     // keybindings
     ["vim", "emacs"].forEach(function(name) {
         buildSubmodule(options, {
             projectType: "keybinding",
             require: ["ace/keyboard/" + name ]
-        }, "keybinding-" + name);
+        }, "keybinding-" + name, addCb());
     });
     // extensions
     jsFileList("lib/ace/ext").forEach(function(name) {
         buildSubmodule(options, {
             projectType: "ext",
             require: ["ace/ext/" + name]
-        }, "ext-" + name);
+        }, "ext-" + name, addCb());
     });
     // workers
     workers("lib/ace/mode").forEach(function(name) {
@@ -390,8 +386,20 @@ function buildAce(options) {
                 transforms: [],
                 order: -1000
             }],
-        }, "worker-" + name);
+        }, "worker-" + name, addCb());
     });
+    // 
+    function addCb() {
+        addCb.count = (addCb.count || 0) + 1; 
+        return done
+    }
+    function done() {
+        if (--addCb.count > 0)
+            return;
+        if (options.check)
+            sanityCheck(options)
+        console.log("Finished building " + getTargetDir(options))
+    }
 }
 
 function getLoadedFileList(options, callback, result) {
@@ -476,7 +484,7 @@ function namespace(ns) {
             .toString()
             .replace(/ACE_NAMESPACE\s*=\s*""/, 'ACE_NAMESPACE = "' + ns +'"')
             .replace(/\bdefine\(/g, function(def, index, source) {
-                if (/(^|[;})])\s*$/.test(source.slice(0, index)))
+                if (/(^|[;}),])\s*$/.test(source.slice(0, index)))
                     return ns + "." + def;
                 return def;
             });
@@ -571,6 +579,35 @@ function extend(base, extra) {
     return base;
 }
 
+function getTargetDir(opts) {
+    var targetDir = BUILD_DIR + "/src";
+    if (opts.compress)
+        targetDir += "-min";
+    if (opts.noconflict)
+        targetDir += "-noconflict";
+    return targetDir;
+}
+
+function sanityCheck(opts) {
+    var targetDir = getTargetDir(opts);
+    require("child_process").execFile(process.execPath, ["-e", "(" + function() {
+        window = global;
+        require("./ace");
+        if (typeof ace.edit != "function")
+            process.exit(1);
+        require("fs").readdirSync(".").forEach(function(p) {
+            if (!/ace\.js$/.test(p) && /\.js$/.test(p))
+                require("./" + p);
+        });
+        process.exit(0);
+    } + ")()"], {
+        cwd: targetDir
+    }, function(err, stdout) {
+        if (err)
+            throw err;
+    });
+}
+
 if (!module.parent)
     main(process.argv);
 else

build_support/editor.html

@@ -32,7 +32,7 @@
 <script>
     var editor = ace.edit("editor");
     editor.setTheme("ace/theme/twilight");
-    editor.getSession().setMode("ace/mode/javascript");
+    editor.session.setMode("ace/mode/javascript");
 </script>
 
 </body>