Package standalone HTML & CSS content assist in editor ziporigin/htmlcontentas

7 files changed, 139 insertions, 11 deletions

diff --git a/releng/org.eclipse.orion.client.releng/builder/orion.mini.xml b/releng/org.eclipse.orion.client.releng/builder/orion.mini.xml
index 35776d6..9f86990 100644
--- a/releng/org.eclipse.orion.client.releng/builder/orion.mini.xml
+++ b/releng/org.eclipse.orion.client.releng/builder/orion.mini.xml
@@ -141,15 +141,16 @@
 			Copy editor build files to ${staging} to make editorOptimize simpler. cssIn paths must be 
 			relative to the build file location, and having build file location == ${staging} is easier.
 		-->
-		<copy file="${builder}/scripts/editor.build-css.js" tofile="${staging}/editor.build-css.js" overwrite="true"/>
-		<copy file="${builder}/scripts/editor.build-js.js" tofile="${staging}/editor.build-js.js" overwrite="true"/>
-		<copy file="${builder}/scripts/editor.build.almond-js.js" tofile="${staging}/editor.build.almond-js.js" overwrite="true"/>
-		<copy file="${builder}/scripts/compare.build-css.js" tofile="${staging}/compare.build-css.js" overwrite="true"/>
-		<copy file="${builder}/scripts/compare.build-js.js" tofile="${staging}/compare.build-js.js" overwrite="true"/>
-		<copy file="${builder}/scripts/compare.build.almond-js.js" tofile="${staging}/compare.build.almond-js.js" overwrite="true"/>
-		<copy file="${builder}/scripts/commitBrowser.build-css.js" tofile="${staging}/commitBrowser.build-css.js" overwrite="true"/>
-		<copy file="${builder}/scripts/commitBrowser.build.almond-js.js" tofile="${staging}/commitBrowser.build.almond-js.js" overwrite="true"/>
-		<copy file="${builder}/scripts/editor.build.stylers-js.js" tofile="${staging}/editor.build.stylers-js.js" overwrite="true"/>
+		<copy todir="${staging}" overwrite="true">
+			<fileset dir="${builder}/scripts">
+				<include name="editor.build*" />
+				<include name="compare.build*" />
+				<include name="commitBrowser.build-css.js" />
+				<include name="commitBrowser.build.almond-js.js" />
+				<include name="contentassist*" />
+				<include name="editor.build.stylers-js.js" />
+			</fileset>
+		</copy>
 	</target>
 	
 	<target name="editorStylersOptimize" unless="skipEditorStylers">
@@ -184,7 +185,7 @@
 					<include name="**/*.css"/>
 				</fileset>
  			</copy>
-			
+
 			<widgetOptimizeFile out="${out}/built-editor.css"
 				buildfile="${staging}/editor.build-css.js"
 				optimize="closure"
@@ -205,7 +206,24 @@
 				buildfile="${staging}/editor.build.almond-js.js"
 				optimize="none"
 				staging="${staging}" />
-			<zip destFile="${out}/built-editor.zip" basedir="${out}" includes="built-editor.css, built-editor-amd.min.js, built-editor-amd.js, built-editor.min.js, built-editor.js, stylers/**/*, themes/*" excludes="stylers/build.txt" />
+
+			<!-- Content Assist -->
+			<widgetOptimizeFile out="${out}/htmlContentAssist.min.js"
+				buildfile="${staging}/contentassist.html.build.almond-js.js"
+				optimize="closure"
+				staging="${staging}" />
+			<widgetOptimizeFile out="${out}/cssContentAssist.min.js"
+				buildfile="${staging}/contentassist.css.build.almond-js.js"
+				optimize="closure"
+				staging="${staging}" />
+			<move todir="${out}/contentAssist">
+				<fileset dir="${out}" includes="*ContentAssist*.js" />
+			</move>
+
+			<zip destFile="${out}/built-editor.zip"
+				basedir="${out}"
+				includes="built-editor.css, built-editor-amd.min.js, built-editor-amd.js, built-editor.min.js, built-editor.js, stylers/**/*, themes/*, contentAssist/*"
+				excludes="stylers/build.txt" />
 		</sequential>
 	</target>
 				
diff --git a/releng/org.eclipse.orion.client.releng/builder/scripts/contentassist.css.build.almond-js.js b/releng/org.eclipse.orion.client.releng/builder/scripts/contentassist.css.build.almond-js.js
new file mode 100644
index 0000000..b7bba27
--- /dev/null
+++ b/releng/org.eclipse.orion.client.releng/builder/scripts/contentassist.css.build.almond-js.js
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * 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
+ *******************************************************************************/
+/*global Packages*/
+// optimization script to concat/minify the Orion editor javascript code
+({
+	baseUrl: ".",
+	closure: {
+		CompilerOptions: {
+			languageIn: Packages.com.google.javascript.jscomp.CompilerOptions.LanguageMode.valueOf(Packages.com.google.javascript.jscomp.CompilerOptions.LanguageMode, "ECMASCRIPT5")
+		},
+		CompilationLevel: "SIMPLE_OPTIMIZATIONS",
+		loggingLevel: "WARNING"
+	},
+	paths: {
+		i18n: "requirejs/i18n",
+		csslint: "csslint/csslint",
+	},
+	name: "requirejs/almond",
+	include: ["webtools/cssContentAssist"],
+	preserveLicenseComments: false,
+	uglify: {
+		ascii_only: true
+	},
+	wrap: {
+		startFile: "contentassist.css.head.frag",
+		endFile:   "contentassist.css.tail.frag"
+	}
+})
\ No newline at end of file
diff --git a/releng/org.eclipse.orion.client.releng/builder/scripts/contentassist.css.head.frag b/releng/org.eclipse.orion.client.releng/builder/scripts/contentassist.css.head.frag
new file mode 100644
index 0000000..7cc5a9a
--- /dev/null
+++ b/releng/org.eclipse.orion.client.releng/builder/scripts/contentassist.css.head.frag
@@ -0,0 +1,16 @@
+(function (root, factory) {
+	if (typeof define === 'function' && define.amd) {
+		//Allow using this built library as an AMD module
+		//in another project. That other project will only
+		//see this AMD call, not the internal modules in
+		//the closure below.
+		define([], factory);
+	} else {
+		//Browser globals case. Just assign the
+		//result to a property on the global.
+		root.orion = root.orion || {};
+		root.orion.webtools = root.orion.webtools || {};
+		root.orion.webtools.cssContentAssistProvider = factory().CssContentAssistProvider;
+	}
+}(this, function () {
+	// Module start
\ No newline at end of file
diff --git a/releng/org.eclipse.orion.client.releng/builder/scripts/contentassist.css.tail.frag b/releng/org.eclipse.orion.client.releng/builder/scripts/contentassist.css.tail.frag
new file mode 100644
index 0000000..92b18e0
--- /dev/null
+++ b/releng/org.eclipse.orion.client.releng/builder/scripts/contentassist.css.tail.frag
@@ -0,0 +1,3 @@
+    // Module end
+    return require("webtools/cssContentAssist");
+}));
\ No newline at end of file
diff --git a/releng/org.eclipse.orion.client.releng/builder/scripts/contentassist.html.build.almond-js.js b/releng/org.eclipse.orion.client.releng/builder/scripts/contentassist.html.build.almond-js.js
new file mode 100644
index 0000000..27268b3
--- /dev/null
+++ b/releng/org.eclipse.orion.client.releng/builder/scripts/contentassist.html.build.almond-js.js
@@ -0,0 +1,36 @@
+/*******************************************************************************
+ * 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
+ *******************************************************************************/
+/*global Packages*/
+// optimization script to concat/minify the Orion editor javascript code
+({
+	baseUrl: ".",
+	closure: {
+		CompilerOptions: {
+			languageIn: Packages.com.google.javascript.jscomp.CompilerOptions.LanguageMode.valueOf(Packages.com.google.javascript.jscomp.CompilerOptions.LanguageMode, "ECMASCRIPT5")
+		},
+		CompilationLevel: "SIMPLE_OPTIMIZATIONS",
+		loggingLevel: "WARNING"
+	},
+	paths: {
+		i18n: "requirejs/i18n",
+		csslint: "csslint/csslint",
+	},
+	name: "requirejs/almond",
+	include: ["webtools/htmlContentAssist"],
+	preserveLicenseComments: false,
+	uglify: {
+		ascii_only: true
+	},
+	wrap: {
+		startFile: "contentassist.html.head.frag",
+		endFile:   "contentassist.html.tail.frag"
+	}
+})
\ No newline at end of file
diff --git a/releng/org.eclipse.orion.client.releng/builder/scripts/contentassist.html.head.frag b/releng/org.eclipse.orion.client.releng/builder/scripts/contentassist.html.head.frag
new file mode 100644
index 0000000..dde0238
--- /dev/null
+++ b/releng/org.eclipse.orion.client.releng/builder/scripts/contentassist.html.head.frag
@@ -0,0 +1,16 @@
+(function (root, factory) {
+	if (typeof define === 'function' && define.amd) {
+		//Allow using this built library as an AMD module
+		//in another project. That other project will only
+		//see this AMD call, not the internal modules in
+		//the closure below.
+		define([], factory);
+	} else {
+		//Browser globals case. Just assign the
+		//result to a property on the global.
+		root.orion = root.orion || {};
+		root.orion.webtools = root.orion.webtools || {};
+		root.orion.webtools.htmlContentAssist = factory().HTMLContentAssistProvider;
+	}
+}(this, function () {
+	// Module start
\ No newline at end of file
diff --git a/releng/org.eclipse.orion.client.releng/builder/scripts/contentassist.html.tail.frag b/releng/org.eclipse.orion.client.releng/builder/scripts/contentassist.html.tail.frag
new file mode 100644
index 0000000..a2805e9
--- /dev/null
+++ b/releng/org.eclipse.orion.client.releng/builder/scripts/contentassist.html.tail.frag
@@ -0,0 +1,3 @@
+    // Module end
+    return require("webtools/htmlContentAssist");
+}));
\ No newline at end of file