diff --git a/README b/README index 2e0a58649..52f6521ac 100644 --- a/README +++ b/README @@ -25,11 +25,6 @@ This package contains: More info at: http://code.google.com/p/gclient/ - hammer - A wrapper script for building Chromium with the SCons software - construction tool. More info at: - http://www.scons.org/ - Note: svn and python will be installed automatically if not accessible (on Windows only). diff --git a/git-gs b/git-gs index 28b4775e2..8a776979b 100755 --- a/git-gs +++ b/git-gs @@ -4,6 +4,6 @@ # found in the LICENSE file. git grep -n -e "$@" -- "*.h" "*.hpp" "*.cpp" "*.c" "*.cc" "*.cpp" "*.inl"\ "*.grd" "*.grdp" "*.idl" "*.m" "*.mm" "*.py" "*.sh" "*.cfg" "*.tac" "*.go"\ - "*SConscript" "SConscript*" "*.scons" "*.vcproj" "*.vsprops" "*.make"\ - "*.gyp" "*.gypi" "*.isolate" "*.java" "*.js" "*.html" "*.css" "*.ebuild" \ - "*.pl" "*.pm" "*.yaml" "*.gn" "*.gni" "*.json" "DEPS" "*/DEPS" + "*.vcproj" "*.vsprops" "*.make" "*.gyp" "*.gypi" "*.isolate" "*.java"\ + "*.js" "*.html" "*.css" "*.ebuild" "*.pl" "*.pm" "*.yaml" "*.gn" "*.gni"\ + "*.json" "DEPS" "*/DEPS" diff --git a/hammer b/hammer deleted file mode 100755 index 627c3c60d..000000000 --- a/hammer +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# -# 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. - -# A script to invoke scons in gyp generated projects. - -# Find the 'src' directory by looking for the site_scons directory. -# This method allows trees that don't use the name src to use this script. -# Explicitly skip site_scons directories that are from the 'software -# construction toolkit', since these are not gyp compatible. -SRC_DIR=`pwd` -while [ ! -d "${SRC_DIR}/site_scons" ] || \ - [ -e "${SRC_DIR}/site_scons/site_tools/component_setup.py" ]; do - PARENT_DIR="$(dirname "${SRC_DIR}")" - if [ "${SRC_DIR}" = "${PARENT_DIR}" ]; then - echo "ERROR: hammer must be run in a directory with site_scons under" >&2 - echo " the root of the project tree." >&2 - exit 1 - fi - SRC_DIR="${PARENT_DIR}" -done - -SCONS="${SRC_DIR}/third_party/scons/scons.py" -SITE_SCONS="${SRC_DIR}/site_scons" - -exec python "${SCONS}" "--site-dir=${SITE_SCONS}" "$@" diff --git a/hammer.bat b/hammer.bat deleted file mode 100755 index 8f0160a18..000000000 --- a/hammer.bat +++ /dev/null @@ -1,23 +0,0 @@ -@echo off - - -@rem We're in a submodule directory, look relative to the parent. -call python "%cd%\..\third_party\scons\scons.py" "--site-dir=..\site_scons" %* -goto omega - -:srcdir -call python "%cd%\third_party\scons\scons.py" --site-dir=site_scons %* -goto omega - -@rem Per the following page: -@rem http://code-bear.com/bearlog/2007/06/01/getting-the-exit-code-from-a-batch-file-that-is-run-from-a-python-program/ -@rem Just calling "exit /b" passes back an exit code, but in a way -@rem that does NOT get picked up correctly when executing the .bat -@rem file from the Python subprocess module. Using "call" as the -@rem last command in the .bat file makes it work as expected. - -:returncode -exit /b %ERRORLEVEL% - -:omega -call :returncode %ERRORLEVEL% diff --git a/tests/subversion_config/config b/tests/subversion_config/config index 2ae3ddde6..6c2a0bb2e 100644 --- a/tests/subversion_config/config +++ b/tests/subversion_config/config @@ -6,7 +6,7 @@ store-passwords=yes [miscellany] -global-ignores = *.pyc *.user *.suo *.bak *~ #*# *.ncb *.o *.lo *.la .*~ .#* .DS_Store .*.swp *.scons *.mk *.Makefile *.sln *.vcproj *.rules SConstruct *.xcodeproj +global-ignores = *.pyc *.user *.suo *.bak *~ #*# *.ncb *.o *.lo *.la .*~ .#* .DS_Store .*.swp *.mk *.Makefile *.sln *.vcproj *.rules SConstruct *.xcodeproj enable-auto-props = yes [auto-props]