Add python based VERSION file generation for sdk bots

tools/utils.py

 # Copyright (c) 2012, 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.
 
 # This file contains a set of utilities functions used by other Python-based
 # scripts.
 
 import commands
+import datetime
+import json
 import os
 import platform
 import re
 import shutil
 import subprocess
 import tempfile
 import sys
 
 class Version(object):
   def __init__(self, channel, major, minor, patch, prerelease,
@@ skipping 292 matching lines @@
     return 'edge_%s' % pad(GetSVNRevision(), 6)
   elif version.channel == 'dev':
     return 'dev_%s_%s' % (pad(version.prerelease, 2),
                           pad(version.prerelease_patch, 2))
   else:
     return 'release'
 
 def GetVersion():
   return GetSemanticSDKVersion()
 
+
+# The editor used to procude the VERSION file. We now produce this

[Bill Hesse, 2015/05/28 09:18:52]

produce

[ricow1, 2015/05/28 09:20:06]

Done.

+# in the bots archiving the sdk.
+# The content looks like this:
+#{
+#  "date": "2015-05-28",
+#  "version": "1.11.0-edge.131653",
+#  "revision": "535394c2657ede445142d8a92486d3899bbf49b5"
+#}
+def GetVersionFileContent():
+  result = {"date": str(datetime.date.today()),
+            "version": GetVersion(),
+            "revision": GetGitRevision()}
+  return json.dumps(result, indent=2)
+
 def GetChannel():
   version = ReadVersionFile()
   return version.channel
 
 def GetUserName():
   key = 'USER'
   if sys.platform == 'win32':
     key = 'USERNAME'
   return os.environ.get(key, '')
 
@@ skipping 50 matching lines @@
 # we use the version number instead for archiving purposes.
 # The number on master is the count of commits on the master branch.
 def GetArchiveVersion():
   version = ReadVersionFile()
   if not version:
     raise 'Could not get the archive version, parsing the version file failed'
   if version.channel == 'be':
     return GetGitNumber()
   return GetSemanticSDKVersion()
 
+
+def GetGitRevision():
+  p = subprocess.Popen(['git', 'log', '-n', '1', '--pretty=format:%H'],
+                       stdout = subprocess.PIPE,
+                       stderr = subprocess.STDOUT, shell=IsWindows(),
+                       cwd = DART_DIR)
+  output, _ = p.communicate()
+  # We expect a full git hash
+  if len(output) != 40:
+    print "Warning: could not parse git commit, output was %s" % output
+    return None
+  return output
+
 # To eliminate clashing with older archived builds on bleding edge we add
 # a base number bigger the largest svn revision (this also gives us an easy
 # way of seeing if an archive comes from git based or svn based commits).
 GIT_NUMBER_BASE = 100000
 def GetGitNumber():
   p = subprocess.Popen(['git', 'rev-list', 'HEAD', '--count'],
                        stdout = subprocess.PIPE,
                        stderr = subprocess.STDOUT, shell=IsWindows(),
                        cwd = DART_DIR)
   output, _ = p.communicate()
@@ skipping 99 matching lines @@
   except OSError, e:
     PrintError("os.unlink() " + str(e))
 
 
 def Main():
   print "GuessOS() -> ", GuessOS()
   print "GuessArchitecture() -> ", GuessArchitecture()
   print "GuessCpus() -> ", GuessCpus()
   print "IsWindows() -> ", IsWindows()
   print "GuessVisualStudioPath() -> ", GuessVisualStudioPath()
-
+  print "GetGitRevision() -> ", GetGitRevision()
+  print "GetVersionFileContent() -> ", GetVersionFileContent()
 
 class Error(Exception):
   pass
 
 
 class ToolError(Exception):
   """Deprecated exception, use Error instead."""
 
   def __init__(self, value):
     self.value = value
@@ skipping 80 matching lines @@
     os.chdir(self._working_directory)
 
   def __exit__(self, *_):
     print "Enter directory = ", self._old_cwd
     os.chdir(self._old_cwd)
 
 
 if __name__ == "__main__":
   import sys
   Main()