Merge commit '1fe4406f374291ab2e86e95a97341fd9c475fcb8'

1 files changed, 373 insertions, 0 deletions

diff --git a/tmk_core/tool/mbed/mbed-sdk/workspace_tools/synch.py b/tmk_core/tool/mbed/mbed-sdk/workspace_tools/synch.py
new file mode 100644
index 0000000000..a9102a6e02
--- /dev/null
+++ b/tmk_core/tool/mbed/mbed-sdk/workspace_tools/synch.py
@@ -0,0 +1,373 @@
+"""
+mbed SDK
+Copyright (c) 2011-2013 ARM Limited
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
+
+One repository to update them all
+On mbed.org the mbed SDK is split up in multiple repositories, this script takes
+care of updating them all.
+"""
+import sys
+from copy import copy
+from os import walk, remove, makedirs
+from os.path import join, abspath, dirname, relpath, exists, isfile
+from shutil import copyfile
+from optparse import OptionParser
+import re
+import string
+
+ROOT = abspath(join(dirname(__file__), ".."))
+sys.path.insert(0, ROOT)
+
+from workspace_tools.settings import MBED_ORG_PATH, MBED_ORG_USER, BUILD_DIR
+from workspace_tools.paths import LIB_DIR
+from workspace_tools.utils import run_cmd
+
+MBED_URL = "mbed.org"
+MBED_USER = "mbed_official"
+
+changed = []
+push_remote = True
+quiet = False
+commit_msg = ''
+
+# Code that does have a mirror in the mbed SDK
+# Tuple data: (repo_name, list_of_code_dirs, [team])
+# team is optional - if not specified, the code is published under mbed_official
+OFFICIAL_CODE = (
+    ("mbed-src" , "mbed"),
+    ("mbed-rtos", "rtos"),
+    ("mbed-dsp" , "dsp"),
+    ("mbed-rpc" , "rpc"),
+
+    ("lwip"    , "net/lwip/lwip"),
+    ("lwip-sys", "net/lwip/lwip-sys"),
+    ("Socket"  , "net/lwip/Socket"),
+
+    ("lwip-eth"         , "net/eth/lwip-eth"),
+    ("EthernetInterface", "net/eth/EthernetInterface"),
+
+    ("USBDevice", "USBDevice"),
+    ("USBHost"  , "USBHost"),
+
+    ("CellularModem", "net/cellular/CellularModem"),
+    ("CellularUSBModem", "net/cellular/CellularUSBModem"),
+    ("UbloxUSBModem", "net/cellular/UbloxUSBModem"),
+    ("UbloxModemHTTPClientTest", ["tests/net/cellular/http/common", "tests/net/cellular/http/ubloxusb"]),
+    ("UbloxModemSMSTest", ["tests/net/cellular/sms/common", "tests/net/cellular/sms/ubloxusb"]),
+    ("FATFileSystem", "fs/fat", "mbed-official"),
+)
+
+
+# Code that does have dependencies to libraries should point to
+# the latest revision. By default, they point to a specific revision.
+CODE_WITH_DEPENDENCIES = (
+    # Libraries
+    "EthernetInterface",
+
+    # RTOS Examples
+    "rtos_basic",
+    "rtos_isr",
+    "rtos_mail",
+    "rtos_mutex",
+    "rtos_queue",
+    "rtos_semaphore",
+    "rtos_signals",
+    "rtos_timer",
+
+    # Net Examples
+    "TCPEchoClient",
+    "TCPEchoServer",
+    "TCPSocket_HelloWorld",
+    "UDPSocket_HelloWorld",
+    "UDPEchoClient",
+    "UDPEchoServer",
+    "BroadcastReceive",
+    "BroadcastSend",
+
+    # mbed sources
+    "mbed-src-program",
+)
+
+# A list of regular expressions that will be checked against each directory
+# name and skipped if they match.
+IGNORE_DIRS = (
+)
+
+IGNORE_FILES = (
+    'COPYING',
+    '\.md',
+    "\.lib",
+    "\.bld"
+)
+
+def ignore_path(name, reg_exps):
+    for r in reg_exps:
+        if re.search(r, name):
+            return True
+    return False
+
+class MbedRepository:
+    @staticmethod
+    def run_and_print(command, cwd):
+        stdout, _, _ = run_cmd(command, wd=cwd, redirect=True)
+        print(stdout)
+
+    def __init__(self, name, team = None):
+        self.name = name
+        self.path = join(MBED_ORG_PATH, name)
+        if team is None:
+            self.url = "http://" + MBED_URL + "/users/" + MBED_USER + "/code/%s/"
+        else:
+            self.url = "http://" + MBED_URL + "/teams/" + team + "/code/%s/"
+        if not exists(self.path):
+            # Checkout code
+            if not exists(MBED_ORG_PATH):
+                makedirs(MBED_ORG_PATH)
+
+            self.run_and_print(['hg', 'clone', self.url % name], cwd=MBED_ORG_PATH)
+
+        else:
+            # Update
+            self.run_and_print(['hg', 'pull'], cwd=self.path)
+            self.run_and_print(['hg', 'update'], cwd=self.path)
+
+    def publish(self):
+        # The maintainer has to evaluate the changes first and explicitly accept them
+        self.run_and_print(['hg', 'addremove'], cwd=self.path)
+        stdout, _, _ = run_cmd(['hg', 'status'], wd=self.path)
+        if stdout == '':
+            print "No changes"
+            return False
+        print stdout
+        if quiet:
+            commit = 'Y'
+        else:
+            commit = raw_input(push_remote and "Do you want to commit and push? Y/N: " or "Do you want to commit? Y/N: ")
+        if commit == 'Y':
+            args = ['hg', 'commit', '-u', MBED_ORG_USER]
+            if commit_msg:
+                args = args + ['-m', commit_msg]
+            self.run_and_print(args, cwd=self.path)
+            if push_remote:
+                self.run_and_print(['hg', 'push'], cwd=self.path)
+        return True
+
+# Check if a file is a text file or a binary file
+# Taken from http://code.activestate.com/recipes/173220/
+text_characters = "".join(map(chr, range(32, 127)) + list("\n\r\t\b"))
+_null_trans = string.maketrans("", "")
+def is_text_file(filename):
+    block_size = 1024
+    def istext(s):
+        if "\0" in s:
+            return 0
+
+        if not s:  # Empty files are considered text
+            return 1
+
+        # Get the non-text characters (maps a character to itself then
+        # use the 'remove' option to get rid of the text characters.)
+        t = s.translate(_null_trans, text_characters)
+
+        # If more than 30% non-text characters, then
+        # this is considered a binary file
+        if float(len(t))/len(s) > 0.30:
+            return 0
+        return 1
+    with open(filename) as f:
+        res = istext(f.read(block_size))
+    return res
+
+# Return the line ending type for the given file ('cr' or 'crlf')
+def get_line_endings(f):
+  examine_size = 1024
+  try:
+    tf = open(f, "rb")
+    lines, ncrlf = tf.readlines(examine_size), 0
+    tf.close()
+    for l in lines:
+      if l.endswith("\r\n"):
+        ncrlf = ncrlf + 1
+    return 'crlf' if ncrlf > len(lines) >> 1 else 'cr'
+  except:
+    return 'cr'
+
+# Copy file to destination, but preserve destination line endings if possible
+# This prevents very annoying issues with huge diffs that appear because of
+# differences in line endings
+def copy_with_line_endings(sdk_file, repo_file):
+    if not isfile(repo_file):
+        copyfile(sdk_file, repo_file)
+        return
+    is_text = is_text_file(repo_file)
+    if is_text:
+        sdk_le = get_line_endings(sdk_file)
+        repo_le = get_line_endings(repo_file)
+    if not is_text or sdk_le == repo_le:
+        copyfile(sdk_file, repo_file)
+    else:
+        print "Converting line endings in '%s' to '%s'" % (abspath(repo_file), repo_le)
+        f = open(sdk_file, "rb")
+        data = f.read()
+        f.close()
+        f = open(repo_file, "wb")
+        data = data.replace("\r\n", "\n") if repo_le == 'cr' else data.replace('\n','\r\n')
+        f.write(data)
+        f.close()
+
+def visit_files(path, visit):
+    for root, dirs, files in walk(path):
+        # Ignore hidden directories
+        for d in copy(dirs):
+            full = join(root, d)
+            if d.startswith('.'):
+                dirs.remove(d)
+            if ignore_path(full, IGNORE_DIRS):
+                print "Skipping '%s'" % full
+                dirs.remove(d)
+
+        for file in files:
+            if ignore_path(file, IGNORE_FILES):
+                continue
+
+            visit(join(root, file))
+
+
+def update_repo(repo_name, sdk_paths, team_name):
+    repo = MbedRepository(repo_name, team_name)
+    # copy files from mbed SDK to mbed_official repository
+    def visit_mbed_sdk(sdk_file):
+        repo_file = join(repo.path, relpath(sdk_file, sdk_path))
+
+        repo_dir = dirname(repo_file)
+        if not exists(repo_dir):
+            makedirs(repo_dir)
+
+        copy_with_line_endings(sdk_file, repo_file)
+    for sdk_path in sdk_paths:
+        visit_files(sdk_path, visit_mbed_sdk)
+
+    # remove repository files that do not exist in the mbed SDK
+    def visit_repo(repo_file):
+        for sdk_path in sdk_paths:
+            sdk_file = join(sdk_path, relpath(repo_file, repo.path))
+            if exists(sdk_file):
+                break
+        else:
+            remove(repo_file)
+            print "remove: %s" % repo_file
+    visit_files(repo.path, visit_repo)
+
+    if repo.publish():
+        changed.append(repo_name)
+
+
+def update_code(repositories):
+    for r in repositories:
+        repo_name, sdk_dir = r[0], r[1]
+        team_name = r[2] if len(r) == 3 else None
+        print '\n=== Updating "%s" ===' % repo_name
+        sdk_dirs = [sdk_dir] if type(sdk_dir) != type([]) else sdk_dir
+        sdk_path = [join(LIB_DIR, d) for d in sdk_dirs]
+        update_repo(repo_name, sdk_path, team_name)
+
+def update_single_repo(repo):
+    repos = [r for r in OFFICIAL_CODE if r[0] == repo]
+    if not repos:
+        print "Repository '%s' not found" % repo
+    else:
+        update_code(repos)
+
+def update_dependencies(repositories):
+    for repo_name in repositories:
+        print '\n=== Updating "%s" ===' % repo_name
+        repo = MbedRepository(repo_name)
+
+        # point to the latest libraries
+        def visit_repo(repo_file):
+            with open(repo_file, "r") as f:
+                url = f.read()
+            with open(repo_file, "w") as f:
+                f.write(url[:(url.rindex('/')+1)])
+        visit_files(repo.path, visit_repo, None, MBED_REPO_EXT)
+
+        if repo.publish():
+            changed.append(repo_name)
+
+
+def update_mbed():
+    update_repo("mbed", [join(BUILD_DIR, "mbed")], None)
+
+def do_sync(options):
+    global push_remote, quiet, commit_msg, changed
+
+    push_remote = not options.nopush
+    quiet = options.quiet
+    commit_msg = options.msg
+    chnaged = []
+
+    if options.code:
+        update_code(OFFICIAL_CODE)
+
+    if options.dependencies:
+        update_dependencies(CODE_WITH_DEPENDENCIES)
+
+    if options.mbed:
+        update_mbed()
+
+    if options.repo:
+        update_single_repo(options.repo)
+
+    if changed:
+        print "Repositories with changes:", changed
+
+    return changed
+
+if __name__ == '__main__':
+    parser = OptionParser()
+
+    parser.add_option("-c", "--code",
+                  action="store_true",  default=False,
+                  help="Update the mbed_official code")
+
+    parser.add_option("-d", "--dependencies",
+                  action="store_true",  default=False,
+                  help="Update the mbed_official code dependencies")
+
+    parser.add_option("-m", "--mbed",
+                  action="store_true",  default=False,
+                  help="Release a build of the mbed library")
+
+    parser.add_option("-n", "--nopush",
+                  action="store_true", default=False,
+                  help="Commit the changes locally only, don't push them")
+
+    parser.add_option("", "--commit_message",
+                  action="store", type="string", default='', dest='msg',
+                  help="Commit message to use for all the commits")
+
+    parser.add_option("-r", "--repository",
+                  action="store", type="string", default='', dest='repo',
+                  help="Synchronize only the given repository")
+
+    parser.add_option("-q", "--quiet",
+                  action="store_true", default=False,
+                  help="Don't ask for confirmation before commiting or pushing")
+
+    (options, args) = parser.parse_args()
+
+    do_sync(options)
+