Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 14:10:11 +01:00
Code Issues Projects Releases Packages Wiki Activity

Minor cleanup to the bindgen scripts

Browse source
This commit is contained in:
Ravi Shankar 2016-09-27 17:36:20 +05:30
parent 1924df0c00
commit 67d26b36a1
2 changed files with 10 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/style/binding_tools/regen.sh
View file

@ -8,13 +8,15 @@ set -o errexit
set -o nounset set -o nounset
set -o pipefail set -o pipefail
TOOLS_DIR="$(dirname ${0})"
if [[ ${#} -eq 0 ]]; then if [[ ${#} -eq 0 ]]; then
echo "Usage: ${0} /path/to/gecko/objdir [other-regen.py-flags]" echo "Usage: ${0} /path/to/gecko/objdir [other-regen.py-flags]"
exit 1 exit 1
fi fi
# Check for rust-bindgen # Check for rust-bindgen
if [[ ! -d rust-bindgen ]]; then if [[ ! -d "${TOOLS_DIR}/rust-bindgen" ]]; then
echo "rust-bindgen not found. Run setup_bindgen.sh first." echo "rust-bindgen not found. Run setup_bindgen.sh first."
exit 1 exit 1
fi fi
@ -22,7 +24,7 @@ fi
# Check for /usr/include # Check for /usr/include
if [[ ! -d /usr/include ]]; then if [[ ! -d /usr/include ]]; then
echo "/usr/include doesn't exist." \ echo "/usr/include doesn't exist." \
"Mac users may need to run xcode-select --install." "Mac users may need to run 'xcode-select --install.'"
exit 1 exit 1
fi fi
@ -32,4 +34,4 @@ else
LIBCLANG_PATH="$(brew --prefix llvm38)/lib/llvm-3.8/lib" LIBCLANG_PATH="$(brew --prefix llvm38)/lib/llvm-3.8/lib"
fi fi
./regen.py --target all "${@}" "./${TOOLS_DIR}/regen.py" --target all "${@}"

17
components/style/binding_tools/setup_bindgen.sh
View file

@ -18,28 +18,21 @@ else
export LIBCLANG_PATH="$(brew --prefix llvm38)/lib/llvm-3.8/lib" export LIBCLANG_PATH="$(brew --prefix llvm38)/lib/llvm-3.8/lib"
fi fi
# Make sure we have llvm38. # Make sure we have llvm-3.8.
if [[ ! -x "$(command -v clang-3.8)" ]]; then if [[ ! -x "$(command -v clang-3.8)" ]]; then
echo "llmv38 must be installed." \ echo "llvm-3.8 is required." \
"Mac users should |brew install llvm38|, Linux varies by distro." "Mac users should |brew install llvm38|," \
exit 1 "Linux users can find it in clang-3.8."
exit 1
fi fi
export LD_LIBRARY_PATH="${LIBCLANG_PATH}" export LD_LIBRARY_PATH="${LIBCLANG_PATH}"
export DYLD_LIBRARY_PATH="${LIBCLANG_PATH}" export DYLD_LIBRARY_PATH="${LIBCLANG_PATH}"
# Check for multirust
if [[ ! -x "$(command -v multirust)" ]]; then
echo "multirust must be installed."
exit 1
fi
# Don't try to clone twice. # Don't try to clone twice.
if [[ ! -d rust-bindgen ]]; then if [[ ! -d rust-bindgen ]]; then
git clone https://github.com/servo/rust-bindgen.git git clone https://github.com/servo/rust-bindgen.git
fi fi
cd rust-bindgen cd rust-bindgen
multirust override nightly
cargo build --features llvm_stable cargo build --features llvm_stable