Replace "Hammer" references with "Debug" as appropriate.

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

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

7 files changed, 11 insertions, 20 deletions

diff --git a/PRESUBMIT.py b/PRESUBMIT.py
index 7cb4af3..4b6c55b 100755
--- a/PRESUBMIT.py
+++ b/PRESUBMIT.py
@@ -16,8 +16,8 @@ SOURCE_FILE_EXTENSIONS = [
 EXCLUDED_PATHS = [
     r"breakpad[\\\/].*",
     r"chrome[\\\/]Debug[\\\/].*",
-    r"chrome[\\\/]Hammer[\\\/].*",
     r"chrome[\\\/]Release[\\\/].*",
+    r"sconsbuild[\\\/].*",
     r"xcodebuild[\\\/].*",
     r"skia[\\\/].*",
     r".*third_party[\\\/].*",
diff --git a/base/base_paths_linux.cc b/base/base_paths_linux.cc
index 3fba313..b235f6b 100644
--- a/base/base_paths_linux.cc
+++ b/base/base_paths_linux.cc
@@ -32,7 +32,7 @@ bool PathProviderLinux(int key, FilePath* result) {
     }
     case base::DIR_SOURCE_ROOT:
       // On linux, unit tests execute two levels deep from the source root.
-      // For example:  chrome/{Debug|Hammer}/net_unittest
+      // For example:  sconsbuild/{Debug|Release}/net_unittest
       if (!PathService::Get(base::DIR_EXE, &path))
         return false;
       path = path.Append(FilePath::kParentDirectory)
diff --git a/chrome/installer/linux/debian/build.sh b/chrome/installer/linux/debian/build.sh
index bd567f6..7b2181b 100755
--- a/chrome/installer/linux/debian/build.sh
+++ b/chrome/installer/linux/debian/build.sh
@@ -114,7 +114,6 @@ stage_install() {
     "${STAGEDIR}${INSTALLDIR}/locales/"
   install -m 644 "${BUILDDIR}/themes/default.pak" \
     "${STAGEDIR}${INSTALLDIR}/themes/"
-  install -m 644 "${BUILDDIR}/icudt38l.dat" "${STAGEDIR}${INSTALLDIR}/"
   install -m 644 "${SCRIPTDIR}/../common/${PACKAGE}/${PACKAGE}.png" \
     "${STAGEDIR}${INSTALLDIR}/"
   process_template "${SCRIPTDIR}/../common/wrapper" \
@@ -313,7 +312,7 @@ process_opts() {
 SCRIPTDIR=$(readlink -f "$(dirname "$0")")
 OUTPUTDIR="${PWD}"
 STAGEDIR=deb.build
-BUILDDIR=$(readlink -f "${SCRIPTDIR}/../../../Hammer")
+BUILDDIR=$(readlink -f "${SCRIPTDIR}/../../../../sconsbuild/Release")
 CHANGELOG=changelog.auto
 # Default to a bogus low version, so if somebody creates and installs a package
 # with no version info, it won't prevent upgrading when trying to install a
diff --git a/third_party/libxslt/linux/xslt-config b/third_party/libxslt/linux/xslt-config
index 238002a..c9c352d 100644
--- a/third_party/libxslt/linux/xslt-config
+++ b/third_party/libxslt/linux/xslt-config
@@ -89,11 +89,11 @@ while test $# -gt 0; do
     shift
 done
 
-the_libs="-L${libdir} -lxslt -L/home/mmoss/src/chrome/src/chrome/Hammer/third_party/libxml/scons -L/usr/local/lib -lxml2 -lz -lm -lm"
+the_libs="-L${libdir} -lxslt -L/home/mmoss/src/chrome/src/sconsbuild/Debug/third_party/libxml/scons -L/usr/local/lib -lxml2 -lz -lm -lm"
 if test "$includedir" != "/usr/include"; then
-    the_flags="$the_flags -I$includedir `/home/mmoss/src/chrome/src/chrome/Hammer/third_party/libxml/scons/xml2-config --cflags`"
+    the_flags="$the_flags -I$includedir `/home/mmoss/src/chrome/src/sconsbuild/Debug/third_party/libxml/scons/xml2-config --cflags`"
 else
-    the_flags="$the_flags `/home/mmoss/src/chrome/src/chrome/Hammer/third_party/libxml/scons/xml2-config --cflags`"
+    the_flags="$the_flags `/home/mmoss/src/chrome/src/sconsbuild/Debug/third_party/libxml/scons/xml2-config --cflags`"
 fi
 
 if $cflags; then
diff --git a/tools/valgrind/chrome_tests.py b/tools/valgrind/chrome_tests.py
index a21e0ec..2c024c1 100755
--- a/tools/valgrind/chrome_tests.py
+++ b/tools/valgrind/chrome_tests.py
@@ -92,8 +92,8 @@ class ChromeTests:
       self._data_dirs.append(os.path.join(module_dir, "data", "valgrind"))
 
     if not self._options.build_dir:
-      dir_chrome = os.path.join(self._source_dir, "chrome", "Hammer")
-      dir_module = os.path.join(module_dir, "Hammer")
+      dir_chrome = os.path.join(self._source_dir, "sconsbuild", "Debug")
+      dir_module = os.path.join(module_dir, "Debug")
       if exe:
         exe_chrome = os.path.join(dir_chrome, exe)
         exe_module = os.path.join(dir_module, exe)
diff --git a/tools/valgrind/valgrind.sh b/tools/valgrind/valgrind.sh
index 08bc480..0170038 100755
--- a/tools/valgrind/valgrind.sh
+++ b/tools/valgrind/valgrind.sh
@@ -6,7 +6,7 @@
 # This is a small script for manually launching valgrind, along with passing
 # it the suppression file, and some helpful arguments (automatically attaching
 # the debugger on failures, etc).  Run it from your repo root, something like:
-#  $ sh ./tools/valgrind/valgrind.sh ./chrome/Hammer/chrome
+#  $ sh ./tools/valgrind/valgrind.sh ./sconsbuild/Debug/chrome
 #
 # This is mostly intended for running the chrome browser interactively.
 # To run unit tests, you probably want to run chrome_tests.sh instead.
diff --git a/webkit/tools/layout_tests/layout_package/platform_utils_linux.py b/webkit/tools/layout_tests/layout_package/platform_utils_linux.py
index 0ea0bec..72aa927 100644
--- a/webkit/tools/layout_tests/layout_package/platform_utils_linux.py
+++ b/webkit/tools/layout_tests/layout_package/platform_utils_linux.py
@@ -161,8 +161,7 @@ class PlatformUtility(object):
 
   def ImageCompareExecutablePath(self, target):
     """Path to the image_diff binary."""
-    # See mmoss TODO below.
-    return PathFromBase('chrome', 'Hammer', 'image_diff')
+    return PathFromBase('sconsbuild', target, 'image_diff')
 
   def TestShellBinary(self):
     """The name of the binary for TestShell."""
@@ -174,14 +173,7 @@ class PlatformUtility(object):
     Args:
       target: Build target mode (debug or release)
     """
-    # TODO(mmoss) - hard-coded to "Hammer" for now until I look into the scons
-    # output directory logic (and how/if it will change once Linux supports
-    # multiple debug/release targets).
-    try:
-      path = PathFromBase('webkit', 'Hammer', self.TestShellBinary())
-    except google.path_utils.PathNotFound:
-      path = PathFromBase('chrome', 'Hammer', self.TestShellBinary())
-    return path
+    return PathFromBase('sconsbuild', target, self.TestShellBinary())
 
   def FuzzyMatchBinaryPath(self):
     """Return the path to the fuzzy matcher binary."""