jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #644 from joewalker/master

Browse source 
Fix makefile
This commit is contained in:
Fabian Jakobs 2012-02-14 02:30:00 -08:00
commit 8ffd661283
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

28
Makefile.dryice.js Executable file → Normal file
View file

@ -267,10 +267,10 @@ function buildAce(aceProject, options) {
}); });
copy({ copy({
source: [ source: [
copy.source.commonjs({ {
project: project, project: project,
require: options.requires require: options.requires
}) }
], ],
filter: [ copy.filter.moduleDefines ], filter: [ copy.filter.moduleDefines ],
dest: ace dest: ace
@ -286,10 +286,10 @@ function buildAce(aceProject, options) {
project.assumeAllFilesLoaded(); project.assumeAllFilesLoaded();
copy({ copy({
source: [ source: [
copy.source.commonjs({ {
project: cloneProject(project), project: cloneProject(project),
require: [ "pilot/index" ] require: [ "pilot/index" ]
}) }
], ],
filter: filters, filter: filters,
dest: targetDir + "/" + name + "-compat" + suffix dest: targetDir + "/" + name + "-compat" + suffix
@ -303,10 +303,10 @@ function buildAce(aceProject, options) {
console.log("mode " + mode); console.log("mode " + mode);
copy({ copy({
source: [ source: [
copy.source.commonjs({ {
project: cloneProject(project), project: cloneProject(project),
require: [ 'ace/mode/' + mode ] require: [ 'ace/mode/' + mode ]
}) }
], ],
filter: filters, filter: filters,
dest: targetDir + "/mode-" + mode + suffix dest: targetDir + "/mode-" + mode + suffix
@ -340,7 +340,7 @@ function buildAce(aceProject, options) {
}); });
copy({ copy({
source: [ source: [
copy.source.commonjs({ {
project: workerProject, project: workerProject,
require: [ require: [
'ace/lib/fixoldbrowsers', 'ace/lib/fixoldbrowsers',
@ -348,7 +348,7 @@ function buildAce(aceProject, options) {
'ace/lib/oop', 'ace/lib/oop',
'ace/mode/' + mode + '_worker' 'ace/mode/' + mode + '_worker'
] ]
}) }
], ],
filter: [ copy.filter.moduleDefines, filterTextPlugin ], filter: [ copy.filter.moduleDefines, filterTextPlugin ],
dest: worker dest: worker
@ -370,10 +370,10 @@ function buildAce(aceProject, options) {
options.keybindings.forEach(function(keybinding) { options.keybindings.forEach(function(keybinding) {
copy({ copy({
source: [ source: [
copy.source.commonjs({ {
project: cloneProject(project), project: cloneProject(project),
require: [ 'ace/keyboard/keybinding/' + keybinding ] require: [ 'ace/keyboard/keybinding/' + keybinding ]
}) }
], ],
filter: filters, filter: filters,
dest: "build/src/keybinding-" + keybinding + suffix dest: "build/src/keybinding-" + keybinding + suffix
@ -388,12 +388,12 @@ function cloneProject(project) {
ignores: project.ignoreRequires ignores: project.ignoreRequires
}); });
Object.keys(project.currentFiles).forEach(function(module) { Object.keys(project.currentModules).forEach(function(module) {
clone.currentFiles[module] = project.currentFiles[module]; clone.currentModules[module] = project.currentModules[module];
}); });
Object.keys(project.ignoredFiles).forEach(function(module) { Object.keys(project.ignoredModules).forEach(function(module) {
clone.ignoredFiles[module] = project.ignoredFiles[module]; clone.ignoredModules[module] = project.ignoredModules[module];
}); });
return clone; return clone;

2
package.json
View file

@ -18,7 +18,7 @@
"jsdom": "0.2.x", "jsdom": "0.2.x",
"amd-loader": ">=0.0.3", "amd-loader": ">=0.0.3",
"libxml": "0.0.x", "libxml": "0.0.x",
"dryice": ">=0.3.1 <0.4" "dryice": ">=0.4.1"
}, },
"licenses": [{ "licenses": [{