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

Merge branch 'master' of github.com:mozilla/ace

Browse source 
Conflicts:
	Makefile.dryice.js
	build/ace-uncompressed.js
	build/ace.js
	support/dryice
This commit is contained in:
Joe Walker 2011-01-28 10:04:23 +00:00
commit a9e93ef6ba
104 changed files with 3669 additions and 13871 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,4 @@
#!/usr/bin/env node
/* ***** BEGIN LICENSE BLOCK *****
* Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
@ -14,7 +15,7 @@
* The Original Code is Ajax.org Code Editor (ACE).
*
* The Initial Developer of the Original Code is
* Ajax.org Services B.V.
* Ajax.org B.V.
* Portions created by the Initial Developer are Copyright (C) 2010
* the Initial Developer. All Rights Reserved.
*
@ -40,7 +41,7 @@ var copy = require('dryice').copy;
var aceHome = __dirname;
var project = copy.createCommonJsProject([
aceHome + '/support/cockpit/support/pilot/lib',
aceHome + '/support/pilot/lib',
aceHome + '/support/cockpit/lib',
aceHome + '/lib',
aceHome + '/demo'
@ -103,7 +104,7 @@ console.log('---------');
var pilot = copy.createDataObject();
copy({
source: {
root: aceHome + '/support/cockpit/support/pilot/lib',
root: aceHome + '/support/pilot/lib',
include: /.*\.js$/,
exclude: /tests?\//
},
@ -177,19 +178,26 @@ copy({
var data = copy.createDataObject();
copy({
source: [
'demo/mini_require.js',
'build_support/mini_require.js',
pilot,
// cockpit,
ace,
'demo/build_boot.js'
'build_support/boot.js'
],
dest: data
});
copy({
source: [
'build_support/editor.html'
],
dest: 'build/editor.html'
});
// Create the compressed and uncompressed output files
copy({
source: data,
filter: copy.filter.uglifyjs,
//filter: copy.filter.uglifyjs,
dest: 'build/ace.js'
});
copy({