summaryrefslogtreecommitdiffstats
path: root/gears
diff options
context:
space:
mode:
authormpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-31 23:55:17 +0000
committermpcomplete@google.com <mpcomplete@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-10-31 23:55:17 +0000
commit5affc15f3a8a51f42debbf37806087dfbc84818f (patch)
tree3026d88cfe779989c9437bd01acb21042538b13c /gears
parente8d2a6a661bdcb16dad07df9159bb29bed84c8d1 (diff)
downloadchromium_src-5affc15f3a8a51f42debbf37806087dfbc84818f.zip
chromium_src-5affc15f3a8a51f42debbf37806087dfbc84818f.tar.gz
chromium_src-5affc15f3a8a51f42debbf37806087dfbc84818f.tar.bz2
Update Gears to pull in latest revision from svn.
Fix scons breakage in the wince Gears port. Review URL: http://codereview.chromium.org/8776 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4349 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gears')
-rw-r--r--gears/DEPS6
-rw-r--r--gears/SConscript5
-rw-r--r--gears/SConscript.dll49
3 files changed, 38 insertions, 22 deletions
diff --git a/gears/DEPS b/gears/DEPS
index 8c202e6..8edd64f 100644
--- a/gears/DEPS
+++ b/gears/DEPS
@@ -1,8 +1,8 @@
-# We pull 3 components from the Chrome tree at this revision.
-chrome_rev = '@4086'
+# We pull 3 components from the Chrome tree at the trunk.
+chrome_rev = ''
# We pull 2 components from the Gears tree at this revision.
-gears_rev = '@2951'
+gears_rev = '@2955'
deps = {
"src/build":
diff --git a/gears/SConscript b/gears/SConscript
index f24eed3..26e3603 100644
--- a/gears/SConscript
+++ b/gears/SConscript
@@ -252,6 +252,7 @@ env.Replace(
# current build as closely as possible until we switch everyone to SCons, then
# gradually integrate.
env.Replace(
+ ARFLAGS = [],
CPPPATH = [
'$OPEN_DIR',
'$OPEN_DIR/..',
@@ -276,8 +277,10 @@ env.Replace(
FRAMEWORKPATH = [],
FRAMEWORKS = [],
LIBS = [],
+ LIBPATH = ['$COMPONENT_LIBRARY_DIR'],
LINKFLAGS = [],
SHLINKFLAGS = [],
+ COMPONENT_LIBRARY_DIR = '$COMMON_OUTDIR/lib',
)
if env['MODE'] == 'dbg':
@@ -493,7 +496,7 @@ if env['OS'] in ['win32', 'wince']:
'_WIN32_WCE=0x501',
'WINVER=_WIN32_WCE',
'UNDER_CE=0x501',
- 'WINCE',
+ 'OS_WINCE',
'WIN32_PLATFORM_PSPC',
'ARM',
'_ARM_',
diff --git a/gears/SConscript.dll b/gears/SConscript.dll
index 8f17a4e..2a32115 100644
--- a/gears/SConscript.dll
+++ b/gears/SConscript.dll
@@ -329,7 +329,7 @@ if env['OS'] == 'win32':
elif env['OS'] == 'wince':
env_res.Append(
CPPDEFINES = [
- 'WINCE',
+ 'OS_WINCE',
'_WIN32',
'_WIN32_WCE',
'UNDER_CE',
@@ -467,6 +467,7 @@ srcs['all'] += [
'$OPEN_DIR/base/common/byte_store.cc',
'$OPEN_DIR/base/common/byte_store_test.cc',
'$OPEN_DIR/base/common/circular_buffer_test.cc',
+ '$OPEN_DIR/base/common/common_win32.cc',
'$OPEN_DIR/base/common/database_name_table.cc',
'$OPEN_DIR/base/common/event.cc',
'$OPEN_DIR/base/common/event_test.cc',
@@ -523,6 +524,7 @@ srcs['all'] += [
'$OPEN_DIR/base/common/url_utils_test.cc',
'$OPEN_DIR/base/common/user_config.cc',
'$OPEN_DIR/base/common/vista_utils.cc',
+ '$OPEN_DIR/base/common/wince_compatibility.cc',
]
if env['OS'] == 'osx':
@@ -598,14 +600,13 @@ if env['OS'] == 'win32':
srcs['IE'] += [
'$OPEN_DIR/base/common/file_win32.cc',
'$OPEN_DIR/base/common/html_event_monitor_ie.cc',
+ '$OPEN_DIR/base/ie/browser_listener.cc',
'$OPEN_DIR/base/ie/ie_version.cc',
]
elif env['OS'] == 'wince':
srcs['IE'] += [
- '$OPEN_DIR/base/common/common_ie.cc',
'$OPEN_DIR/base/common/file_wince.cc',
'$OPEN_DIR/base/common/html_event_monitor_iemobile.cc',
- '$OPEN_DIR/base/common/wince_compatibility.cc',
]
#-----------------------------------------------------------------------------
@@ -723,6 +724,7 @@ srcs['all'] += [
'$OPEN_DIR/desktop/desktop_win32.cc',
'$OPEN_DIR/desktop/dll_data_wince.cc',
'$OPEN_DIR/desktop/drag_and_drop_registry.cc',
+ '$OPEN_DIR/desktop/drop_target_registration.cc',
'$OPEN_DIR/desktop/notification_message_orderer.cc',
'$OPEN_DIR/desktop/shortcut_utils_win32.cc',
]
@@ -869,6 +871,7 @@ srcs['all'] += [
# I18N_LANGS
html_m4srcs['all'] += [
+ '$OPEN_DIR/ui/common/alert_dialog.html_m4',
'$OPEN_DIR/ui/common/permissions_dialog.html_m4',
'$OPEN_DIR/ui/common/settings_dialog.html_m4',
'$OPEN_DIR/ui/common/shortcuts_dialog.html_m4',
@@ -885,6 +888,7 @@ i18n_m4srcs['FF3'] += [
# ui/common (built for all browsers)
srcs['all'] += [
+ '$OPEN_DIR/ui/common/alert_dialog.cc',
'$OPEN_DIR/ui/common/html_dialog.cc',
'$OPEN_DIR/ui/common/i18n_strings.cc',
'$OPEN_DIR/ui/common/permissions_dialog.cc',
@@ -904,6 +908,7 @@ srcs['SF'] += [
]
stabsrcs['all'] = [
+ '$OPEN_DIR/ui/common/alert_dialog.js.stab',
'$OPEN_DIR/ui/common/permissions_dialog.js.stab',
'$OPEN_DIR/ui/common/settings_dialog.js.stab',
'$OPEN_DIR/ui/common/shortcuts_dialog.js.stab',
@@ -1076,15 +1081,19 @@ if not env['OFFICIAL_BUILD']:
if env['OS'] == 'wince':
srcs['IE'] += [
- '$OPEN_DIR/installer/iemobile/cab_updater.cc',
+ '$OPEN_DIR/installer/common/cab_updater.cc',
+ '$OPEN_DIR/installer/common/download_task.cc',
+ '$OPEN_DIR/installer/common/installer_utils.cc',
+ '$OPEN_DIR/installer/common/periodic_checker.cc',
+ '$OPEN_DIR/installer/common/process_restarter.cc',
]
- m4srcs['IE'] += [
- '$OPEN_DIR/installer/iemobile/setup.rc.m4',
+ stabsrcs['IE'] += [
+ '$OPEN_DIR/installer/iemobile/setup.rc.stab',
]
wince_setup_srcs = [
- '$OPEN_DIR/installer/iemobile/process_restarter.cc',
+ '$OPEN_DIR/installer/common/process_restarter.cc',
'$OPEN_DIR/installer/iemobile/setup.cc',
env_res.RES('$GENFILES_DIR/setup.rc'),
]
@@ -1209,6 +1218,7 @@ if env['OS'] in ['win32', 'wince']:
module_res = env_res.RES('$OPEN_DIR/base/ie/module.rc')
string_res = env_res.RES('$GENFILES_DIR/string_table.rc')
dll_resources += [module_res, string_res]
+ # TODO: string_res seems to break the wince build for some magical reason!
if env['OS'] == 'wince':
dll_resources += [env_res.RES('$GENFILES_DIR/setup.rc')]
@@ -1324,21 +1334,24 @@ if env['OS'] in ['win32', 'wince']:
env.Depends(ui_res, html_m4s)
env.Depends(module_res, m4s)
-# HACK: gears and vista_broker share some inputs, but ChromeSharedLibrary
-# and ChromeProgram use slightly different environments, so SCons complains if
-# we try to compile those inputs differently. So we compile them using a
-# common environment here first.
-common_srcs = [src for src in srcs['all'] if str(src) in vista_broker_srcs]
-gears_srcs = [src for src in srcs['all'] if str(src) not in vista_broker_srcs]
-common_objs = env.SharedObject(common_srcs)
-vista_broker_objs = env.SharedObject(vista_broker_srcs)
+# HACK: gears, vista_broker, and wince_setup share some inputs, but the
+# Chrome* helpers muck with the environment, so SCons complains if we try to
+# compile those inputs differently. So we try to precompile them before
+# passing them to those methods first. So far, only '.c' and '.cc' inputs
+# are shared.
+def SplitSrcs(srcs):
+ def IsCFile(src): return str(src).endswith('.c') or str(src).endswith('.cc')
+ c_srcs = [src for src in srcs if IsCFile(src)]
+ nonc_srcs = [src for src in srcs if not IsCFile(src)]
+ return env.SharedObject(c_srcs) + nonc_srcs
+
module = env.ChromeSharedLibrary('gears-$OS-$ARCH-$MODE-${BROWSER}',
- common_objs + gears_srcs + libs + dll_resources + browser_specific_objects)
+ SplitSrcs(srcs['all']) + libs + dll_resources + browser_specific_objects)
module = env.InstallAs('${SHLIBPREFIX}gears${SHLIBSUFFIX}', module)
env.Alias('gears', module)
if env['OS'] == 'wince':
- wince_setup = env.ChromeSharedLibrary('setup', wince_setup_srcs)
+ wince_setup = env.ChromeSharedLibrary('setup', SplitSrcs(wince_setup_srcs))
if env['OS'] == 'win32' and env['BROWSER'] == 'IE':
# Note: We use IE_OUTDIR so that relative path from gears.dll is same in
@@ -1347,5 +1360,5 @@ if env['OS'] == 'win32' and env['BROWSER'] == 'IE':
# desktop_win32.cc.
# TODO(aa): This can move to common_outdir like crash_sender.exe
vista_broker = env.ChromeProgram('vista_broker',
- vista_broker_objs + vista_broker_resources)
+ SplitSrcs(vista_broker_srcs) + vista_broker_resources)
env.Alias('gears', vista_broker)