diff options
author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-27 02:22:31 +0000 |
---|---|---|
committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-27 02:22:31 +0000 |
commit | 373cc4dbb4207764127028e2a50be737f50afba5 (patch) | |
tree | 606fb9c46d68b7ec2f317f190eaf6dd1afd91984 | |
parent | a2ded3c88ac87b3902fa177c96575118fcd3ec4c (diff) | |
download | chromium_src-373cc4dbb4207764127028e2a50be737f50afba5.zip chromium_src-373cc4dbb4207764127028e2a50be737f50afba5.tar.gz chromium_src-373cc4dbb4207764127028e2a50be737f50afba5.tar.bz2 |
Basic Debian packaging for Linux Me2Me host
This facilitates building a Debian package, currently for Ubuntu 10.04. This is based on work by benley@ and jamiewalch@ (http://codereview.chromium.org/10800099/)
TODO:
* Allow building packages for other versions of Ubuntu (maybe detect the current build platform and use that)
* Integrate better with gyp, instead of hard-coding out/Release and manually supplying version_full to the script.
* Add man-page for me2me_virtual_host
* Use separate staging area for the debian/ build directory, instead of polluting the source tree.
BUG=131245
TEST=
Review URL: https://chromiumcodereview.appspot.com/10821028
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148701 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | remoting/host/installer/linux/Makefile | 29 | ||||
-rwxr-xr-x | remoting/host/installer/linux/build-deb.sh | 21 | ||||
-rw-r--r-- | remoting/host/installer/linux/debian/compat | 1 | ||||
-rw-r--r-- | remoting/host/installer/linux/debian/control | 19 | ||||
-rw-r--r-- | remoting/host/installer/linux/debian/copyright | 1 | ||||
-rwxr-xr-x | remoting/host/installer/linux/debian/rules | 8 | ||||
-rw-r--r-- | remoting/tools/keygen.py | 3 | ||||
-rwxr-xr-x | remoting/tools/me2me_virtual_host.py | 4 |
8 files changed, 84 insertions, 2 deletions
diff --git a/remoting/host/installer/linux/Makefile b/remoting/host/installer/linux/Makefile new file mode 100644 index 0000000..375e575 --- /dev/null +++ b/remoting/host/installer/linux/Makefile @@ -0,0 +1,29 @@ +# 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. + +# This Makefile is used by debhelper, which supplies the appropriate value of +# variables not defined here, such as DESTDIR. + +SRC = ../../../.. +TOOLS = $(SRC)/remoting/tools +RELEASE = $(SRC)/out/Release + +BIN = $(DESTDIR)/usr/bin +LIB = $(DESTDIR)/usr/lib/chrome-remote-desktop +SHARE = $(DESTDIR)/usr/share/chrome-remote-desktop + +all: + +# TODO(lambroslambrou): Decide what to do about bundling Xvfb-randr. +# For now, treat it as if it were a build artifact from the Chrome tree, and +# pull it from $(RELEASE). +install: + install -d $(BIN) $(LIB) $(SHARE) + install $(TOOLS)/me2me_virtual_host.py -m 0755 \ + $(BIN)/me2me_virtual_host + install $(TOOLS)/gaia_auth.py -m 0644 $(SHARE) + install $(TOOLS)/keygen.py -m 0644 $(SHARE) + install $(RELEASE)/Xvfb-randr -m 0755 $(BIN) + install $(RELEASE)/remoting_host_keygen -m 0755 $(LIB) + install $(RELEASE)/remoting_me2me_host -m 0755 $(LIB) diff --git a/remoting/host/installer/linux/build-deb.sh b/remoting/host/installer/linux/build-deb.sh new file mode 100755 index 0000000..5204776 --- /dev/null +++ b/remoting/host/installer/linux/build-deb.sh @@ -0,0 +1,21 @@ +#!/bin/bash -e + +# 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. + +if [[ -z "$version_full" ]]; then + echo 'Error: $version_full not set' + exit 1 +fi + +# Create a fresh debian/changelog. +export DEBEMAIL="The Chromium Authors <chromium-dev@chromium.org>" +rm -f debian/changelog +debchange --create \ + --package chrome-remote-desktop \ + --distribution lucid \ + --newversion "$version_full" \ + "New Debian package" + +dpkg-buildpackage -b -us -uc diff --git a/remoting/host/installer/linux/debian/compat b/remoting/host/installer/linux/debian/compat new file mode 100644 index 0000000..7f8f011 --- /dev/null +++ b/remoting/host/installer/linux/debian/compat @@ -0,0 +1 @@ +7 diff --git a/remoting/host/installer/linux/debian/control b/remoting/host/installer/linux/debian/control new file mode 100644 index 0000000..eeadea0 --- /dev/null +++ b/remoting/host/installer/linux/debian/control @@ -0,0 +1,19 @@ +# 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. + +Source: chrome-remote-desktop +Section: net +Priority: optional +Maintainer: The Chromium Authors <chromium-dev@chromium.org> +Build-Depends: debhelper (>= 7.0.0) +Standards-Version: 3.9.2 +Homepage: https://chrome.google.com/remotedesktop + +Package: chrome-remote-desktop +Architecture: any +Depends: python (>= 2.6), ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Suggests: google-chrome-stable | google-chrome-beta | google-chrome-unstable +Description: Access your computer securely over the Internet. + Chrome Remote Desktop allows you to securely access your computer remotely + through the Chrome browser or a Chromebook. diff --git a/remoting/host/installer/linux/debian/copyright b/remoting/host/installer/linux/debian/copyright new file mode 100644 index 0000000..b098398 --- /dev/null +++ b/remoting/host/installer/linux/debian/copyright @@ -0,0 +1 @@ +Copyright (c) 2012 The Chromium Authors. All rights reserved. diff --git a/remoting/host/installer/linux/debian/rules b/remoting/host/installer/linux/debian/rules new file mode 100755 index 0000000..d96aff9 --- /dev/null +++ b/remoting/host/installer/linux/debian/rules @@ -0,0 +1,8 @@ +#!/usr/bin/make -f + +# 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. + +%: + dh $@ diff --git a/remoting/tools/keygen.py b/remoting/tools/keygen.py index 482aeca..d7e5d58 100644 --- a/remoting/tools/keygen.py +++ b/remoting/tools/keygen.py @@ -18,7 +18,8 @@ _EXE_PATHS_TO_TRY = [ '../../xcodebuild/Debug', '../../xcodebuild/Release', '../../out/Debug', - '../../out/Release'] + '../../out/Release', + '/usr/lib/chrome-remote-desktop'] def locate_executable(exe_name): diff --git a/remoting/tools/me2me_virtual_host.py b/remoting/tools/me2me_virtual_host.py index 2b537b6..3409242 100755 --- a/remoting/tools/me2me_virtual_host.py +++ b/remoting/tools/me2me_virtual_host.py @@ -30,6 +30,7 @@ import urllib2 import uuid # Local modules +sys.path.insert(0, "/usr/share/chrome-remote-desktop") import gaia_auth import keygen @@ -58,7 +59,8 @@ else: EXE_PATHS_TO_TRY = [ ".", "../../out/Debug", - "../../out/Release" + "../../out/Release", + "/usr/lib/chrome-remote-desktop", ] CONFIG_DIR = os.path.expanduser("~/.config/chrome-remote-desktop") |