Make the editor build callable from tools/build.py

editor/tools/features/com.google.dart.tools.deploy.feature_releng/build_rcp.xml

 <!--
 This build script will build the Dart RCP and Dart update site.  
 
 This script will setup the PDE build structure and then call into the PDE
 build system.  The PDE build system has to run under Eclipse.
 -->
 <project name="build_dart" default="build_rcp">
     
     <import file="build-common.xml" />
 
@@ skipping 41 matching lines @@
         </fail>
         <echoProperty propertyname="build.download.sdk" />
     </target>
     
     <!--
     initializethe build environment by cleaning up the builchrome-botd.tmp directory and 
     creating the needed directories
     -->
     <target name="init" depends="setOS, buildBotFastFail, readProperties">
         <property environment="env" />
-        <echoproperties prefix="env." />
 
         <tstamp>
             <format property="build.date" pattern="yyyyMMddHHmm" />
         </tstamp>
         <tstamp>
             <format property="build.date.ymd" pattern="yyyy-MM-dd" />
         </tstamp>
         <tstamp>
             <format property="build.year" pattern="yyyy" />
         </tstamp>
@@ skipping 33 matching lines @@
         <loadproperties srcFile="${build.source}/../tools/VERSION">
             <filterchain>
                 <replaceregex pattern=" " replace="="/>
             </filterchain>
         </loadproperties>
         <property name="dart.version" value="${MAJOR}.${MINOR}.${BUILD}" />
         
         <condition property="build.revision" value="${env.BUILDBOT_GOT_REVISION}">
             <isset property="env.BUILDBOT_GOT_REVISION" />
         </condition>
-        <property name="build.revision" value="unknown" />
+        <property name="build.revision" value="000" />
         <property name="dart.version_revision" value="${dart.version}_${build.revision}" />
         <!-- TODO(devoncarew): we should pull this info from tools/version.dart -->
         <property name="dart.version.full" value="${MAJOR}.${MINOR}.${BUILD}.${PATCH}_r${build.revision}" />
 
         <dirname file="${build.source}" property="build.source.root"/>
 
         <property name="build.thirdparty" location="${build.source.root}/third_party" />
         
         <property name="build.stage.scripts" location="${build.stage}/scripts" />
-        <echoproperties prefix="java." />
-        <echoproperties prefix="build." />
+        <!-- echoproperties prefix="java." / -->
+        <!-- echoproperties prefix="build." / -->
         <property name="build.runtime.abs" location="${build.runtime}" />
         <property name="build.target.abs" location="${build.target}" />
         <property name="build.stage.abs" location="${build.stage}" />
         <property name="build.out.property.file"
                   value="${java.io.tmpdir}/dart-build.properties" />
         <echoproperties prefix="build." destfile="${build.out.property.file}"/>
         <echoProperty propertyName="eclipse-sdk.3.8.url" />
         <echoProperty propertyName="eclipse-sdk.3.8.linux.gtk.x86.zip" />
         <echoProperty propertyName="eclipse-sdk.3.7.url" />
         <echoProperty propertyName="eclipse-sdk.3.7.linux.gtk.x86.zip" />
         <!--
         cleanup build directories
         -->
         <delete failonerror="false" includeemptydirs="true">
             <fileset dir="${build.tmp}" />
             <!-- fileset dir="${build.out}" / -->
         </delete>
         <!--
         create the build structure
         -->
         <mkdir dir="${build.downloads}" />
 
         <mkdir dir="${build.runtime}" />
         <mkdir dir="${build.target}" />
         <mkdir dir="${build.stage.plugins}" />
         <mkdir dir="${build.stage.features}" />
         <mkdir dir="${build.out}" />
+
+        <property name="build.dart.sdk" value="true"/>
+
         <echoProperty propertyname="build.revision" />
         <echoProperty propertyname="build.builder" />
         <echoProperty propertyname="build.root" />
         <echoProperty propertyname="build.out" />
         <echoProperty propertyname="build.source" />
         <echoProperty propertyname="build.source.root"/>
         <echoProperty propertyname="build.out.property.file" />
         <echoProperty propertyname="build.os" />
         <echoProperty propertyname="build.dart.sdk.zip" />
-        <echoProperty propertyname="build.local.build" />
+        <echoProperty propertyname="build.download.sdk" />
     </target>
 
     <!-- - - - - - - - - - - - - - - - - - 
           target: buildSamples
           Copy sample Dart libraries from the SVN tree into a new "samples" directory
 
           ant properties required
            build.source.root = the SVN root directory
            build.stage.include.dir = required iff samples.out.dir is not already defined
     
           ant properties set
            samples.out.dir = the destination "samples" directory, created by this target
               
          - - - - - - - - - - - - - - - - - -->
     <target name="buildSamples">
         <!-- create the samples directory -->
         <property name="samples.out.dir" value="${build.stage.include.dir}/samples" />
         
-          <!-- delete old samples -->
-          <delete dir="${samples.out.dir}"/>
-        
+        <!-- delete old samples -->
+        <!-- delete dir="${samples.out.dir}"/ -->

[danrubel, 2013/01/07 23:07:54]

Lets leave this in there for now... unless its causing major problems on Windows

[devoncarew, 2013/01/07 23:21:22]

Done.

+
         <!-- copy specific samples -->
         <copy todir="${samples.out.dir}">
             <fileset dir="${build.source.root}/samples">
                 <include name="clock/**"/>
 
                 <include name="solar/**"/>
 
                 <include name="solar3d/**"/>
                 
                 <include name="sunflower/**"/>
@@ skipping 27 matching lines @@
             </patternset>
             <cutdirsmapper dirs="1"/>
         </unzip>
 
         <delete file="${html5.archive}"/ -->
         
         <!-- copy the dart.js file into the samples directory -->
         <copy todir="${samples.out.dir}" file="${build.source.root}/client/dart.js"/>
     </target>
     
-    <!-- - - - - - - - - - - - - - - - - - 
-          target: getSdk
+    <!-- - - - - - - - - - - - - - - - - - - 
+          target: installSdk
+          Install the sdk zip unless a path to an SDK exists - build.dart.sdk.
          - - - - - - - - - - - - - - - - - -->
-    <target name="getSdk" if="build.download.sdk" depends="setOS">
+    <target name="installSdk" unless="build.dart.sdk" depends="setOS">
+        <echoProperty propertyname="build.dart.sdk"/>
+
         <get src="http://gsdview.appspot.com/dart-editor-archive-continuous/latest/dartsdk-${osfamily}-32.zip"
              dest="${build.dart.sdk.zip}"
              usetimestamp="true" />
-        <delete dir="${build.stage.include.dir}/dart-sdk"/>
-    </target>
-
-    <!-- - - - - - - - - - - - - - - - - - 
-          target: installSdkInWindows
-          Use the standard Ant unzip task to install the sdk
-         - - - - - - - - - - - - - - - - - -->
-    <target name="installSdkInWindows" if="installSdkWindows" depends="getSdk">
-        <unzip src="${build.dart.sdk.zip}" dest="${build.stage.include.dir}" />
-    </target>
-
-    <!-- - - - - - - - - - - - - - - - - - 
-          target: installSdkInNonWindows
-          The standard Ant unzip task destroys execute permissions in the sdk
-          so use the command line unzip instead
-         - - - - - - - - - - - - - - - - - -->
-    <target name="installSdkInNonWindows" if="installSdkNotWindows" depends="getSdk">
+        
         <echo message="unzipping ${build.dart.sdk.zip} to ${build.stage.include.dir}"/>
         <mkdir dir="${build.stage.include.dir}" />
+        <delete dir="${build.stage.include.dir}/dart-sdk"/>
         <exec executable="unzip" dir="${build.stage.include.dir}">
             <arg value="-q"/>
             <arg value="${build.dart.sdk.zip}"/>
         </exec>
     </target>
-
-    <!-- - - - - - - - - - - - - - - - - - - 
-          target: installSdk
-          Install the sdk zip if build.os is set
-         - - - - - - - - - - - - - - - - - -->
-    <target name="installSdk" depends="installSdkInNonWindows, installSdkInWindows">
-    </target>
     
     <!-- - - - - - - - - - - - - - - - - - 
           target: setupDevWorkspace
          - - - - - - - - - - - - - - - - - -->
     <target name="setupDevWorkspace" 
             depends="initDevWorkspace, buildSamples, installSdk">
     </target>
     
     <!-- - - - - - - - - - - - - - - - - - 
           target: initDevWorkspace
@@ skipping 27 matching lines @@
             <os family="unix"/>
         </condition>
 
         <property name="data.location" location="./build-settings" />
         <property name="user.os.property.file" location="${data.location}/${user.name}.${build.os}.properties" />
         <echo message="reading ${user.os.property.file}" />
         <property file="${user.os.property.file}" />
         <property name="user.property.file" location="${data.location}/${user.name}.properties" /> 
         <echo message="reading ${user.property.file}" />
         <property file="${user.property.file}" />
+      
+        <!-- The path to dart/editor/ -->
+        <property name="build.source" location="../../.." />
+        <dirname property="build.source.root" file="${build.source}" />
 
-        <fail unless="build.source">*
-            **********************************
-            Define the "build.source" property to point to your dart/eclipse SVN directory
-            **********************************
-        </fail>
-        <dirname file="${build.source}" property="build.source.root"/>
+        <echoProperty propertyname="build.source" />
+        <echoProperty propertyname="build.source.root" />
     </target>
     
     <!-- - - - - - - - - - - - - - - - - - 
           target: setupRuntimeEclipse
          - - - - - - - - - - - - - - - - - -->
     <target name="setupRuntimeEclipse">
         <setupEclipse location="${build.runtime}" version="${build.runtime.eclipse.version}"
                       arch="${build.eclipse.arch}" os.ws="${build.eclipse.os.ws}" />
         <fileset dir="${build.runtime}/eclipse/plugins" id="launcherFs" >
             <include name="*launcher_*.jar" />
         </fileset>
         <pathconvert property="eclipse.runtime.launcher.jar" refid="launcherFs" />
     </target>
 
     <!--
     copy the code from the svn structure to the PDE structure and get rid of the linked resources
     -->
     <target name="setupBuild" depends="init, installSdk, setupRuntimeEclipse, buildSamples" >
         <setupTargetEclipse location="${build.target}" eclipse="${build.target.eclipse.version}"
                             arch="${build.eclipse.arch}" />
-        <!-- installDirIntoTargetEclipse updatesite="${build.source.root}/third_party/chromesdk/0.3.0"
-                                     ius="org.chromium.sdk.feature.group"
-                                     uniqueId="chrome"/ -->
-        <!-- installDirIntoTargetEclipse updatesite="${build.source.root}/third_party/usageprofiler"
-                                     ius="com.google.gdt.eclipse.usageprofiler.feature.feature.group"
-                                     uniqueId="profiler"/-->
         <delete file="${build.source.root}/third_party/closure_compiler_src/build/compiler.jar"
                 failonerror="false" />
-        <!-- closure compiler no longer part of the build
-          ant antfile="build.xml" dir="${build.source.root}/third_party/closure_compiler_src"
-             inheritall="false" inheritrefs="false" / -->
         <property name="eclipse.runtime.dir"
                   value="${build.runtime}/eclipse" />
         <mkdir dir="${build.stage.plugins}" />
         <mkdir dir="${build.stage.features}" />
 
         <copy todir="${build.stage.plugins}">
             <fileset dir="${build.source}/tools/plugins">
                 <exclude name="*_test/**" />
                 <exclude name="**/bin/**" />
             </fileset>
@@ skipping 119 matching lines @@
 }</echo>
     </target>
 
     <!-- - - - - - - - - - - - - - - - - - 
           target: doDeploy_rcp                      
          - - - - - - - - - - - - - - - - - -->
     <target name="doDeploy_rcp" depends="init, setupBuild, doBuild_rcp, package_rcp">
     </target>
 
 </project>