Merge pull request #2355 from ajaxorg/build-issues

Fix build issues

Makefile.dryice.js

@@ -307,6 +307,7 @@ function buildAceModuleInternal(opts, callback) {
         ignore: opts.ignore || [],
         withRequire: false,
         basepath: ACE_HOME,
+        transforms: [normalizeLineEndings],
         afterRead: [optimizeTextModules]
     }, write);
 }
@@ -407,6 +408,10 @@ function getLoadedFileList(options, callback, result) {
     callback(Object.keys(deps));
 }
 
+function normalizeLineEndings(module) {
+    module.source = module.source.replace(/\r\n/g, "\n");
+}
+
 function optimizeTextModules(sources) {
     var textModules = {};
     return sources.filter(function(pkg) {
@@ -452,10 +457,10 @@ function optimizeTextModules(sources) {
         if (/\.css$/.test(pkg.id)) {
             // remove unnecessary whitespace from css
             input = input.replace(/\n\s+/g, "\n");
-            input = '"' + input.replace(/\r?\n/g, '\\\n') + '"';
+            input = '"' + input.replace(/\n/g, '\\\n') + '"';
         } else {
             // but don't break other files!
-            input = '"' + input.replace(/\r?\n/g, '\\n\\\n') + '"';
+            input = '"' + input.replace(/\n/g, '\\n\\\n') + '"';
         }
         textModules[pkg.id] = input;
     }

build_support/mini_require.js

@@ -38,69 +38,62 @@
 
 var ACE_NAMESPACE = "";
 
-var global = (function() {
+var global = (function() { return this; })();
-    return this;
+if (!global && typeof window != "undefined") global = window; // strict mode
-})();
 
 
 if (!ACE_NAMESPACE && typeof requirejs !== "undefined")
     return;
 
 
-var _define = function(module, deps, payload) {
+var define = function(module, deps, payload) {
-    if (typeof module !== 'string') {
+    if (typeof module !== "string") {
-        if (_define.original)
+        if (define.original)
-            _define.original.apply(window, arguments);
+            define.original.apply(this, arguments);
         else {
-            console.error('dropping module because define wasn\'t a string.');
+            console.error("dropping module because define wasn\'t a string.");
             console.trace();
         }
         return;
     }
-
     if (arguments.length == 2)
         payload = deps;
-
+    if (!define.modules[module]) {
-    if (!_define.modules) {
+        define.payloads[module] = payload;
-        _define.modules = {};
+        define.modules[module] = null;
-        _define.payloads = {};
     }
-
-    _define.payloads[module] = payload;
-    _define.modules[module] = null;
 };
 
+define.modules = {};
+define.payloads = {};
+
 /**
  * Get at functionality define()ed using the function above
  */
 var _require = function(parentId, module, callback) {
-    if (Object.prototype.toString.call(module) === "[object Array]") {
+    if (typeof module === "string") {
+        var payload = lookup(parentId, module);
+        if (payload != undefined) {
+            callback && callback();
+            return payload;
+        }
+    } else if (Object.prototype.toString.call(module) === "[object Array]") {
         var params = [];
         for (var i = 0, l = module.length; i < l; ++i) {
             var dep = lookup(parentId, module[i]);
-            if (!dep && _require.original)
+            if (dep == undefined && require.original)
-                return _require.original.apply(window, arguments);
+                return;
             params.push(dep);
         }
-        if (callback) {
+        return callback && callback.apply(null, params) || true;
-            callback.apply(null, params);
-        }
     }
-    else if (typeof module === 'string') {
+};
-        var payload = lookup(parentId, module);
-        if (!payload && _require.original)
-            return _require.original.apply(window, arguments);
 
-        if (callback) {
+var require = function(module, callback) {
-            callback();
+    var packagedModule = _require("", module, callback);
-        }
+    if (packagedModule == undefined && require.original)
-
+        return require.original.apply(this, arguments);
-        return payload;
+    return packagedModule;
-    }
-    else {
-        if (_require.original)
-            return _require.original.apply(window, arguments);
-    }
 };
 
 var normalizeModule = function(parentId, moduleName) {
@@ -119,7 +112,6 @@ var normalizeModule = function(parentId, moduleName) {
             moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
         }
     }
-
     return moduleName;
 };
 
@@ -128,12 +120,11 @@ var normalizeModule = function(parentId, moduleName) {
  * definition function if needed.
  */
 var lookup = function(parentId, moduleName) {
-
     moduleName = normalizeModule(parentId, moduleName);
 
-    var module = _define.modules[moduleName];
+    var module = define.modules[moduleName];
     if (!module) {
-        module = _define.payloads[moduleName];
+        module = define.payloads[moduleName];
         if (typeof module === 'function') {
             var exports = {};
             var mod = {
@@ -149,19 +140,15 @@ var lookup = function(parentId, moduleName) {
 
             var returnValue = module(req, exports, mod);
             exports = returnValue || mod.exports;
-            _define.modules[moduleName] = exports;
+            define.modules[moduleName] = exports;
-            delete _define.payloads[moduleName];
+            delete define.payloads[moduleName];
         }
-        module = _define.modules[moduleName] = exports || module;
+        module = define.modules[moduleName] = exports || module;
     }
     return module;
 };
 
 function exportAce(ns) {
-    var require = function(module, callback) {
-        return _require("", module, callback);
-    };
-
     var root = global;
     if (ns) {
         if (!global[ns])
@@ -170,13 +157,13 @@ function exportAce(ns) {
     }
 
     if (!root.define || !root.define.packaged) {
-        _define.original = root.define;
+        define.original = root.define;
-        root.define = _define;
+        root.define = define;
         root.define.packaged = true;
     }
 
     if (!root.require || !root.require.packaged) {
-        _require.original = root.require;
+        require.original = root.require;
         root.require = require;
         root.require.packaged = true;
     }