LPS-40913 DIRECT-DEPLOY add stub

liferay · Jan 11, 2014 · 98b368d · 98b368d
1 parent 262632b
commit 98b368d
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 5 deletions.
diff --git a/build-common-plugins.xml b/build-common-plugins.xml
@@ -57,6 +57,13 @@
 		/>
 	</target>
 
+	<target name="direct-deploy">
+		<loop-modules
+			loop.modules.cmd="direct-deploy"
+			loop.modules.dir="."
+		/>
+	</target>
+
 	<target name="jar">
 		<loop-modules
 			loop.modules.cmd="jar-macro"

diff --git a/build-common.xml b/build-common.xml
@@ -228,6 +228,14 @@ Error-Prone was automatically installed. Please rerun your task.
 								/>
 							</then>
 						</elseif>
+						<elseif>
+							<equals arg1="@{macrodef.name}" arg2="direct-deploy" />
+							<then>
+								<direct-deploy
+									module.dir="@{module.dir}"
+								/>
+							</then>
+						</elseif>
 						<elseif>
 							<equals arg1="@{macrodef.name}" arg2="jar-macro" />
 							<then>
@@ -980,6 +988,16 @@ Please find a solution that does not require portal-impl.jar.
 		</sequential>
 	</macrodef>
 
+	<macrodef name="direct-deploy">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+		</sequential>
+	</macrodef>
+
 	<macrodef name="jar-macro">
 		<attribute name="module.dir" />
 

diff --git a/build.xml b/build.xml
@@ -73,11 +73,14 @@
 	</target>
 
 	<target name="direct-deploy">
-		<ant dir="hooks" target="direct-deploy" inheritAll="false" />
-		<ant dir="layouttpl" target="direct-deploy" inheritAll="false" />
-		<ant dir="portlets" target="direct-deploy" inheritAll="false" />
-		<ant dir="themes" target="direct-deploy" inheritAll="false" />
-		<ant dir="webs" target="direct-deploy" inheritAll="false" />
+		<for list="hooks,layouttpl,portlets,themes,webs" param="loop.modules.dir">
+			<sequential>
+				<loop-modules
+					loop.modules.cmd="direct-deploy"
+					loop.modules.dir="@{loop.modules.dir}"
+				/>
+			</sequential>
+		</for>
 	</target>
 
 	<target name="ear">