summaryrefslogtreecommitdiffstats
path: root/chrome/installer
diff options
context:
space:
mode:
authormmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-30 19:02:49 +0000
committermmoss@chromium.org <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-30 19:02:49 +0000
commita7fce62c5a1fc69515ce4d7b513df411bd611d51 (patch)
tree542ee2d4a4dd498483257d59cfa8f99fce47d8d7 /chrome/installer
parentdb190487d2bc37ef9a2852d948bd8dd4548a98bd (diff)
downloadchromium_src-a7fce62c5a1fc69515ce4d7b513df411bd611d51.zip
chromium_src-a7fce62c5a1fc69515ce4d7b513df411bd611d51.tar.gz
chromium_src-a7fce62c5a1fc69515ce4d7b513df411bd611d51.tar.bz2
More complete 'inputs' for Linux packaging targets.
Review URL: http://codereview.chromium.org/159644 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22077 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer')
-rw-r--r--chrome/installer/installer.gyp23
1 files changed, 19 insertions, 4 deletions
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp
index 5004e60..53f8885 100644
--- a/chrome/installer/installer.gyp
+++ b/chrome/installer/installer.gyp
@@ -490,6 +490,19 @@
'variables': {
'version' : '<!(echo -n "@MAJOR@.@MINOR@.@BUILD@.@PATCH@" | <(version_py) -f ../../chrome/VERSION /dev/stdin)',
'revision' : '<!(python ../../build/util/lastchange.py | cut -d "=" -f 2)',
+ 'input_files': [
+ # TODO(mmoss) Any convenient way to get all the relevant build
+ # files? (e.g. all locales, resources, etc.)
+ '<(PRODUCT_DIR)/chrome',
+ '<(PRODUCT_DIR)/chrome.pak',
+ '<(PRODUCT_DIR)/chrome_sandbox',
+ '<(PRODUCT_DIR)/libavcodec.so.52',
+ '<(PRODUCT_DIR)/libavformat.so.52',
+ '<(PRODUCT_DIR)/libavutil.so.50',
+ '<(PRODUCT_DIR)/xdg-settings',
+ '<(PRODUCT_DIR)/locales/en-US.pak',
+ '<(PRODUCT_DIR)/themes/default.pak',
+ ],
},
'actions': [
{
@@ -497,7 +510,7 @@
'process_outputs_as_sources': 1,
'inputs': [
'<(PRODUCT_DIR)/installer/debian/build.sh',
- # TODO Add all the build archive files. Share this with stage_build.py somehow?
+ '<@(input_files)',
],
'outputs': [
'<(PRODUCT_DIR)/google-chrome-unstable_<(version)-r<(revision)_i386.deb',
@@ -505,7 +518,8 @@
# TODO(mmoss) Add other outputs once we start building other channels.
],
'action': [
- 'bash', '<(_inputs)', '-o' '<(PRODUCT_DIR)', '-b', '<(PRODUCT_DIR)', '-c', 'dev',
+ 'bash', '<(PRODUCT_DIR)/installer/debian/build.sh', '-o'
+ '<(PRODUCT_DIR)', '-b', '<(PRODUCT_DIR)', '-c', 'dev',
],
},
{
@@ -513,14 +527,15 @@
'process_outputs_as_sources': 1,
'inputs': [
'<(PRODUCT_DIR)/installer/rpm/build.sh',
- # TODO Add all the build archive files. Share this with stage_build.py somehow?
+ '<@(input_files)',
],
'outputs': [
'<(PRODUCT_DIR)/google-chrome-unstable-<(version)-<(revision).i386.rpm',
# TODO(mmoss) Add other outputs once we start building other channels.
],
'action': [
- 'bash', '<(_inputs)', '-o' '<(PRODUCT_DIR)', '-b', '<(PRODUCT_DIR)', '-c', 'dev',
+ 'bash', '<(PRODUCT_DIR)/installer/rpm/build.sh', '-o'
+ '<(PRODUCT_DIR)', '-b', '<(PRODUCT_DIR)', '-c', 'dev',
],
},
],