Move dmg_fp in scons build to compile from

base/third_party/dmg_fp and compile it into base_lib.

Review URL: http://codereview.chromium.org/10769

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5521 0039d316-1c4b-4281-b951-d872f2087c98

21 files changed, 21 insertions, 93 deletions

diff --git a/base/base_lib.scons b/base/base_lib.scons
index 487d5d8..5118f04 100644
--- a/base/base_lib.scons
+++ b/base/base_lib.scons
@@ -87,6 +87,27 @@ input_files = [
     'word_iterator.cc',
 ]
 
+# Add object files David M Gay's dtoa and g_fmt third party lib.  We
+# compile these separately so we can disable warnings.
+env_dmg_fp = env.Clone()
+if env_dmg_fp['PLATFORM'] == 'win32':
+  env_dmg_fp.Append(
+      CCFLAGS = [
+          '/wd4018',
+          '/wd4102',
+          '/wd4244',
+          '/wd4554',
+      ],
+  )
+else:
+  env_dmg_fp['CXXFLAGS'].remove('-Wall')
+  env_dmg_fp['CXXFLAGS'].append('-Wno-write-strings')
+
+input_files.extend([
+    env_dmg_fp.Object('third_party/dmg_fp/dtoa.cc'),
+    env_dmg_fp.Object('third_party/dmg_fp/g_fmt.cc'),
+])
+
 if env['PLATFORM'] in ('posix', 'darwin'):
   # Remove files that still need to be ported from the input_files list.
   # TODO(port): delete files from this list as they get ported.
diff --git a/base/base_unittests.scons b/base/base_unittests.scons
index 496a12c..7b1cc28 100644
--- a/base/base_unittests.scons
+++ b/base/base_unittests.scons
@@ -13,7 +13,6 @@ env = env.Clone()
 env.SConscript([
     '$BASE_DIR/using_base.scons',
     '$BASE_DIR/gfx/using_base_gfx.scons',
-    '$DMG_FP_DIR/using_dmg_fp.scons',
     '$GTEST_DIR/../using_gtest.scons',
     '$ICU38_DIR/using_icu38.scons',
     '$LIBPNG_DIR/using_libpng.scons',
diff --git a/base/using_base.scons b/base/using_base.scons
index 08ab6c1..f3d58b4 100644
--- a/base/using_base.scons
+++ b/base/using_base.scons
@@ -11,7 +11,5 @@ Import("env")
 env.Append(
     LIBS = [
         'base',
-        # TODO(tc):  remove when dmg_fp gets moved to base/third_party
-        'dmg_fp',
     ],
 )
diff --git a/build/SConscript.main b/build/SConscript.main
index 6825bd2..74203e8 100644
--- a/build/SConscript.main
+++ b/build/SConscript.main
@@ -77,7 +77,6 @@ root_env = Environment(
     BSDIFF_DIR            = '$THIRD_PARTY_DIR/bsdiff',
     BSPATCH_DIR           = '$THIRD_PARTY_DIR/bspatch',
     BZIP2_DIR             = '$THIRD_PARTY_DIR/bzip2',
-    DMG_FP_DIR            = '$THIRD_PARTY_DIR/dmg_fp',
     ICU38_DIR             = '$THIRD_PARTY_DIR/icu38',
     LIBEVENT_DIR          = '$THIRD_PARTY_DIR/libevent',
     LIBJPEG_DIR           = '$THIRD_PARTY_DIR/libjpeg',
@@ -254,7 +253,6 @@ if LoadComponent('third_party'):
   sconscripts.extend([
       '$BSDIFF_DIR/bsdiff.scons',
       '$BSPATCH_DIR/bspatch.scons',
-      '$DMG_FP_DIR/dmg_fp.scons',
       '$ICU38_DIR/icu38.scons',
       '$MODP_B64_DIR/modp_b64.scons',
   ])
diff --git a/build/googleurl_unittests.scons b/build/googleurl_unittests.scons
index c0d5423..851f85a 100644
--- a/build/googleurl_unittests.scons
+++ b/build/googleurl_unittests.scons
@@ -12,7 +12,6 @@ env = env.Clone()
 
 env.SConscript([
     '$BASE_DIR/using_base.scons',
-    '$DMG_FP_DIR/using_dmg_fp.scons',
     '$ICU38_DIR/using_icu38.scons',
     '$GTEST_DIR/../using_gtest.scons',
     '$CHROME_SRC_DIR/build/using_googleurl.scons',
diff --git a/chrome/SConscript b/chrome/SConscript
index 4f2ddd8..f136a22 100644
--- a/chrome/SConscript
+++ b/chrome/SConscript
@@ -101,7 +101,6 @@ env_dll.Append(
         'base',
         'base_gfx',
         #'breakpad_handler',
-        'dmg_fp',
         'googleurl',
         'net',
         'skia',
diff --git a/chrome/test/unit/unit_tests.scons b/chrome/test/unit/unit_tests.scons
index 951d2c6..3b7fd39 100644
--- a/chrome/test/unit/unit_tests.scons
+++ b/chrome/test/unit/unit_tests.scons
@@ -14,7 +14,6 @@ env.SConscript([
     '$CHROME_DIR/third_party/wtl/using_wtl.scons',
     '$CHROME_SRC_DIR/build/using_googleurl.scons',
     '$CHROME_SRC_DIR/build/using_v8.scons',
-    '$DMG_FP_DIR/using_dmg_fp.scons',
     '$GTEST_DIR/../using_gtest.scons',
     '$ICU38_DIR/using_icu38.scons',
     '$LIBJPEG_DIR/using_libjpeg.scons',
diff --git a/net/crash_cache.scons b/net/crash_cache.scons
index 0d8f34d..4fc90ca 100644
--- a/net/crash_cache.scons
+++ b/net/crash_cache.scons
@@ -16,7 +16,6 @@ env.SConscript([
     '$NET_DIR/using_net.scons',
 
     '$BASE_DIR/using_base.scons',
-    '$DMG_FP_DIR/using_dmg_fp.scons',
     '$GTEST_DIR/../using_gtest.scons',
     '$ICU38_DIR/using_icu38.scons',
 ], {'env':env})
diff --git a/net/net_perftests.scons b/net/net_perftests.scons
index 0c276ac..1fbc6f1 100644
--- a/net/net_perftests.scons
+++ b/net/net_perftests.scons
@@ -18,7 +18,6 @@ env.SConscript([
 
     '$BASE_DIR/using_base.scons',
     '$CHROME_SRC_DIR/build/using_googleurl.scons',
-    '$DMG_FP_DIR/using_dmg_fp.scons',
     '$GTEST_DIR/../using_gtest.scons',
     '$ICU38_DIR/using_icu38.scons',
     '$MODP_B64_DIR/using_modp_b64.scons',
diff --git a/net/net_unittests.scons b/net/net_unittests.scons
index 5732c71..81293c7 100644
--- a/net/net_unittests.scons
+++ b/net/net_unittests.scons
@@ -14,7 +14,6 @@ env.SConscript([
     '$BASE_DIR/using_base.scons',
     '$BZIP2_DIR/using_bzip2.scons',
     '$CHROME_SRC_DIR/build/using_googleurl.scons',
-    '$DMG_FP_DIR/using_dmg_fp.scons',
     '$GTEST_DIR/../using_gtest.scons',
     '$ICU38_DIR/using_icu38.scons',
     '$MODP_B64_DIR/using_modp_b64.scons',
diff --git a/net/stress_cache.scons b/net/stress_cache.scons
index f05405b..83d976b6 100644
--- a/net/stress_cache.scons
+++ b/net/stress_cache.scons
@@ -16,7 +16,6 @@ env.SConscript([
     '$NET_DIR/using_net.scons',
 
     '$BASE_DIR/using_base.scons',
-    '$DMG_FP_DIR/using_dmg_fp.scons',
     '$GTEST_DIR/../using_gtest.scons',
     '$ICU38_DIR/using_icu38.scons',
 ], {'env':env})
diff --git a/net/tools/tld_cleanup/tld_cleanup.scons b/net/tools/tld_cleanup/tld_cleanup.scons
index 05669de..a8380c2 100644
--- a/net/tools/tld_cleanup/tld_cleanup.scons
+++ b/net/tools/tld_cleanup/tld_cleanup.scons
@@ -13,7 +13,6 @@ env = env.Clone()
 env.SConscript([
     '$BASE_DIR/using_base.scons',
     '$CHROME_SRC_DIR/build/using_googleurl.scons',
-    '$DMG_FP_DIR/using_dmg_fp.scons',
     '$ICU38_DIR/using_icu38.scons',
     '$NET_DIR/using_net.scons',
 ], {'env':env})
diff --git a/sandbox/tests/integration_tests/sbox_integration_tests.scons b/sandbox/tests/integration_tests/sbox_integration_tests.scons
index 34044c9..ad0f39a 100644
--- a/sandbox/tests/integration_tests/sbox_integration_tests.scons
+++ b/sandbox/tests/integration_tests/sbox_integration_tests.scons
@@ -8,7 +8,6 @@ env = env.Clone()
 
 env.SConscript([
     '$BASE_DIR/using_base.scons',
-    '$DMG_FP_DIR/using_dmg_fp.scons',
     '$GTEST_DIR/../using_gtest.scons',
     '$SANDBOX_DIR/using_sandbox.scons',
 ], {'env':env})
diff --git a/sandbox/tests/unit_tests/sbox_unittests.scons b/sandbox/tests/unit_tests/sbox_unittests.scons
index bf1bf03..f311ede 100644
--- a/sandbox/tests/unit_tests/sbox_unittests.scons
+++ b/sandbox/tests/unit_tests/sbox_unittests.scons
@@ -8,7 +8,6 @@ env = env.Clone()
 
 env.SConscript([
     '$BASE_DIR/using_base.scons',
-    '$DMG_FP_DIR/using_dmg_fp.scons',
     '$GTEST_DIR/../using_gtest.scons',
     '$SANDBOX_DIR/using_sandbox.scons',
 ], {'env':env})
diff --git a/sandbox/tests/validation_tests/sbox_validation_tests.scons b/sandbox/tests/validation_tests/sbox_validation_tests.scons
index 7d2b95d..7320034 100644
--- a/sandbox/tests/validation_tests/sbox_validation_tests.scons
+++ b/sandbox/tests/validation_tests/sbox_validation_tests.scons
@@ -8,7 +8,6 @@ env = env.Clone()
 
 env.SConscript([
     '$BASE_DIR/using_base.scons',
-    '$DMG_FP_DIR/using_dmg_fp.scons',
     '$GTEST_DIR/../using_gtest.scons',
     '$SANDBOX_DIR/using_sandbox.scons',
 ], {'env':env})
diff --git a/third_party/dmg_fp/dmg_fp.scons b/third_party/dmg_fp/dmg_fp.scons
deleted file mode 100644
index 8ac9cba..0000000
--- a/third_party/dmg_fp/dmg_fp.scons
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright (c) 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()
-
-# Do *NOT* define USE_LOCALE here. We want these functions to be
-# locale-independent, for example to use in parsers or serializers.
-env.Append(
-    # TODO(sgk): Review this when we want to support more architectures.
-    CPPDEFINES = [
-        'IEEE_8087',
-    ],
-)
-
-if env['PLATFORM'] == 'win32':
-  env.Append(
-      CCFLAGS = [
-          '/TP',
-
-          '/wd4018',
-          '/wd4102',
-          '/wd4244',
-          '/wd4503',
-          '/wd4554',
-          '/wd4800',
-          '/wd4819',
-      ],
-  )
-
-if env['PLATFORM'] in ('darwin', 'posix'):
-  # As usual with third party code, it generates lots of warnings.
-  # Disable only what's necessary.
-  env.Append(
-      CCFLAGS = [
-          '-Wno-uninitialized',
-          '-Wno-parentheses',
-          '-Wno-sign-compare',
-          '-Wno-unused-label',
-          '-Wno-write-strings',
-      ]
-  )
-
-input_files = [
-    'dtoa.cc',
-    'g_fmt.cc',
-]
-
-env.ChromeStaticLibrary('dmg_fp', input_files)
diff --git a/third_party/dmg_fp/dmg_fp.vsprops b/third_party/dmg_fp/dmg_fp.vsprops
deleted file mode 100644
index 78e061f..0000000
--- a/third_party/dmg_fp/dmg_fp.vsprops
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="Windows-1252"?>
-<VisualStudioPropertySheet
-	ProjectType="Visual C++"
-	Version="8.00"
-	Name="sqlite"
-	>
-	<Tool
-		Name="VCCLCompilerTool"
-		PreprocessorDefinitions="IEEE_8087"
-		DisableSpecificWarnings="4018;4102;4244;4554"

-	/>
-</VisualStudioPropertySheet>
diff --git a/third_party/dmg_fp/using_dmg_fp.scons b/third_party/dmg_fp/using_dmg_fp.scons
deleted file mode 100644
index 8dad8dd..0000000
--- a/third_party/dmg_fp/using_dmg_fp.scons
+++ /dev/null
@@ -1,11 +0,0 @@
-# Copyright (c) 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.Append(
-    LIBS = [
-        'dmg_fp',
-    ],
-)
diff --git a/webkit/activex_shim_dll/SConscript b/webkit/activex_shim_dll/SConscript
index fc75357..f451ac2 100644
--- a/webkit/activex_shim_dll/SConscript
+++ b/webkit/activex_shim_dll/SConscript
@@ -16,7 +16,6 @@ env.Prepend(
         'googleurl',
         env['ICU_LIBS'],  # TODO(sgk):  '$ICU_LIBS' when scons is fixed
         'base',
-        'dmg_fp',
     ],
 )
 
diff --git a/webkit/glue/plugins/test/SConscript b/webkit/glue/plugins/test/SConscript
index 63b6b6e..be4207c 100644
--- a/webkit/glue/plugins/test/SConscript
+++ b/webkit/glue/plugins/test/SConscript
@@ -32,7 +32,6 @@ if env['PLATFORM'] == 'win32':
 env.Append(
     LIBS = [
          'base',
-         'dmg_fp',
          'icu',
     ],
 )
diff --git a/webkit/tools/test_shell/SConscript b/webkit/tools/test_shell/SConscript
index 5d43b441..c98ae98 100644
--- a/webkit/tools/test_shell/SConscript
+++ b/webkit/tools/test_shell/SConscript
@@ -30,7 +30,6 @@ env.Append(
         '$GTEST_DIR/include',
     ],
     LIBS = [
-        'dmg_fp',
         'test_shell',
         'glue',
         'port',