From ed7427cd79db35e58cde0488ad93107ff0dab2a5 Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Fri, 28 Jan 2011 16:30:24 +0000
Subject: [PATCH] fixing and simplifying build process

---
 Makefile.dryice.js            |  4 +---
 build_support/boot.js         |  3 +--
 build_support/editor.html     |  2 +-
 build_support/mini_require.js | 12 +++++-------
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index 51fddaf0..5ea00a21 100755
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -55,9 +55,7 @@ copy({
         copy.source.commonjs({
             project: project,
             require: [
-                'pilot/fixoldbrowsers',
                 'pilot/plugin_manager',
-                'pilot/settings',
                 'pilot/environment',
                 'pilot/index',
                 'startup',
@@ -244,7 +242,7 @@ copy({
 // Create the compressed and uncompressed output files
 copy({
     source: data,
-    //filter: copy.filter.uglifyjs,
+    filter: copy.filter.uglifyjs,
     dest: 'build/old-ace.js'
 });
 copy({
diff --git a/build_support/boot.js b/build_support/boot.js
index f61e91d6..78913861 100644
--- a/build_support/boot.js
+++ b/build_support/boot.js
@@ -35,8 +35,7 @@
  *
  * ***** END LICENSE BLOCK ***** */
 
-var deps = [ "pilot/fixoldbrowsers", "pilot/plugin_manager", "pilot/settings",
-             "pilot/environment" ];
+var deps = [ "pilot/plugin_manager", "pilot/environment" ];
 
 require(deps, function() {
     var catalog = require("pilot/plugin_manager").catalog;
diff --git a/build_support/editor.html b/build_support/editor.html
index f5380885..8ff3e8d9 100644
--- a/build_support/editor.html
+++ b/build_support/editor.html
@@ -17,7 +17,7 @@
     }
 }</div>
     
-<script src="ace2-uncompressed.js" type="text/javascript" charset="utf-8"></script>
+<script src="ace-uncompressed.js" type="text/javascript" charset="utf-8"></script>
 <script>
   document.addEventListener("DOMContentLoaded", function() {
     ace.edit("editor");
diff --git a/build_support/mini_require.js b/build_support/mini_require.js
index 0b6748e4..d24566aa 100644
--- a/build_support/mini_require.js
+++ b/build_support/mini_require.js
@@ -47,8 +47,6 @@ function define(module, payload) {
         return;
     }
 
-    console.log('defining module: ' + module + ' as a ' + typeof payload);
-
     if (!define.modules) {
         define.modules = {};
     }
@@ -58,7 +56,7 @@ function define(module, payload) {
 /**
  * Get at functionality define()ed using the function above
  */
-define.require = function(module, callback) {
+function require(module, callback) {
     if (Array.isArray(module)) {
         var params = [];
         module.forEach(function(m) {
@@ -71,13 +69,13 @@ define.require = function(module, callback) {
     }
 
     if (typeof module === 'string') {
-        payload = define.lookup(module);
+        var payload = define.lookup(module);
         if (callback) {
             callback();
         }
         return payload;
     }
-};
+}
 
 /**
  * Internal function to lookup moduleNames and resolve them by calling the
@@ -90,9 +88,9 @@ define.lookup = function(moduleName) {
         return null;
     }
 
-    if (typeof payload === 'function') {
+    if (typeof module === 'function') {
         var exports = {};
-        payload(define.require, exports, { id: moduleName, uri: '' });
+        module(require, exports, { id: moduleName, uri: '' });
         // cache the resulting module object for next time
         define.modules[moduleName] = exports;
         return exports;