From 5c6f1c6b32f9da207706cf2d94560196e9d20303 Mon Sep 17 00:00:00 2001
From: "sgk@google.com" <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 20 Nov 2008 01:12:38 +0000
Subject: Finish release (opt) builds on Windows, including the parallel
build\*.scons structure (mirroring build\*.vsprops files): * Use
env.ApplySConscript() instead of env.SConscript with a hand-crafted
dictionary defining 'env'. * Move various CPPPATH, CCFLAGS, CPPDEFINES, LIBS
and LIBPATH definitions from build/SConscript.main and target-specific
*.scons files into the build\*.scons files that mirror the existing
build\*.vsprops hierarchy. * Use the new build\{debug,release}.scons files to
update the windows_dbg and windows_opt construction environments. * Mirror
current support for CHROME_BUILD_TYPE and CHROMIUM_BUILD external
environment variables. * Remove hard-coded /TP options. * Massage $CXXFLAGS
to remove $CCFLAGS, avoiding duplication of options on command lines.
Handle the ripple effect in $PCHCOM by adding $CCFLAGS back to that command
line. * Delete hammer's default settings of {CC,LINK}FLAGS_{DEBUG,OPTIMIZED}
so they don't pollute our construction environments. * Update chrome config
to link against v8 for opt, v8_g for dbg. * Get rid of fragile by-hand order
of using_net.scons before other using_*.scons files. We're now using
--start-group and --end-group on Linux to deal with dependency cycles in
libraries. Review URL: http://codereview.chromium.org/11478
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5741 0039d316-1c4b-4281-b951-d872f2087c98
---
net/net_unittests.scons | 27 ++-------------------------
1 file changed, 2 insertions(+), 25 deletions(-)
(limited to 'net/net_unittests.scons')
diff --git a/net/net_unittests.scons b/net/net_unittests.scons
index 81293c7..9f6dda8 100644
--- a/net/net_unittests.scons
+++ b/net/net_unittests.scons
@@ -10,7 +10,7 @@ Import('env')
env = env.Clone()
-env.SConscript([
+env.ApplySConscript([
'$BASE_DIR/using_base.scons',
'$BZIP2_DIR/using_bzip2.scons',
'$CHROME_SRC_DIR/build/using_googleurl.scons',
@@ -20,41 +20,18 @@ env.SConscript([
'$NET_DIR/using_net.scons',
'$SDCH_DIR/using_sdch.scons',
'$ZLIB_DIR/using_zlib.scons',
-], {'env':env})
+])
if env['PLATFORM'] in ('posix', 'darwin'):
env.SConscript([
'$LIBEVENT_DIR/using_libevent.scons',
], {'env':env})
-
-env.Prepend(
- CPPPATH = [
- '$CHROME_SRC_DIR',
- ],
-)
-
if env['PLATFORM'] == 'win32':
env.Prepend(
CCFLAGS = [
- '/TP',
'/WX',
],
- CPPDEFINES = [
- '_WIN32_WINNT=0x0600',
- 'WINVER=0x0600',
- '_HAS_EXCEPTIONS=0',
- ],
- LINKFLAGS = [
- '/DELAYLOAD:"dwmapi.dll"',
- '/DELAYLOAD:"uxtheme.dll"',
- '/MACHINE:X86',
- '/FIXED:No',
- '/safeseh',
- '/dynamicbase',
- '/ignore:4199',
- '/nxcompat',
- ],
)
input_files = [
--
cgit v1.1