summaryrefslogtreecommitdiffstats
path: root/remoting/webapp
diff options
context:
space:
mode:
authordmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-11 04:17:36 +0000
committerdmaclach@chromium.org <dmaclach@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-11 04:17:36 +0000
commit8164ae1c8061f04a3da53ee01e7134ab540db66a (patch)
tree3108efb48a857a7fe2cbbdf37ab0a1e75ad31856 /remoting/webapp
parentbb22dd5adfcd59c9d73417e3a826cd419a6c81a3 (diff)
downloadchromium_src-8164ae1c8061f04a3da53ee01e7134ab540db66a.zip
chromium_src-8164ae1c8061f04a3da53ee01e7134ab540db66a.tar.gz
chromium_src-8164ae1c8061f04a3da53ee01e7134ab540db66a.tar.bz2
Revert 84923 - Build a "real" webapp deliverable and add plugin to it.
BUG=NONE TEST=BUILD Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=84843 Review URL: http://codereview.chromium.org/6998009 TBR=dmaclach@chromium.org Review URL: http://codereview.chromium.org/7001021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84927 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/webapp')
-rw-r--r--remoting/webapp/build-webapp.py54
-rw-r--r--remoting/webapp/me2mom/manifest.json (renamed from remoting/webapp/me2mom/manifest.json.template)7
2 files changed, 2 insertions, 59 deletions
diff --git a/remoting/webapp/build-webapp.py b/remoting/webapp/build-webapp.py
deleted file mode 100644
index bac6712..0000000
--- a/remoting/webapp/build-webapp.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/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.
-
-# Copies the remoting webapp resources and host plugin into a single directory.
-
-import os
-import shutil
-import sys
-
-# Do not copy git and svn files into the build.
-IGNORE_PATTERNS = ('.git', '.svn')
-
-if len(sys.argv) != 4:
- print 'Usage: build-webapp.py <webapp-resource-dir> <host-plugin> <dst>'
- sys.exit(1)
-
-resources = sys.argv[1]
-plugin = sys.argv[2]
-destination = sys.argv[3]
-
-try:
- shutil.rmtree(destination)
-except OSError:
- if os.path.exists(destination):
- raise
- else:
- pass
-
-shutil.copytree(resources,
- destination,
- ignore=shutil.ignore_patterns(*IGNORE_PATTERNS))
-pluginName = os.path.basename(plugin)
-newPluginPath = os.path.join(destination, pluginName)
-
-# On Mac we have a directory
-if os.path.isdir(plugin):
- shutil.copytree(plugin,
- newPluginPath,
- ignore=shutil.ignore_patterns(*IGNORE_PATTERNS))
-else:
- shutil.copy2(plugin, newPluginPath)
-
-# Now massage the manifest to the right plugin name
-templatePath = os.path.join(destination, 'manifest.json.template')
-manifestPath = os.path.join(destination, 'manifest.json')
-input = open(templatePath)
-output = open(manifestPath, 'w')
-for s in input:
- output.write(s.replace('HOST_PLUGIN_NAME', pluginName))
-input.close()
-output.close()
-os.remove(templatePath)
diff --git a/remoting/webapp/me2mom/manifest.json.template b/remoting/webapp/me2mom/manifest.json
index 83ecdac..9fd63edb 100644
--- a/remoting/webapp/me2mom/manifest.json.template
+++ b/remoting/webapp/me2mom/manifest.json
@@ -1,5 +1,5 @@
{
- "name": "Remoting Me2Mom",
+ "name": "Chromoting Me2Mom",
"version": "1.0",
"description": "Me2Mom-style remote support in Chrome.",
"app": {
@@ -8,9 +8,6 @@
}
},
"icons": {
- "128": "chromoting128.png"
+ "128": "chromoting128.png"
}
- "plugins": [
- { "path": "HOST_PLUGIN_NAME" },
- ],
}