From 0bea52db343dd0ae6dd737b3a4e5d8ecfac54e77 Mon Sep 17 00:00:00 2001
From: Joe Walker <jwalker@mozilla.com>
Date: Wed, 12 Jan 2011 12:45:41 +0000
Subject: [PATCH] simplify the build script

---
 Makefile.dryice.js | 31 ++++++++++---------------------
 1 file changed, 10 insertions(+), 21 deletions(-)

diff --git a/Makefile.dryice.js b/Makefile.dryice.js
index fecda96f..5d404ab8 100644
--- a/Makefile.dryice.js
+++ b/Makefile.dryice.js
@@ -56,36 +56,25 @@ copy({
             include: /.*\.js$/,
             exclude: /tests?\//
         },
+        // Exclude all themes/modes so we can just include textmate/js
         {
             root: aceHome + '/lib',
             include: /.*\.js$/,
             exclude: /tests?\/|theme\/|mode\//
-        }
+        },
+        { base: aceHome + '/lib/', path: 'ace/theme/textmate.js' },
+        { base: aceHome + '/lib/', path: 'ace/mode/text.js' },
+        { base: aceHome + '/lib/', path: 'ace/mode/javascript.js' },
+        { base: aceHome + '/lib/', path: 'ace/mode/text_highlight_rules.js' },
+        { base: aceHome + '/lib/', path: 'ace/mode/javascript_highlight_rules.js' },
+        { base: aceHome + '/lib/', path: 'ace/mode/doc_comment_highlight_rules.js' },
+        { base: aceHome + '/lib/', path: 'ace/mode/matching_brace_outdent.js' },
+        { base: aceHome + '/lib/', path: 'ace/mode/javascript_highlight_rules.js' },
     ],
     filter: [ copy.filter.moduleDefines ],
     dest: buildStep
 });
 
-// include the TextMate theme only for now
-copy({
-    source: [ {
-        root: aceHome + "/lib",
-        include: /textmate\.js/
-    } ],
-    filter: [ copy.filter.moduleDefines ],
-    dest: buildStep
-});
-
-// include the JS mode only for now
-copy({
-    source: [ {
-        root: aceHome + '/lib',
-        include: /\/text\.js|\/javascript\.js|\/text_highlight_rules\.js|\/javascript_highlight_rules\.js|\/doc_comment_highlight_rules\.js|\/matching_brace_outdent\.js/
-    } ],
-    filter: [ copy.filter.moduleDefines ],
-    dest: buildStep
-});
-
 // The CSS files
 copy({
     source: [