From 71e6e8894b3131d56e8ec4b42de1ce39e5a6a6e6 Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Mon, 6 Feb 2012 14:09:29 +0000
Subject: [PATCH 1/3] Use of copy.source.commonjs() is deprecated

---
 Makefile.dryice.js | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)
 mode change 100755 => 100644 Makefile.dryice.js

diff --git a/Makefile.dryice.js b/Makefile.dryice.js
old mode 100755
new mode 100644
index cd3dacee..2dfceb91
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -267,10 +267,10 @@ function buildAce(aceProject, options) {
     });
     copy({
         source: [
-            copy.source.commonjs({
+            {
                 project: project,
                 require: options.requires
-            })
+            }
         ],
         filter: [ copy.filter.moduleDefines ],
         dest: ace
@@ -286,10 +286,10 @@ function buildAce(aceProject, options) {
         project.assumeAllFilesLoaded();
         copy({
             source: [
-            copy.source.commonjs({
+                {
                     project: cloneProject(project),
                     require: [ "pilot/index" ]
-                })
+                }
             ],
             filter: filters,
             dest:   targetDir + "/" + name + "-compat" + suffix
@@ -303,10 +303,10 @@ function buildAce(aceProject, options) {
         console.log("mode " + mode);
         copy({
             source: [
-            copy.source.commonjs({
+                {
                     project: cloneProject(project),
                     require: [ 'ace/mode/' + mode ]
-                })
+                }
             ],
             filter: filters,
             dest:   targetDir + "/mode-" + mode + suffix
@@ -340,7 +340,7 @@ function buildAce(aceProject, options) {
         });
         copy({
             source: [
-                copy.source.commonjs({
+                {
                     project: workerProject,
                     require: [
                         'ace/lib/fixoldbrowsers',
@@ -348,7 +348,7 @@ function buildAce(aceProject, options) {
                         'ace/lib/oop',
                         'ace/mode/' + mode + '_worker'
                     ]
-                })
+                }
             ],
             filter: [ copy.filter.moduleDefines, filterTextPlugin ],
             dest: worker
@@ -370,10 +370,10 @@ function buildAce(aceProject, options) {
     options.keybindings.forEach(function(keybinding) {
         copy({
             source: [
-            copy.source.commonjs({
+                {
                     project: cloneProject(project),
                     require: [ 'ace/keyboard/keybinding/' + keybinding ]
-                })
+                }
             ],
             filter: filters,
             dest: "build/src/keybinding-" + keybinding + suffix

From eacb1e8691cda92cba1450ce93a0a109938d07cf Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Mon, 6 Feb 2012 14:12:02 +0000
Subject: [PATCH 2/3] Set dryice dependency to correct version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 80cfa58e..6029ad59 100644
--- a/package.json
+++ b/package.json
@@ -18,7 +18,7 @@
         "jsdom": "0.2.x",
         "amd-loader": ">=0.0.3",
         "libxml": "0.0.x",
-        "dryice": ">=0.3.1 <0.4"
+        "dryice": ">=0.4.1"
     },
 
     "licenses": [{

From deffa824dac5d3428138ea2a217ca56d1a16bbf3 Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Mon, 6 Feb 2012 14:12:26 +0000
Subject: [PATCH 3/3] Fix broken clone function

---
 Makefile.dryice.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index 2dfceb91..6cbb22cb 100644
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -388,12 +388,12 @@ function cloneProject(project) {
         ignores: project.ignoreRequires
     });
 
-    Object.keys(project.currentFiles).forEach(function(module) {
-        clone.currentFiles[module] = project.currentFiles[module];
+    Object.keys(project.currentModules).forEach(function(module) {
+        clone.currentModules[module] = project.currentModules[module];
     });
 
-    Object.keys(project.ignoredFiles).forEach(function(module) {
-        clone.ignoredFiles[module] = project.ignoredFiles[module];
+    Object.keys(project.ignoredModules).forEach(function(module) {
+        clone.ignoredModules[module] = project.ignoredModules[module];
     });
 
     return clone;