LPS-40913 JAR

daviddotzhang · Jan 11, 2014 · dfe1466 · dfe1466
1 parent 98f4f7c
commit dfe1466
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 19 deletions.
diff --git a/build-common-plugins.xml b/build-common-plugins.xml
@@ -61,13 +61,10 @@
 	</target>
 
 	<target name="jar">
-		<antcall target="loop-modules">
-			<param name="loop.modules.cmd" value="jar-module" />
-		</antcall>
-	</target>
-
-	<target name="jar-module">
-		<ant dir="${module.name}" target="jar" inheritAll="false" />
+		<loop-modules
+			loop.modules.cmd="jar-macro"
+			loop.modules.dir="."
+		/>
 	</target>
 
 	<target name="loop-modules">

diff --git a/build-common.xml b/build-common.xml
@@ -169,6 +169,14 @@ Error-Prone was automatically installed. Please rerun your task.
 								/>
 							</then>
 						</elseif>
+						<elseif>
+							<equals arg1="@{macrodef.name}" arg2="jar-macro" />
+							<then>
+								<jar-macro
+									module.dir="@{module.dir}"
+								/>
+							</then>
+						</elseif>
 						<elseif>
 							<equals arg1="@{macrodef.name}" arg2="merge" />
 							<then>
@@ -456,7 +464,14 @@ Error-Prone was automatically installed. Please rerun your task.
 							<if>
 								<available file="${sdk.dir}/shared/@{import.shared.current}/src" />
 								<then>
-									<ant dir="${sdk.dir}/shared/@{import.shared.current}" target="jar" inheritAll="false" />
+									<call-macrodef-or-target
+										macrodef.name="jar-macro"
+										module.dir="${sdk.dir}/shared/@{import.shared.current}"
+									/>
+
+									<set-module-properties
+										module.dir="@{module.dir}"
+									/>
 
 									<for param="import.shared.full.path">
 										<path>
@@ -849,6 +864,28 @@ Please find a solution that does not require portal-impl.jar.
 		</sequential>
 	</macrodef>
 
+	<macrodef name="jar-macro">
+		<attribute name="module.dir" />
+
+		<sequential>
+			<set-module-properties
+				module.dir="@{module.dir}"
+			/>
+
+			<call-macrodef-or-target
+				macrodef.name="compile"
+				module.dir="@{module.dir}"
+			/>
+
+			<mkdir dir="${sdk.dir}/dist" />
+
+			<jar
+				basedir="@{module.dir}/classes"
+				jarfile="${plugin.file}"
+			/>
+		</sequential>
+	</macrodef>
+
 	<macrodef name="loop-modules">
 		<attribute name="loop.modules.cmd" />
 		<attribute name="loop.modules.dir" />

diff --git a/shared/build-common-shared.xml b/shared/build-common-shared.xml
@@ -18,21 +18,16 @@
 		</then>
 	</if>
 
-	<target name="deploy" depends="jar">
+	<target name="deploy">
+		<jar-macro
+			module.dir="."
+		/>
 	</target>
 
 	<target name="jar">
-		<call-macrodef-or-target
-			macrodef.name="compile"
+		<jar-macro
 			module.dir="."
 		/>
-
-		<mkdir dir="${sdk.dir}/dist" />
-
-		<jar
-			basedir="classes"
-			jarfile="${plugin.file}"
-		/>
 	</target>
 
 	<target name="javadoc">
@@ -43,6 +38,8 @@
 	</target>
 
 	<target name="war">
-		<antcall target="jar" />
+		<jar-macro
+			module.dir="."
+		/>
 	</target>
 </project>