Bug 975622 - Part 1: Rename existing builder and target to pre. r=bnicholson
authorNick Alexander <nalexander@mozilla.com>
Mon, 24 Feb 2014 18:14:03 -0800
changeset 170435 3e9a671c4b59b7cf2a6fa4961a51757c760d24de
parent 170434 2e340e4464262df89e81d3a6ec90cebb476069c9
child 170436 c092d3402ba6163445c2c2126e73f3a6f56cc3b7
push id26288
push userryanvm@gmail.com
push dateTue, 25 Feb 2014 20:20:43 +0000
treeherdermozilla-central@22650589a724 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbnicholson
bugs975622
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 975622 - Part 1: Rename existing builder and target to pre. r=bnicholson
python/mozbuild/mozbuild/backend/templates/android_eclipse/.externalToolBuilders/Builder.launch
python/mozbuild/mozbuild/backend/templates/android_eclipse/.externalToolBuilders/PreBuilder.launch
python/mozbuild/mozbuild/backend/templates/android_eclipse/.project
python/mozbuild/mozbuild/backend/templates/android_eclipse/build.xml
python/mozbuild/mozbuild/backend/templates/android_eclipse/pre_build.xml
rename from python/mozbuild/mozbuild/backend/templates/android_eclipse/.externalToolBuilders/Builder.launch
rename to python/mozbuild/mozbuild/backend/templates/android_eclipse/.externalToolBuilders/PreBuilder.launch
--- a/python/mozbuild/mozbuild/backend/templates/android_eclipse/.externalToolBuilders/Builder.launch
+++ b/python/mozbuild/mozbuild/backend/templates/android_eclipse/.externalToolBuilders/PreBuilder.launch
@@ -1,19 +1,19 @@
 #filter substitution
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <launchConfiguration type="org.eclipse.ant.AntBuilderLaunchConfigurationType">
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="compile,"/>
-<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="compile,"/>
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_AUTO_TARGETS" value="pre_build,"/>
+<stringAttribute key="org.eclipse.ant.ui.ATTR_ANT_MANUAL_TARGETS" value="pre_build,"/>
 <booleanAttribute key="org.eclipse.ant.ui.ATTR_TARGETS_UPDATED" value="true"/>
 <booleanAttribute key="org.eclipse.ant.ui.DEFAULT_VM_INSTALL" value="false"/>
 <booleanAttribute key="org.eclipse.debug.core.capture_output" value="true"/>
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_CONSOLE_OUTPUT_ON" value="true"/>
 <stringAttribute key="org.eclipse.debug.core.ATTR_REFRESH_SCOPE" value="${project}"/>
 <booleanAttribute key="org.eclipse.debug.ui.ATTR_LAUNCH_IN_BACKGROUND" value="false"/>
 <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.ant.ui.AntClasspathProvider"/>
 <booleanAttribute key="org.eclipse.jdt.launching.DEFAULT_CLASSPATH" value="true"/>
 <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="@IDE_PROJECT_NAME@"/>
-<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/@IDE_PROJECT_NAME@/build.xml}"/>
+<stringAttribute key="org.eclipse.ui.externaltools.ATTR_LOCATION" value="${workspace_loc:/@IDE_PROJECT_NAME@/pre_build.xml}"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_RUN_BUILD_KINDS" value="incremental,auto"/>
 <booleanAttribute key="org.eclipse.ui.externaltools.ATTR_TRIGGERS_CONFIGURED" value="true"/>
 <stringAttribute key="org.eclipse.ui.externaltools.ATTR_TOOL_ARGUMENTS" value="-Dbuild_type=&quot;${build_type}&quot;&#10;-Dbuild_files=&quot;DUMMY ${build_files}&quot;"/>
 </launchConfiguration>
--- a/python/mozbuild/mozbuild/backend/templates/android_eclipse/.project
+++ b/python/mozbuild/mozbuild/backend/templates/android_eclipse/.project
@@ -6,17 +6,17 @@
 	<projects>
 	</projects>
 	<buildSpec>
 		<buildCommand>
 			<name>org.eclipse.ui.externaltools.ExternalToolBuilder</name>
 			<arguments>
 				<dictionary>
 					<key>LaunchConfigHandle</key>
-					<value>&lt;project&gt;/.externalToolBuilders/Builder.launch</value>
+					<value>&lt;project&gt;/.externalToolBuilders/PreBuilder.launch</value>
 				</dictionary>
 			</arguments>
 		</buildCommand>
 		<buildCommand>
 			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
 			<arguments>
 			</arguments>
 		</buildCommand>
rename from python/mozbuild/mozbuild/backend/templates/android_eclipse/build.xml
rename to python/mozbuild/mozbuild/backend/templates/android_eclipse/pre_build.xml
--- a/python/mozbuild/mozbuild/backend/templates/android_eclipse/build.xml
+++ b/python/mozbuild/mozbuild/backend/templates/android_eclipse/pre_build.xml
@@ -65,15 +65,15 @@
   // The if below checks for the property being defined, not its value.
   if (build_needed) {
     project.setProperty("build_needed", build_needed);
   }
 ]]>
         </script>
     </target>
 
-    <target name="compile" depends="build_needed" if="build_needed">
+    <target name="pre_build" depends="build_needed" if="build_needed">
         <exec executable="${topsrcdir}/mach" dir="${topobjdir}" failonerror="true">
             <arg value="build"/>
             <arg value="${objdir}/ANDROID_ECLIPSE_PROJECT_${project_name}"/>
         </exec>
     </target>
 </project>