LPS-40913 We are not properly calling a custom "war" target because w…

…e were checking for "war-macro", so instead, reference it as "war" but know to map "war" to <war-macro
daviddotzhang · Jan 24, 2014 · 094c499 · 094c499
1 parent 16d905e
commit 094c499
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/build-common-plugins.xml b/build-common-plugins.xml
@@ -66,7 +66,7 @@
 
 	<target name="jar">
 		<loop-modules
-			loop.modules.cmd="jar-macro"
+			loop.modules.cmd="jar"
 			loop.modules.dir="."
 		/>
 	</target>
@@ -107,7 +107,7 @@
 
 	<target name="war">
 		<loop-modules
-			loop.modules.cmd="war-macro"
+			loop.modules.cmd="war"
 			loop.modules.dir="."
 		/>
 	</target>

diff --git a/build-common.xml b/build-common.xml
@@ -243,9 +243,9 @@ Error-Prone was automatically installed. Please rerun your task.
 							</then>
 						</elseif>
 						<elseif>
-							<equals arg1="@{macrodef.name}" arg2="javadoc-macro" />
+							<equals arg1="@{macrodef.name}" arg2="jar" />
 							<then>
-								<javadoc-macro
+								<jar-macro
 									module.dir="@{module.dir}"
 								/>
 							</then>
@@ -259,17 +259,17 @@ Error-Prone was automatically installed. Please rerun your task.
 							</then>
 						</elseif>
 						<elseif>
-							<equals arg1="@{macrodef.name}" arg2="jar-macro" />
+							<equals arg1="@{macrodef.name}" arg2="jar-source" />
 							<then>
-								<jar-macro
+								<jar-source
 									module.dir="@{module.dir}"
 								/>
 							</then>
 						</elseif>
 						<elseif>
-							<equals arg1="@{macrodef.name}" arg2="jar-source" />
+							<equals arg1="@{macrodef.name}" arg2="javadoc" />
 							<then>
-								<jar-source
+								<javadoc-macro
 									module.dir="@{module.dir}"
 								/>
 							</then>
@@ -291,7 +291,7 @@ Error-Prone was automatically installed. Please rerun your task.
 							</then>
 						</elseif>
 						<elseif>
-							<equals arg1="@{macrodef.name}" arg2="war-macro" />
+							<equals arg1="@{macrodef.name}" arg2="war" />
 							<then>
 								<war-macro
 									module.dir="@{module.dir}"
@@ -570,7 +570,7 @@ Error-Prone was automatically installed. Please rerun your task.
 								<available file="${sdk.dir}/shared/@{import.shared.current}/src" />
 								<then>
 									<call-macrodef-or-target
-										macrodef.name="jar-macro"
+										macrodef.name="jar"
 										module.dir="${sdk.dir}/shared/@{import.shared.current}"
 									/>
 
@@ -987,15 +987,15 @@ Please find a solution that does not require portal-impl.jar.
 				</or>
 				<then>
 					<call-macrodef-or-target
-						macrodef.name="war-macro"
+						macrodef.name="war"
 						module.dir="@{module.dir}"
 					/>
 
 					<copy file="${plugin.file}" todir="${auto.deploy.dir}" />
 				</then>
 				<else>
 					<call-macrodef-or-target
-						macrodef.name="jar-macro"
+						macrodef.name="jar"
 						module.dir="@{module.dir}"
 					/>
 
@@ -1027,7 +1027,7 @@ Please find a solution that does not require portal-impl.jar.
 			/>
 
 			<call-macrodef-or-target
-				macrodef.name="war-macro"
+				macrodef.name="war"
 				module.dir="@{module.dir}"
 			/>
 
@@ -1812,7 +1812,7 @@ Please find a solution that does not require portal-impl.jar.
 				</elseif>
 				<else>
 					<call-macrodef-or-target
-						macrodef.name="jar-macro"
+						macrodef.name="jar"
 						module.dir="@{module.dir}"
 					/>
 				</else>

diff --git a/build.xml b/build.xml
@@ -241,7 +241,7 @@
 		<for list="hooks,layouttpl,portlets,shared,themes,webs" param="loop.modules.dir">
 			<sequential>
 				<loop-modules
-					loop.modules.cmd="war-macro"
+					loop.modules.cmd="war"
 					loop.modules.dir="@{loop.modules.dir}"
 				/>
 			</sequential>