From 30e7d71e2a704a78eb61c9d4097da0bdb5de68c8 Mon Sep 17 00:00:00 2001
From: Iliyan Peychev <iliyan.peychev@liferay.com>
Date: Wed, 9 Jul 2014 08:55:30 +0200
Subject: [PATCH] Update build.xml

---
 portal-web/build.xml | 30 +++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/portal-web/build.xml b/portal-web/build.xml
index 2b557a8f358003..66cdebc10e891f 100644
--- a/portal-web/build.xml
+++ b/portal-web/build.xml
@@ -7,7 +7,7 @@
 
 	<property name="alloy.version" value="3.0.0pr1" />
 	<property name="alloy-font-awesome.version" value="1.0.0" />
-	<property name="alloy-editor.file" value="alloy-editor-0.1.0.zip" />
+	<property name="alloyeditor.version" value="0.1.0" />
 	<property name="ckeditor.file" value="ckeditor_4.3.5_liferay.zip" />
 	<property name="scayt.file" value="scayt_4.3.5.zip" />
 	<property name="tinymce.file" value="tinymce_3.5.6.zip" />
@@ -79,6 +79,8 @@
 				<delete dir="docroot/html/js/aui" />
 				<delete dir="docroot/html/themes/_unstyled/images/aui" />
 
+				<echo>${alloy.file}</echo>
+
 				<unzip src="third-party/${alloy.file}" dest="docroot/html/ALLOY_ZIP" />
 
 				<!-- CSS -->
@@ -223,24 +225,38 @@
 	</target>
 
 	<target name="build-alloy-editor">
+		<path id="alloyeditor.zip.path">
+			<fileset dir="third-party">
+				<include name="alloy-editor-${alloyeditor.version}.zip" />
+			</fileset>
+		</path>
+
+		<property name="alloyeditor.zip.path" refid="alloyeditor.zip.path" />
+
+		<basename file="${alloyeditor.zip.path}" property="alloyeditor.file" />
+
 		<if>
 			<not>
 				<uptodate
-					srcfile="third-party/${alloy-editor.file}"
-					targetfile="docroot/html/js/editor/alloy-editor"
+					srcfile="third-party/${alloyeditor.file}"
+					targetfile="docroot/html/js/editor/alloyeditor"
 				/>
 			</not>
 			<then>
-				<delete dir="docroot/html/js/editor/alloy-editor" />
+				<delete dir="docroot/html/js/editor/alloyeditor" />
+
+				<echo>${alloyeditor.file}</echo>
+
+				<unzip src="third-party/${alloyeditor.file}" dest="docroot/html/js/editor/_tmp" />
 
-				<unzip src="third-party/${alloy-editor.file}" dest="docroot/html/js/editor/alloy" />
+				<copy todir="docroot/html/js/editor/_tmp/alloy-editor-${alloy.version}/alloy-editor" overwrite="true" preservelastmodified="true" />
 
-				<copy todir="docroot/html/js/editor/alloy" overwrite="true" preservelastmodified="true">
+				<copy todir="docroot/html/js/editor/alloyeditor" overwrite="true" preservelastmodified="true">
 					<fileset dir="docroot/html/js/editor/alloy_diffs" />
 				</copy>
 			</then>
 			<else>
-				<copy todir="docroot/html/js/editor/alloy" preservelastmodified="true">
+				<copy todir="docroot/html/js/editor/alloyeditor" preservelastmodified="true">
 					<fileset dir="docroot/html/js/editor/alloy_diffs" />
 				</copy>
 			</else>