Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move the sample app from sample/src/main.rs to webrender/examples/basic.rs #1160

Merged
merged 1 commit into from Apr 24, 2017
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

Move the sample app from sample/src/main to webrender/examples/basic.rs

  • Loading branch information
staktrace committed Apr 24, 2017
commit 1d733a23fabe7153b8e8cea2c1976cc2b49a73d5
@@ -28,7 +28,5 @@ script:
- if [ $BUILD_KIND = DEBUG ]; then (cd webrender_traits && cargo test --verbose); fi
- if [ $BUILD_KIND = DEBUG ]; then (cd webrender && cargo build --verbose --no-default-features); fi
- if [ $BUILD_KIND = DEBUG ]; then (cd webrender && cargo test --verbose); fi
- if [ $BUILD_KIND = DEBUG ]; then (cd sample && cargo test --verbose); fi
- if [ $BUILD_KIND = DEBUG ]; then (cd sample && cargo build --verbose --features=profiler); fi
- if [ $BUILD_KIND = DEBUG ]; then (cd wrench && cargo test --verbose); fi
- if [ $BUILD_KIND = RELEASE ]; then (cd wrench && python headless.py --subpixel-aa reftest); fi

Some generated files are not rendered by default. Learn more.

@@ -2,7 +2,6 @@
members = [
"webrender",
"webrender_traits",
"sample",
"wrench",
]

@@ -15,7 +15,5 @@ test_script:
- cargo test --verbose
- cd ../webrender
- cargo test --verbose
- cd ../sample
- cargo test --verbose
- cd ../wrench
- cargo test --verbose

This file was deleted.

@@ -33,6 +33,7 @@ thread_profiler = "0.1.1"

[dev-dependencies]
angle = {git = "https://github.com/servo/angle", branch = "servo"}
servo-glutin = "0.10.1" # for the example apps

[target.'cfg(any(target_os = "android", all(unix, not(target_os = "macos"))))'.dependencies]
freetype = { version = "0.2", default-features = false }
@@ -43,3 +44,6 @@ dwrote = "0.3"
[target.'cfg(target_os = "macos")'.dependencies]
core-graphics = "0.7.0"
core-text = "4.0"

[[example]]
name = "basic"
File renamed without changes.
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.