Move depot_tools and ninja into vendor
This commit is contained in:
Родитель
e85ef8e163
Коммит
ab514ea2b6
|
@ -1 +0,0 @@
|
|||
/vendor/
|
|
@ -1,6 +1,6 @@
|
|||
[submodule "depot_tools"]
|
||||
path = depot_tools
|
||||
[submodule "vendor/depot_tools"]
|
||||
path = vendor/depot_tools
|
||||
url = https://chromium.googlesource.com/chromium/tools/depot_tools.git
|
||||
[submodule "ninja"]
|
||||
path = ninja
|
||||
[submodule "vendor/ninja"]
|
||||
path = vendor/ninja
|
||||
url = https://github.com/martine/ninja
|
||||
|
|
|
@ -4,10 +4,12 @@ set -e
|
|||
|
||||
cd "$(dirname $0)/.."
|
||||
SOURCE_ROOT=$(pwd -P)
|
||||
VENDOR_DIR="${SOURCE_ROOT}/vendor"
|
||||
NINJA_DIR="${VENDOR_DIR}/ninja"
|
||||
|
||||
git submodule sync
|
||||
git submodule update --init --recursive
|
||||
|
||||
"${SOURCE_ROOT}/ninja/bootstrap.py"
|
||||
"${NINJA_DIR}/bootstrap.py"
|
||||
|
||||
"${SOURCE_ROOT}/script/update"
|
||||
|
|
|
@ -4,8 +4,8 @@ set -e
|
|||
|
||||
cd "$(dirname $0)/.."
|
||||
SOURCE_ROOT=$(pwd -P)
|
||||
NINJA_DIR="${SOURCE_ROOT}/ninja"
|
||||
VENDOR_DIR="${SOURCE_ROOT}/vendor"
|
||||
NINJA_DIR="${VENDOR_DIR}/ninja"
|
||||
CHROMIUM_DIR="${VENDOR_DIR}/chromium"
|
||||
|
||||
"${NINJA_DIR}/ninja" -C "${CHROMIUM_DIR}/src/out/Debug" chromium_content
|
||||
|
|
|
@ -15,7 +15,7 @@ CHROMIUM_DIR="${VENDOR_DIR}/chromium"
|
|||
|
||||
source VERSION
|
||||
|
||||
export PATH="${SOURCE_ROOT}/depot_tools:${PATH}"
|
||||
export PATH="${VENDOR_DIR}/depot_tools:${PATH}"
|
||||
|
||||
if [ ! -d "${CHROMIUM_DIR}" ]; then
|
||||
mkdir -p "$(dirname "${CHROMIUM_DIR}")"
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
/chromium/
|
Загрузка…
Ссылка в новой задаче