Change the editor build to use the latest changed svn revision and not the global svn revision.

client/tools/buildbot_annotated_steps.py

 # Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
 # for details. All rights reserved. Use of this source code is governed by a
 # BSD-style license that can be found in the LICENSE file.
 
 #!/usr/bin/python
 
 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ skipping 77 matching lines @@
   build and test the tools
 
   args:
   srcpath - the location of the source code to build
   mode - the mode release or debug
   version - the svn version of the currently checked out code
   '''
   print 'ProcessTools'
 
   toolsBuildScript = os.path.join('.', 'editor', 'build', 'build.py')
+  
+  # get the latest changed revision from the current repository sub-tree

[danrubel, 2012/10/15 20:49:35]

Should this be moved to GetBuildInfo?
And perhaps a TODO asking whether we should use this version for all builds

[devoncarew, 2012/10/15 20:55:28]

I added a TODO. This probably should be in GetBuildInfo(); lets see how this
builds and then revisit after M1.

+  version = GetLatestChangedRevision()
 
   #TODO: debug statements to be removed in the future.
   print "mode = " + mode
   print "name = " + name
   print "version = " + version
   print "toolsBuildScript = " + os.path.abspath(toolsBuildScript)
 
   utils = GetUtils()
   outdir = GetOutDir(utils, mode)
   cmds = [sys.executable, toolsBuildScript,
@@ skipping 37 matching lines @@
      - mode: either 'debug' or 'release'
   """
   cmd = [sys.executable,
          './tools/clean_output_directory.py']
   print 'Clobbering %s' % (' '.join(cmd))
   return subprocess.call(cmd)
 
 def GetShouldClobber():
   return os.environ.get(BUILDER_CLOBBER) == "1"
 
+def RunDart(scriptPath):
+  if sys.platform == 'darwin':
+    pipe = subprocess.Popen(
+          ['./tools/testing/bin/macos/dart', scriptPath], 
+          stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+  elif os.name == 'posix':
+    pipe = subprocess.Popen(
+          ['./tools/testing/bin/linux/dart', scriptPath], 
+          stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+  else:
+    pipe = subprocess.Popen(
+          ['tools\\testing\\bin\\windows\\dart.exe', scriptPath], 
+          stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+
+  output = pipe.communicate()
+  return output[0]
+
+def GetLatestChangedRevision():
+  # 0.1.2.0_r13661
+  # 0.1.2.0_r13661_username
+  fullVersion = RunDart("tools/version.dart")
+
+  m = re.search('._r(\d+)', fullVersion)
+  svnRev = m.group(1)
+
+  return svnRev
+
 def main():
   print 'main'

[dgrove, 2012/10/15 21:02:12]

is this leftover debugging?

[devoncarew, 2012/10/15 21:03:44]

It was in there already - doesn't seem to add a lot of value though.

+
   if len(sys.argv) == 0:
     print 'Script pathname not known, giving up.'
     return 1
 
   scriptdir = os.path.dirname(sys.argv[0])
   # Get at the top-level directory. This script is in client/tools
   os.chdir(os.path.abspath(os.path.join(scriptdir, os.pardir, os.pardir)))
 
   if GetShouldClobber():
     print '@@@BUILD_STEP Clobber@@@'
@@ skipping 16 matching lines @@
     status = ProcessCompiler(name)
 
   if status:
     print '@@@STEP_FAILURE@@@'
 
   return status
 
 
 if __name__ == '__main__':
   sys.exit(main())