Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(11)

Side by Side Diff: chrome/installer/installer.gyp

Issue 149422: Incorporate new Linux common files after deb packaging refactoring. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 { 1 {
2 'variables': { 2 'variables': {
3 'version_py': '../../chrome/tools/build/version.py', 3 'version_py': '../../chrome/tools/build/version.py',
4 'version_path': '../../chrome/VERSION', 4 'version_path': '../../chrome/VERSION',
5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE', 5 'lastchange_path': '<(SHARED_INTERMEDIATE_DIR)/build/LASTCHANGE',
6 # 'branding_dir' is set in the 'conditions' section at the bottom. 6 # 'branding_dir' is set in the 'conditions' section at the bottom.
7 }, 7 },
8 'includes': [ 8 'includes': [
9 '../../build/common.gypi', 9 '../../build/common.gypi',
10 ], 10 ],
(...skipping 15 matching lines...) Expand all
26 # Copy tools for generating packages from the build archive. 26 # Copy tools for generating packages from the build archive.
27 { 27 {
28 'destination': '<(PRODUCT_DIR)/installer/', 28 'destination': '<(PRODUCT_DIR)/installer/',
29 'files': [ 29 'files': [
30 'linux/internal/build_from_archive.sh', 30 'linux/internal/build_from_archive.sh',
31 ] 31 ]
32 }, 32 },
33 { 33 {
34 'destination': '<(PRODUCT_DIR)/installer/debian/', 34 'destination': '<(PRODUCT_DIR)/installer/debian/',
35 'files': [ 35 'files': [
36 'linux/internal/debian/build.sh',
36 'linux/internal/debian/changelog.template', 37 'linux/internal/debian/changelog.template',
38 'linux/internal/debian/control.template',
37 'linux/internal/debian/postinst', 39 'linux/internal/debian/postinst',
38 'linux/internal/debian/postrm', 40 'linux/internal/debian/postrm',
39 'linux/internal/debian/prerm', 41 'linux/internal/debian/prerm',
40 'linux/internal/debian/build.sh',
41 'linux/internal/debian/control.template',
42 ] 42 ]
43 }, 43 },
44 { 44 {
45 'destination': '<(PRODUCT_DIR)/installer/common/', 45 'destination': '<(PRODUCT_DIR)/installer/common/',
46 'files': [ 46 'files': [
47 'linux/internal/common/apt.include', 47 'linux/internal/common/apt.include',
48 'linux/internal/common/repo.cron',
49 'linux/internal/common/wrapper',
50 'linux/internal/common/updater',
51 'linux/internal/common/desktop.template', 48 'linux/internal/common/desktop.template',
52 'linux/internal/common/google-chrome/google-chrome.info', 49 'linux/internal/common/google-chrome/google-chrome.info',
50 'linux/internal/common/installer.include',
51 'linux/internal/common/postinst.include',
52 'linux/internal/common/prerm.include',
53 'linux/internal/common/repo.cron',
54 'linux/internal/common/updater',
55 'linux/internal/common/wrapper',
53 ] 56 ]
54 }, 57 },
55 # System libs needed for 64-bit package building. 58 # System libs needed for 64-bit package building.
56 { 59 {
57 'destination': '<(PRODUCT_DIR)/installer/lib32/', 60 'destination': '<(PRODUCT_DIR)/installer/lib32/',
58 'files': [ 61 'files': [
59 '/usr/<(lib32_dir)/libsqlite3.so.0', 62 '/usr/<(lib32_dir)/libsqlite3.so.0',
60 '/usr/<(lib32_dir)/libsqlite3.so.0.8.6', 63 '/usr/<(lib32_dir)/libsqlite3.so.0.8.6',
61 '/usr/<(lib32_dir)/libnspr4.so.0d', 64 '/usr/<(lib32_dir)/libnspr4.so.0d',
62 '/usr/<(lib32_dir)/libplds4.so.0d', 65 '/usr/<(lib32_dir)/libplds4.so.0d',
(...skipping 411 matching lines...) Expand 10 before | Expand all | Expand 10 after
474 'variables': { 477 'variables': {
475 'branding_dir': '../app/theme/google_chrome', 478 'branding_dir': '../app/theme/google_chrome',
476 }, 479 },
477 }, { # else branding!="Chrome" 480 }, { # else branding!="Chrome"
478 'variables': { 481 'variables': {
479 'branding_dir': '../app/theme/chromium', 482 'branding_dir': '../app/theme/chromium',
480 }, 483 },
481 }], 484 }],
482 ], 485 ],
483 } 486 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698