diff options
| -rw-r--r-- | chrome/SConscript | 2 | ||||
| -rw-r--r-- | chrome/browser/debugger/SConscript | 53 | ||||
| -rw-r--r-- | chrome/browser/debugger/debugger.scons | 39 | ||||
| -rw-r--r-- | chrome/chrome.scons | 2 | ||||
| -rw-r--r-- | chrome/test/interactive_ui/SConscript | 98 | ||||
| -rw-r--r-- | chrome/test/interactive_ui/interactive_ui_tests.scons | 105 | ||||
| -rw-r--r-- | google_update/using_google_update.scons | 3 |
7 files changed, 149 insertions, 153 deletions
diff --git a/chrome/SConscript b/chrome/SConscript index 985e564..ef73037 100644 --- a/chrome/SConscript +++ b/chrome/SConscript @@ -412,14 +412,12 @@ if env['PLATFORM'] == 'win32': sconscript_files.extend([ 'app/resources/SConscript', 'app/theme/SConscript', - 'browser/debugger/SConscript', 'browser/views/SConscript', 'installer/mini_installer/SConscript', 'installer/setup/SConscript', 'installer/util/SConscript', 'test/activex_test_control/SConscript', 'test/automation/SConscript', - 'test/interactive_ui/SConscript', 'test/memory_test/SConscript', 'test/mini_installer_test/SConscript', 'test/page_cycler/SConscript', diff --git a/chrome/browser/debugger/SConscript b/chrome/browser/debugger/SConscript deleted file mode 100644 index 362a2c4..0000000 --- a/chrome/browser/debugger/SConscript +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright (c) 2006-2008 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. - -Import('env') - -env = env.Clone() - - -env.Prepend( - CPPPATH = [ - '$CHROME_SRC_DIR', - ], - CPPDEFINES = [ - 'LIBXML_STATIC', - 'U_STATIC_IMPLEMENTATION', - 'PNG_USER_CONFIG', - 'CHROME_PNG_WRITE_SUPPORT', - ], - CCFLAGS = [ - '/TP', - ], -) - -env.Append( - CPPPATH = [ - '$CHROME_DIR/third_party/wtl/include', - '$NPAPI_DIR', - '$LIBXML_DIR/include', - '$ICU38_DIR/public/common', - '$ICU38_DIR/public/i18n', - '$CHROME_DIR/app', - '$ZLIB_DIR', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/platform', - '$LIBPNG_DIR', - '$BREAKPAD_DIR/src', - ], -) - -input_files = [ - 'debugger_contents.cc', - 'debugger_io_socket.cc', - 'debugger_node.cc', - 'debugger_shell.cc', - 'debugger_view.cc', - 'debugger_window.cc', - 'debugger_wrapper.cc', -] - -env.ChromeStaticLibrary('debugger', input_files) - diff --git a/chrome/browser/debugger/debugger.scons b/chrome/browser/debugger/debugger.scons new file mode 100644 index 0000000..cc2ca65 --- /dev/null +++ b/chrome/browser/debugger/debugger.scons @@ -0,0 +1,39 @@ +# Copyright (c) 2006-2008 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. + +Import('env') + +env = env.Clone() + +env.SConscript([ + '$BREAKPAD_DIR/using_breakpad.scons', + '$CHROME_DIR/third_party/wtl/using_wtl.scons', + '$ICU38_DIR/using_icu38.scons', + '$LIBPNG_DIR/using_libpng.scons', + '$LIBXML_DIR/using_libxml.scons', + '$NPAPI_DIR/using_npapi.scons', + '$SKIA_DIR/using_skia.scons', + '$ZLIB_DIR/using_zlib.scons', +], {'env':env}) + +env.Prepend( + CPPPATH = [ + '$CHROME_DIR/app/resources', + '$CHROME_DIR/app', + '$CHROME_SRC_DIR', + ], +) + +input_files = [ + 'debugger_contents.cc', + 'debugger_io_socket.cc', + 'debugger_node.cc', + 'debugger_shell.cc', + 'debugger_view.cc', + 'debugger_window.cc', + 'debugger_wrapper.cc', +] + +env.ChromeStaticLibrary('debugger', input_files) + diff --git a/chrome/chrome.scons b/chrome/chrome.scons index 9b1cd0b..52c06e4 100644 --- a/chrome/chrome.scons +++ b/chrome/chrome.scons @@ -12,6 +12,8 @@ sconscript_files = [ 'SConscript', 'browser/browser.scons', + 'browser/debugger/debugger.scons', + 'test/interactive_ui/interactive_ui_tests.scons', 'test/unit/unit_tests.scons', 'common/common.scons', 'common/ipc_tests.scons', diff --git a/chrome/test/interactive_ui/SConscript b/chrome/test/interactive_ui/SConscript deleted file mode 100644 index 7b0fdda..0000000 --- a/chrome/test/interactive_ui/SConscript +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright (c) 2006-2008 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. - -Import('env_test') - -env_test = env_test.Clone() - - -env_test.Prepend( - CPPDEFINES = [ - 'UI_TEST', - 'UNIT_TEST', - 'LIBXSLT_STATIC', - 'LIBXML_STATIC', - ], - CPPPATH = [ - '$GTEST_DIR/include', - '$GTEST_DIR', - '$SKIA_DIR/include', - '$SKIA_DIR/include/corecg', - '$SKIA_DIR/platform', - '$CHROME_SRC_DIR', - '$CHROME_DIR/third_party/wtl/include', - '$LIBXSLT_DIR', - '$LIBXML_DIR/include', - ], - LIBS = [ - 'automation', - 'base', - 'base_gfx', - 'browser', - 'browser_views', - 'bzip2', - 'common', - 'debugger', - 'glue', - 'googleurl', - 'gtest', - 'hunspell', - env_test['ICU_LIBS'], # TODO(sgk): '$ICU_LIBS' when scons is fixed - 'libpng', - 'modp_b64', - 'net', - 'renderer', - 'skia', - 'sqlite', - 'views', - 'v8', - 'WebCore', - 'zlib', - ], -) - -env_test.Prepend( - LINKFLAGS = [ - '/INCREMENTAL', - '/DEBUG', - - '/DELAYLOAD:"dwmapi.dll"', - '/DELAYLOAD:"uxtheme.dll"', - - '/MACHINE:X86', - '/FIXED:No', - - '/safeseh', - '/dynamicbase', - '/ignore:4199', - '/nxcompat', - ], - LIBS = [ - 'comsupp.lib', - 'oleacc.lib', - 'psapi.lib', - 'rpcrt4.lib', - 'winmm.lib', - ], -) - -input_files = [ - '$CHROME_DIR/browser/browser_focus_uitest.cc', - '$CHROME_DIR/browser/views/bookmark_bar_view_test.cc', - '$CHROME_DIR/browser/views/constrained_window_impl_interactive_uitest.cc', - '$CHROME_DIR/browser/views/tabs/tab_dragging_test.cc', - '$CHROME_DIR/test/ui/npapi_test_helper$OBJSUFFIX', - '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', - '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', - '$CHROME_DIR/test/interactive_ui/npapi_interactive_test.cc', - '$CHROME_DIR/test/test_file_util$OBJSUFFIX', - - 'view_event_test_base.cc', -] - -exe = env_test.ChromeTestProgram('interactive_ui_tests', input_files) -i = env_test.Install('$TARGET_ROOT', exe) - -env_test.Alias('chrome', i) diff --git a/chrome/test/interactive_ui/interactive_ui_tests.scons b/chrome/test/interactive_ui/interactive_ui_tests.scons new file mode 100644 index 0000000..f9cc21a --- /dev/null +++ b/chrome/test/interactive_ui/interactive_ui_tests.scons @@ -0,0 +1,105 @@ +# Copyright (c) 2006-2008 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. + +Import('env') + +env = env.Clone() + +env.SConscript([ + '$BASE_DIR/gfx/using_base_gfx.scons', + '$BASE_DIR/using_base.scons', + '$BZIP2_DIR/using_bzip2.scons', + '$CHROME_DIR/third_party/hunspell/using_hunspell.scons', + '$CHROME_DIR/third_party/wtl/using_wtl.scons', + '$CHROME_SRC_DIR/build/using_googleurl.scons', + '$GOOGLE_UPDATE_DIR/using_google_update.scons', + '$GTEST_DIR/../using_gtest.scons', + '$ICU38_DIR/using_icu38.scons', + '$LIBJPEG_DIR/using_libjpeg.scons', + '$LIBPNG_DIR/using_libpng.scons', + '$LIBXML_DIR/using_libxml.scons', + '$LIBXSLT_DIR/using_libxslt.scons', + '$MODP_B64_DIR/using_modp_b64.scons', + '$NET_DIR/using_net.scons', + '$NPAPI_DIR/using_npapi.scons', + '$SKIA_DIR/using_skia.scons', + '$ZLIB_DIR/using_zlib.scons', +], {'env':env}) + +env.Prepend( + CPPDEFINES = [ + 'UI_TEST', + ], + CPPPATH = [ + '$CHROME_SRC_DIR', + ], + LIBS = [ + 'automation', + 'browser', + 'browser_views', + 'common', + 'debugger', + 'default_plugin', + 'glue', + #'jscre', + 'JavaScriptCore_pcre', + 'plugin', + 'port', + 'renderer', + 'sqlite', + 'test_chrome_plugin', + 'util', + 'views', + 'v8', + 'v8_snapshot', + 'V8Bindings', + 'WebCore', + 'WTF', + ], +) + +if env['PLATFORM'] == 'win32': + env.Prepend( + LINKFLAGS = [ + '/INCREMENTAL', + '/DEBUG', + + '/DELAYLOAD:"dwmapi.dll"', + '/DELAYLOAD:"uxtheme.dll"', + + '/MACHINE:X86', + '/FIXED:No', + + '/safeseh', + '/dynamicbase', + '/ignore:4199', + '/nxcompat', + ], + LIBS = [ + 'activex_shim', + 'comsupp', + 'oleacc', + 'psapi', + 'rpcrt4', + 'winmm', + ], + ) + +input_files = [ + '$CHROME_DIR/browser/browser_focus_uitest.cc', + '$CHROME_DIR/browser/views/bookmark_bar_view_test.cc', + '$CHROME_DIR/browser/views/constrained_window_impl_interactive_uitest.cc', + '$CHROME_DIR/browser/views/tabs/tab_dragging_test.cc', + '$CHROME_DIR/test/interactive_ui/npapi_interactive_test.cc', + '$CHROME_DIR/test/test_file_util$OBJSUFFIX', + '$CHROME_DIR/test/testing_profile$OBJSUFFIX', + '$CHROME_DIR/test/ui/npapi_test_helper$OBJSUFFIX', + '$CHROME_DIR/test/ui/run_all_unittests$OBJSUFFIX', + '$CHROME_DIR/test/ui/ui_test$OBJSUFFIX', + '$CHROME_DIR/test/ui/ui_test_suite$OBJSUFFIX', + + 'view_event_test_base.cc', +] + +env.ChromeTestProgram('interactive_ui_tests', input_files) diff --git a/google_update/using_google_update.scons b/google_update/using_google_update.scons index 1469568..b60669a 100644 --- a/google_update/using_google_update.scons +++ b/google_update/using_google_update.scons @@ -12,4 +12,7 @@ env.Append( CPPPATH = [ '$GOOGLE_UPDATE_DIR', ], + LIBS = [ + 'google_update', + ], ) |