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

Auto merge of #6362 - Sumith1896:servobuildexample, r=Manishearth

Browse source 
Entries in the servobuild.example file that are not defaults were
commented out, defaults were mentioned in comments.
Fix to https://github.com/servo/servo/issues/6361

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6362)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-06-12 23:39:01 -06:00
commit 3c1b8041d4
1 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
servobuild.example
View file

@ -17,15 +17,17 @@ cargo-home-dir = "./.cargo"
# rust-root is specified, will make sure that rust-root is in the path # rust-root is specified, will make sure that rust-root is in the path
# when building. Similarly for Cargo. This takes care of PATH as well as # when building. Similarly for Cargo. This takes care of PATH as well as
# [DY]LD_LIBRARY_PATH. # [DY]LD_LIBRARY_PATH.
# rust-root and cargo-root default to <servo-repo>/
system-rust = false system-rust = false
rust-root = "/path/to/rust" #rust-root = "/path/to/rust"
system-cargo = false system-cargo = false
cargo-root = "/path/to/cargo" #cargo-root = "/path/to/cargo"
[build] [build]
# Set "mode = dev" or use `mach build --dev` to build the project with warning. # Set "mode = dev" or use `mach build --dev` to build the project with warning.
# or Set "mode = release" or use `mach build --release` for optimized build. # or Set "mode = release" or use `mach build --release` for optimized build.
mode = "dev" # Defaults to prompting before building
#mode = "dev"
# Set "android = true" or use `mach build --android` to build the Android app. # Set "android = true" or use `mach build --android` to build the Android app.
android = false android = false
# Set "debug-mozjs" or use `mach build --debug-mozjs` to build a debug spidermonkey. # Set "debug-mozjs" or use `mach build --debug-mozjs` to build a debug spidermonkey.
@ -33,13 +35,15 @@ debug-mozjs = false
# Android information # Android information
[android] [android]
sdk = "/opt/android-sdk" # Defaults to the value of $ANDROID_SDK, $ANDROID_NDK, $ANDROID_TOOLCHAIN respectively
ndk = "/opt/android-ndk" #sdk = "/opt/android-sdk"
toolchain = "/opt/android-toolchain" #ndk = "/opt/android-ndk"
#toolchain = "/opt/android-toolchain"
# Gonk information # Gonk information
# Please fill the ndk/toolchain for android too # Please fill the ndk/toolchain for android too
[gonk] [gonk]
# Path to B2G repo and build # Path to B2G repo and build
b2g = "/opt/B2G" # Defaults to the value of $GONKDIR
product = "flame" #b2g = "/opt/B2G"
product = "flame"