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

Side by Side Diff: gears/SConscript

Issue 16586: Update Gears to r3147, and fix scons build to match. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 11 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 | « gears/DEPS ('k') | gears/SConscript.browser » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2008 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2008 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # Notes: 5 # Notes:
6 # This is the main Gears SConscript file. From here, we include sub-scripts 6 # This is the main Gears SConscript file. From here, we include sub-scripts
7 # that handle building various targets (third party libs, common exes, the 7 # that handle building various targets (third party libs, common exes, the
8 # browser plugins themselves, and installers). Some sub-scripts return a 8 # browser plugins themselves, and installers). Some sub-scripts return a
9 # dictionary of variables to be appended to the environment, so other 9 # dictionary of variables to be appended to the environment, so other
10 # sub-scripts can use them. 10 # sub-scripts can use them.
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 vars.Update(env) 89 vars.Update(env)
90 90
91 env.Replace( 91 env.Replace(
92 USING_CCTESTS = (env['MODE'] == 'dbg' or not env['OFFICIAL_BUILD']) 92 USING_CCTESTS = (env['MODE'] == 'dbg' or not env['OFFICIAL_BUILD'])
93 ) 93 )
94 94
95 # Version 95 # Version
96 env.Replace( 96 env.Replace(
97 MAJOR = '0', 97 MAJOR = '0',
98 MINOR = '5', 98 MINOR = '5',
99 BUILD = '2', 99 BUILD = '7',
100 PATCH = '6', 100 PATCH = '0',
101 VERSION = '${MAJOR}.${MINOR}.${BUILD}.${PATCH}', 101 VERSION = '${MAJOR}.${MINOR}.${BUILD}.${PATCH}',
102 102
103 FRIENDLY_NAME = 'Google Gears', 103 FRIENDLY_NAME = 'Google Gears',
104 SHORT_NAME = 'gears', 104 SHORT_NAME = 'gears',
105 ) 105 )
106 106
107 # Platform 107 # Platform
108 # TODO: Symbian builds will override this value. 108 # TODO: Symbian builds will override this value.
109 # For other platforms we set just one value. 109 # For other platforms we set just one value.
110 if env['OS'] in ['wince', 'android']: 110 if env['OS'] in ['wince', 'android']:
(...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 env.Append( 343 env.Append(
344 CPPDEFINES = 'USING_CCTESTS=1', 344 CPPDEFINES = 'USING_CCTESTS=1',
345 M4FLAGS = '-DUSING_CCTESTS=1', 345 M4FLAGS = '-DUSING_CCTESTS=1',
346 ) 346 )
347 if env['OFFICIAL_BUILD']: 347 if env['OFFICIAL_BUILD']:
348 env.Append( 348 env.Append(
349 CPPDEFINES = 'OFFICIAL_BUILD=1', 349 CPPDEFINES = 'OFFICIAL_BUILD=1',
350 M4FLAGS = '-DOFFICIAL_BUILD=1', 350 M4FLAGS = '-DOFFICIAL_BUILD=1',
351 ) 351 )
352 352
353 # TODO: if USING_PNG 353 # TODO: if USING_LIBPNG
354 env.Append(CPPDEFINES = 'PNG_USER_CONFIG') 354 env.Append(
355 CPPDEFINES = [
356 'PNG_USER_CONFIG',
357 'CHROME_PNG_WRITE_SUPPORT',
358 'GEARS_PNG_BUILD',
359 ]
360 )
355 # TODO: if USING_ZLIB 361 # TODO: if USING_ZLIB
356 env.Append( 362 env.Append(
357 CPPDEFINES = [ 363 CPPDEFINES = [
358 'NO_GZIP', 364 'NO_GZIP',
359 'NO_GZCOMPRESS', 365 'NO_GZCOMPRESS',
360 ] 366 ]
361 ) 367 )
362 if env['OS'] == 'wince': 368 if env['OS'] == 'wince':
363 env.Append(CPPDEFINES = 'NO_ERRNO_H') 369 env.Append(CPPDEFINES = 'NO_ERRNO_H')
364 370
(...skipping 267 matching lines...) Expand 10 before | Expand all | Expand 10 after
632 ], 638 ],
633 COMMON_LINKFLAGS = [ 639 COMMON_LINKFLAGS = [
634 '-fPIC', 640 '-fPIC',
635 '-Bsymbolic', 641 '-Bsymbolic',
636 '-pthread', 642 '-pthread',
637 ], 643 ],
638 SHLINKFLAGS = [ 644 SHLINKFLAGS = [
639 '-shared', 645 '-shared',
640 '-Wl,--version-script', 646 '-Wl,--version-script',
641 '-Wl,$OPEN_DIR/tools/xpcom-ld-script', 647 '-Wl,$OPEN_DIR/tools/xpcom-ld-script',
642 # for PortAudio: need pthread and math
643 '-lpthread',
644 '-lm',
645 # Additions to compile on hardy 648 # Additions to compile on hardy
646 '-m32', 649 '-m32',
647 ], 650 ],
648 ) 651 )
649 if env['MODE'] == 'dbg': 652 if env['MODE'] == 'dbg':
650 env.Append( 653 env.Append(
651 CPPFLAGS = [ 654 CPPFLAGS = [
652 '-g', 655 '-g',
653 '-O0', 656 '-O0',
654 ], 657 ],
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
738 '-DGEARS_PLUGIN_PATH="$SF_PLUGIN_PROXY_BUNDLE"', 741 '-DGEARS_PLUGIN_PATH="$SF_PLUGIN_PROXY_BUNDLE"',
739 '-DGEARS_INSTALLER_OUT_DIR="$INSTALLER_OUTDIR/Safari"', 742 '-DGEARS_INSTALLER_OUT_DIR="$INSTALLER_OUTDIR/Safari"',
740 743
741 # Keystone 744 # Keystone
742 '-DKEYSTONE_BASE_DIR="$MAIN_DIR/$PRIVATE_THIRD_PARTY_DIR/googlemac/Rel eases/Keystone/"', 745 '-DKEYSTONE_BASE_DIR="$MAIN_DIR/$PRIVATE_THIRD_PARTY_DIR/googlemac/Rel eases/Keystone/"',
743 '-DGEARS_INSTALLER_PACKAGE="$SF_INSTALLER_PKG"', 746 '-DGEARS_INSTALLER_PACKAGE="$SF_INSTALLER_PKG"',
744 '-DGEARS_GENFILES_DIR="$SF_OUTDIR/genfiles"', 747 '-DGEARS_GENFILES_DIR="$SF_OUTDIR/genfiles"',
745 '-DGEARS_TOOLS_DIR="$MAIN_DIR/$PRIVATE_DIR/tools"', 748 '-DGEARS_TOOLS_DIR="$MAIN_DIR/$PRIVATE_DIR/tools"',
746 ], 749 ],
747 ) 750 )
748 if not env['OFFICIAL_BUILD']:
749 # For PortAudio:
750 env.Append(FRAMEWORKS = [
751 'CoreAudio',
752 'AudioToolbox',
753 'AudioUnit',
754 ])
755 if env['MODE'] == 'dbg': 751 if env['MODE'] == 'dbg':
756 env.Append( 752 env.Append(
757 CPPFLAGS = [ 753 CPPFLAGS = [
758 '-g', 754 '-g',
759 '-O0', 755 '-O0',
760 ], 756 ],
761 ) 757 )
762 else: # MODE=opt 758 else: # MODE=opt
763 env.Append( 759 env.Append(
764 CPPFLAGS = [ 760 CPPFLAGS = [
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
923 919
924 sconscripts = [ 920 sconscripts = [
925 'SConscript.googleurl', 921 'SConscript.googleurl',
926 'SConscript.libjpeg', 922 'SConscript.libjpeg',
927 'SConscript.libpng', 923 'SConscript.libpng',
928 'SConscript.libmozjs', 924 'SConscript.libmozjs',
929 'SConscript.sqlite', 925 'SConscript.sqlite',
930 'SConscript.zlib', 926 'SConscript.zlib',
931 'SConscript.libbreakpad_osx', 927 'SConscript.libbreakpad_osx',
932 'SConscript.libgd', 928 'SConscript.libgd',
933 'SConscript.portaudio',
934 ] 929 ]
935 930
936 for each in sconscripts: 931 for each in sconscripts:
937 env.SConscript(each, 932 env.SConscript(each,
938 exports=['env'], 933 exports=['env'],
939 variant_dir='$COMMON_OUTDIR', 934 variant_dir='$COMMON_OUTDIR',
940 duplicate=0) 935 duplicate=0)
941 936
942 # Order of execution is important here. Each sub-script adds to the 937 # Order of execution is important here. Each sub-script adds to the
943 # environment, for use by later scripts. 938 # environment, for use by later scripts.
(...skipping 25 matching lines...) Expand all
969 env.Append(**browser_outputs) 964 env.Append(**browser_outputs)
970 965
971 # Note: even though the installers write to $INSTALLER_OUTDIR, they need to 966 # Note: even though the installers write to $INSTALLER_OUTDIR, they need to
972 # read files from other dirs, so we give them a variant_dir at the toplevel. 967 # read files from other dirs, so we give them a variant_dir at the toplevel.
973 env.SConscript('SConscript.installers', 968 env.SConscript('SConscript.installers',
974 exports=['env'], 969 exports=['env'],
975 variant_dir='$BASE_OUTDIR', 970 variant_dir='$BASE_OUTDIR',
976 duplicate=0) 971 duplicate=0)
977 972
978 env.Alias('gears-installers', 'gears') 973 env.Alias('gears-installers', 'gears')
OLDNEW
« no previous file with comments | « gears/DEPS ('k') | gears/SConscript.browser » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698