Copy Linux me2me script to output dir for GN builds

remoting/host/linux/linux_me2me_host.py

 #!/usr/bin/python
 # Copyright (c) 2012 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.
 
 # Virtual Me2Me implementation.  This script runs and manages the processes
 # required for a Virtual Me2Me desktop, which are: X server, X desktop
 # session, and Host process.
 # This script is intended to run continuously as a background daemon
 # process, running under an ordinary (non-root) user account.
@@ skipping 37 matching lines @@
 # defaults can be overridden in ~/.profile.
 DEFAULT_SIZES = "1600x1200,3840x2560"
 
 # If RANDR is not available, use a smaller default size. Only a single
 # resolution is supported in this case.
 DEFAULT_SIZE_NO_RANDR = "1600x1200"
 
 SCRIPT_PATH = os.path.abspath(sys.argv[0])
 SCRIPT_DIR = os.path.dirname(SCRIPT_PATH)
 
-IS_INSTALLED = (os.path.basename(sys.argv[0]) != 'linux_me2me_host.py')
-
-if IS_INSTALLED:
-  HOST_BINARY_NAME = "chrome-remote-desktop-host"
-else:
-  HOST_BINARY_NAME = "remoting_me2me_host"
-
+HOST_BINARY_NAME = "chrome-remote-desktop-host"
 CHROME_REMOTING_GROUP_NAME = "chrome-remote-desktop"
 
 HOME_DIR = os.environ["HOME"]
 CONFIG_DIR = os.path.join(HOME_DIR, ".config/chrome-remote-desktop")
 SESSION_FILE_PATH = os.path.join(HOME_DIR, ".chrome-remote-desktop-session")
 SYSTEM_SESSION_FILE_PATH = "/etc/chrome-remote-desktop-session"
 
 X_LOCK_FILE_TEMPLATE = "/tmp/.X%d-lock"
 FIRST_X_DISPLAY_NUMBER = 20
 
@@ skipping 23 matching lines @@
     return True
 
   # The host has been tested only on Ubuntu.
   distribution = platform.linux_distribution()
   return (distribution[0]).lower() == 'ubuntu'
 
 
 def get_randr_supporting_x_server():
   """Returns a path to an X server that supports the RANDR extension, if this
   is found on the system. Otherwise returns None."""
-  try:
-    xvfb = "/usr/bin/Xvfb-randr"
-    if not os.path.exists(xvfb):
-      xvfb = locate_executable("Xvfb-randr")
+
+  xvfb = "/usr/bin/Xvfb-randr"
+  if os.path.exists(xvfb):
     return xvfb
-  except Exception:
-    return None
+
+  xvfb = os.path.join(SCRIPT_DIR, "Xvfb-randr")
+  if os.path.exists(xvfb):
+    return xvfb
 

[Sergey Ulanov, 2016/04/18 23:58:36]

add return None here. get() function without return at the end looks strange.

[Lambros, 2016/04/19 01:51:29]

Done.

 
 class Config:
   def __init__(self, path):
     self.path = path
     self.data = {}
     self.changed = False
 
   def load(self):
     """Loads the config from file.
 
@@ skipping 364 matching lines @@
 
   def launch_session(self, x_args):
     self._init_child_env()
     self._setup_pulseaudio()
     self._setup_gnubby()
     self._launch_x_server(x_args)
     self._launch_x_session()
 
   def launch_host(self, host_config):
     # Start remoting host
-    args = [locate_executable(HOST_BINARY_NAME), "--host-config=-"]
+    host_path = os.path.join(SCRIPT_DIR, HOST_BINARY_NAME)
+    args = [host_path, "--host-config=-"]
     if self.pulseaudio_pipe:
       args.append("--audio-pipe-name=%s" % self.pulseaudio_pipe)
     if self.server_supports_exact_resize:
       args.append("--server-supports-exact-resize")
     if self.ssh_auth_sockname:
       args.append("--ssh-auth-sockname=%s" % self.ssh_auth_sockname)
 
     # Have the host process use SIGUSR1 to signal a successful start.
     def sigusr1_handler(signum, frame):
       _ = signum, frame
       logging.info("Host ready to receive connections.")
       self.host_ready = True
       if (ParentProcessLogger.instance() and
           False not in [desktop.host_ready for desktop in g_desktops]):
         ParentProcessLogger.instance().release_parent(True)
 
     signal.signal(signal.SIGUSR1, sigusr1_handler)
     args.append("--signal-parent")
 
+    logging.info(args)
     self.host_proc = subprocess.Popen(args, env=self.child_env,
                                       stdin=subprocess.PIPE)
-    logging.info(args)
     if not self.host_proc.pid:
       raise Exception("Could not start Chrome Remote Desktop host")
 
     try:
       self.host_proc.stdin.write(json.dumps(host_config.data).encode('UTF-8'))
       self.host_proc.stdin.flush()
     except IOError as e:
       # This can occur in rare situations, for example, if the machine is
       # heavily loaded and the host process dies quickly (maybe if the X
       # connection failed), the host process might be gone before this code
@@ skipping 90 matching lines @@
         # corrupt displays).  So if the ubuntu-2d session is available,
         # choose it explicitly.
         return [session_wrapper, "/usr/bin/gnome-session --session=ubuntu-2d"]
       else:
         # Use the session wrapper by itself, and let the system choose a
         # session.
         return [session_wrapper]
   return None
 
 
-def locate_executable(exe_name):
-  if IS_INSTALLED:
-    # If the script is running from its installed location, search the host
-    # binary only in the same directory.
-    paths_to_try = [ SCRIPT_DIR ]
-  else:
-    paths_to_try = map(lambda p: os.path.join(SCRIPT_DIR, p),
-                       [".",
-                        "../../../out/Debug",
-                        "../../../out/Default",
-                        "../../../out/Release"])
-  for path in paths_to_try:
-    exe_path = os.path.join(path, exe_name)
-    if os.path.exists(exe_path):
-      return exe_path
-
-  raise Exception("Could not locate executable '%s'" % exe_name)
-
-
 class ParentProcessLogger(object):
   """Redirects logs to the parent process, until the host is ready or quits.
 
   This class creates a pipe to allow logging from the daemon process to be
   copied to the parent process. The daemon process adds a log-handler that
   directs logging output to the pipe. The parent process reads from this pipe
   until and writes the content to stderr.  When the pipe is no longer needed
   (for example, the host signals successful launch or permanent failure), the
   daemon removes the log-handler and closes the pipe, causing the the parent
   process to reach end-of-file while reading the pipe and exit.
@@ skipping 521 matching lines @@
       subprocess.check_call(["/usr/sbin/groupadd", "-f",
                              CHROME_REMOTING_GROUP_NAME])
       subprocess.check_call(["/usr/bin/gpasswd", "--add", user,
                              CHROME_REMOTING_GROUP_NAME])
     except (ValueError, OSError, subprocess.CalledProcessError) as e:
       logging.error("Command failed: " + str(e))
       return 1
 
     return 0
 
   if options.host_version:

[Sergey Ulanov, 2016/04/18 23:58:36]

I don't think we need this flag anymore (it was useful with NPAPI plugin, but
not with native messaging). Maybe just remove it?

BTW, it's also broken in current builds 

$ /opt/google/chrome-remote-desktop/chrome-remote-desktop-host --version
VERSION
$ /opt/google/chrome-remote-desktop/chrome-remote-desktop --host-version
VERSION

:-(

[Lambros, 2016/04/19 01:51:29]

Flag removed in https://codereview.chromium.org/1899093002/

     # TODO(sergeyu): Also check RPM package version once we add RPM package.
-    return os.system(locate_executable(HOST_BINARY_NAME) + " --version") >> 8
+    host_path = os.path.join(SCRIPT_DIR, HOST_BINARY_NAME)

[Sergey Ulanov, 2016/04/18 23:58:36]

If we still need the flag, then this expression is duplicated in two places. Add
HOST_BINARY_PATH after HOST_BINARY_NAME?

[Lambros, 2016/04/19 01:51:29]

Acknowledged.

+    return os.system(host_path + " --version") >> 8
 
   if options.watch_resolution:
     watch_for_resolution_changes(options.watch_resolution)
     return 0
 
   if not options.start:
     # If no modal command-line options specified, print an error and exit.
     print(EPILOG, file=sys.stderr)
     return 1
 
@@ skipping 193 matching lines @@
         else:
           logging.info("Host exited with status %s." % os.WEXITSTATUS(status))
       elif os.WIFSIGNALED(status):
         logging.info("Host terminated by signal %s." % os.WTERMSIG(status))
 
 
 if __name__ == "__main__":
   logging.basicConfig(level=logging.DEBUG,
                       format="%(asctime)s:%(levelname)s:%(message)s")
   sys.exit(main())