aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogdan Gheorghe2013-02-07 16:31:56 (EST)
committerSilenio Quarti2013-02-07 16:31:56 (EST)
commit148ee7c59d6173d3cd7473ff0c0ab3cdc3b69ae0 (patch)
tree24d75084d24b42fa6b4b854cb93e8c29f03700c8
parenta649497a8f7e30c4791ec1519b90da3d64d3e20f (diff)
downloadorg.eclipse.orion.server-148ee7c59d6173d3cd7473ff0c0ab3cdc3b69ae0.zip
org.eclipse.orion.server-148ee7c59d6173d3cd7473ff0c0ab3cdc3b69ae0.tar.gz
org.eclipse.orion.server-148ee7c59d6173d3cd7473ff0c0ab3cdc3b69ae0.tar.bz2
Bug 399673 - [Consumability] Provide a build for the Orion editor (almond build)v20130207-2131
-rw-r--r--releng/org.eclipse.orion.releng/builder/customTargets.xml12
-rw-r--r--releng/org.eclipse.orion.releng/builder/html/build.index.html20
-rw-r--r--releng/org.eclipse.orion.releng/builder/scripts/editor.build.almond.js37
3 files changed, 62 insertions, 7 deletions
diff --git a/releng/org.eclipse.orion.releng/builder/customTargets.xml b/releng/org.eclipse.orion.releng/builder/customTargets.xml
index fdb2363..bb5b70a 100644
--- a/releng/org.eclipse.orion.releng/builder/customTargets.xml
+++ b/releng/org.eclipse.orion.releng/builder/customTargets.xml
@@ -167,6 +167,7 @@ lastMapTag=${mapsTagTag}
<macrodef name="editorOptimize" >
<attribute name="scriptName" />
<attribute name="fileName" />
+ <attribute name="optimize" />
<sequential>
<java classname="org.mozilla.javascript.tools.shell.Main" fork="true"
dir="${buildDirectory}/optimization">
@@ -180,7 +181,7 @@ lastMapTag=${mapsTagTag}
<arg value="${requirejsHome}/dist/r.js"/>
<arg value="-o" />
<arg value="@{scriptName}"/>
- <arg value="optimize=closure" />
+ <arg value="optimize=@{optimize}" />
<arg value="out=${minifyDirectory}/@{fileName}"/>
<arg value="dir=" />
</java>
@@ -214,9 +215,12 @@ lastMapTag=${mapsTagTag}
</copy>
<!-- build standalone editor -->
- <editorOptimize filename="built-editor.js" scriptname="editor.build-js.js"/>
- <editorOptimize filename="built-editor.css" scriptname="editor.build-css.js"/>
-
+ <editorOptimize filename="built-editor.css" scriptname="editor.build-css.js" optimize="closure"/>
+ <editorOptimize filename="built-editor-amd.min.js" scriptname="editor.build-js.js"/ optimize="closure">
+ <editorOptimize filename="built-editor-amd.js" scriptname="editor.build-js.js"/ optimize="none">
+ <editorOptimize filename="built-editor.min.js" scriptname="editor.build.almond-js.js" optimize="closure"/>
+ <editorOptimize filename="built-editor.js" scriptname="editor.build.almond-js.js" optimize="none"/>
+
<!-- build orion pages and plugins -->
<optimize pageDir="." name="index" bundle="org.eclipse.orion.client.ui" />
<optimize pageDir="navigate" name="table" bundle="org.eclipse.orion.client.ui" />
diff --git a/releng/org.eclipse.orion.releng/builder/html/build.index.html b/releng/org.eclipse.orion.releng/builder/html/build.index.html
index 1398b10..e5f1f38 100644
--- a/releng/org.eclipse.orion.releng/builder/html/build.index.html
+++ b/releng/org.eclipse.orion.releng/builder/html/build.index.html
@@ -109,14 +109,28 @@
<table BORDER="0" CELLSPACING="2" CELLPADDING="0" WIDTH="85%" bordercolor="#999999" align="center" >
<tr><td width="20%"><b>File</b></td><td width="7%" align="center"><b>Download</b></td><td width="40%"><b>Description</b></td></tr>
<tr>
-<td>built-editor.js</td>
-<td><div align="center" id="repdownloadlink"><a href="download.php?dropFile=built-editor.js">(http)</a>&nbsp;&nbsp;</div></td>
+<td>built-editor-amd.min.js</td>
+<td><div align="center" id="repdownloadlink"><a href="download.php?dropFile=built-editor-amd.min.js">(http)</a>&nbsp;&nbsp;</div></td>
+<td id="repdownloadlabel">Minified Orion Editor JavaScript (AMD build)</td>
+</tr>
+<tr>
+<td>built-editor.min.js</td>
+<td><div align="center" id="repdownloadlink"><a href="download.php?dropFile=built-editor.min.js">(http)</a>&nbsp;&nbsp;</div></td>
<td id="repdownloadlabel">Minified Orion Editor JavaScript</td>
</tr>
<tr>
+<td>built-editor-amd.js</td>
+<td><div align="center" id="repdownloadlink"><a href="download.php?dropFile=built-editor-amd.js">(http)</a>&nbsp;&nbsp;</div></td>
+<td id="repdownloadlabel">Orion Editor JavaScript (AMD build)</td>
+</tr>
+<tr>
+<td>built-editor.js</td>
+<td><div align="center" id="repdownloadlink"><a href="download.php?dropFile=built-editor.js">(http)</a>&nbsp;&nbsp;</div></td>
+<td id="repdownloadlabel">Orion Editor JavaScript</td>
+</tr>
<td>built-editor.css</td>
<td><div align="center" id="repdownloadlink"><a href="download.php?dropFile=built-editor.css">(http)</a>&nbsp;&nbsp;</div></td>
-<td id="repdownloadlabel">Minified Orion Editor CSS</td>
+<td id="repdownloadlabel">Orion Editor CSS (common)</td>
</tr>
</table>
diff --git a/releng/org.eclipse.orion.releng/builder/scripts/editor.build.almond.js b/releng/org.eclipse.orion.releng/builder/scripts/editor.build.almond.js
new file mode 100644
index 0000000..87bc438
--- /dev/null
+++ b/releng/org.eclipse.orion.releng/builder/scripts/editor.build.almond.js
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright (c) 2013 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License v1.0
+ * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution
+ * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html).
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+
+// optimization script to concat/minify the Orion editor javascript code
+
+({
+ baseUrl: '.',
+ closure: {
+ CompilerOptions: {},
+ CompilationLevel: 'SIMPLE_OPTIMIZATIONS',
+ loggingLevel: 'WARNING'
+ },
+ paths: {
+ almond: 'requirejs/almond',
+ i18n: 'requirejs/i18n',
+ },
+ name: "almond",
+ preserveLicenseComments: false,
+ uglify: {
+ ascii_only: true
+ },
+ wrap: {
+ start: "/* orion editor */ ", //start cannot be empty
+ end: "\
+var orion = this.orion || (this.orion = {});\n\
+var editor = orion.editor || (orion.editor = {});\n\
+editor.edit = require('orion/editor/edit');"
+ }
+}) \ No newline at end of file