From b8c5fa79e194335cb78c7b86be0e69c265968064 Mon Sep 17 00:00:00 2001 From: Fabian Jakobs Date: Tue, 15 Feb 2011 09:44:19 +0100 Subject: [PATCH] update build system for the bookmarklet --- Makefile | 2 ++ Makefile.dryice.js | 10 ++++++---- Makefile.dryice.textarea.js | 24 +++++------------------- 3 files changed, 13 insertions(+), 23 deletions(-) diff --git a/Makefile b/Makefile index ac1b4a36..d272888f 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,8 @@ build: mkdir -p build/src + mkdir -p build/textarea/src ./Makefile.dryice.js + ./Makefile.dryice.textarea.js clean: rm -rf build diff --git a/Makefile.dryice.js b/Makefile.dryice.js index edb31070..677ae44f 100755 --- a/Makefile.dryice.js +++ b/Makefile.dryice.js @@ -166,7 +166,8 @@ copy({ }); -// create modes +console.log('# ace modes ---------'); + project.assumeAllFilesLoaded(); ["css", "html", "javascript", "php", "python", "xml", "ruby", "java", "c_cpp", "coffee"].forEach(function(mode) { console.log("mode " + mode); @@ -182,7 +183,6 @@ project.assumeAllFilesLoaded(); }); }); -// create worker console.log('# worker ---------'); var jsWorker = copy.createDataObject(); @@ -214,7 +214,8 @@ copy({ dest: "build/src/worker-javascript.js" }); -// create themes +console.log('# ace themes ---------'); + var eclipseTheme = copy.createDataObject(); copy({ source: [{ @@ -268,7 +269,8 @@ project.assumeAllFilesLoaded(); }); -// copy text files +console.log('# License | Readme | Changelog ---------'); + copy({ source: aceHome + "/LICENSE", dest: 'build/LICENSE' diff --git a/Makefile.dryice.textarea.js b/Makefile.dryice.textarea.js index d7c337bc..d3bb044f 100755 --- a/Makefile.dryice.textarea.js +++ b/Makefile.dryice.textarea.js @@ -59,7 +59,7 @@ var project = copy.createCommonJsProject([ copy({ source: "build_support/editor_textarea.html", - dest: 'build/editor.html' + dest: 'build/textarea/editor.html' }); var ace = copy.createDataObject(); @@ -123,14 +123,14 @@ copy({ shadow, copy.filter.uglifyjs ], - dest: 'build/src/ace.js' + dest: 'build/textarea/src/ace.js' }); copy({ source: ace, filter: [ shadow, ], - dest: 'build/src/ace-uncompressed.js' + dest: 'build/textarea/src/ace-uncompressed.js' }); console.log('# ace modes ---------'); @@ -151,7 +151,7 @@ project.assumeAllFilesLoaded(); shadow, copy.filter.uglifyjs ], - dest: "build/src/mode-" + mode + ".js" + dest: "build/textarea/src/mode-" + mode + ".js" }); }); @@ -173,22 +173,8 @@ console.log('# ace themes ---------'); shadow, copy.filter.uglifyjs ], - dest: "build/src/theme-" + theme + ".js" + dest: "build/textarea/src/theme-" + theme + ".js" }); }); console.log('# License | Readme | Changelog ---------'); - -// copy text files -copy({ - source: aceHome + "/LICENSE", - dest: 'build/LICENSE' -}); -copy({ - source: aceHome + "/Readme.md", - dest: 'build/Readme.md' -}); -copy({ - source: aceHome + "/ChangeLog.txt", - dest: 'build/ChangeLog.txt' -});