Nuke Cairo

This commit is contained in:
Patrick Walton 2013-04-05 13:30:35 -07:00
parent ebff681efb
commit b399b157ed
6 changed files with 4 additions and 60 deletions

26
configure vendored
View file

@ -414,18 +414,10 @@ else
LIBTOOLIZE=libtoolize
fi
PIXMAN_ACLOCALCMD="aclocal ${OSX_PKG_CONFIG_M4_MACROS}"
CAIRO_ACLOCALCMD="aclocal ${OSX_PKG_CONFIG_M4_MACROS} -Ibuild"
AUTOCMD="${LIBTOOLIZE} && autoconf && autoheader && automake --add-missing --copy --force"
# Copied from cairo's autogen.sh. Build fails without
CAIRO_BOILERPLATE="touch boilerplate/Makefile.am.features && touch src/Makefile.am.features"
PIXMAN_AUTOCMD="${PIXMAN_ACLOCALCMD} && ${AUTOCMD}"
CAIRO_AUTOCMD="${CAIRO_BOILERPLATE} && ${CAIRO_ACLOCALCMD} && ${AUTOCMD}"
(cd ${CFG_SRC_DIR}src/pixman && eval ${PIXMAN_AUTOCMD}) || exit $?
(cd ${CFG_SRC_DIR}src/cairo && eval ${CAIRO_AUTOCMD}) || exit $?
CFG_SUBMODULES="libwapcaplet rust-wapcaplet rust-harfbuzz rust-opengles skia rust-azure rust-cairo rust-stb-image rust-geom rust-glut rust-layers rust-http-client libparserutils libhubbub libcss rust-netsurfcss rust-css rust-hubbub sharegl rust-mozjs mozjs pixman cairo"
CFG_SUBMODULES="libwapcaplet rust-wapcaplet rust-harfbuzz rust-opengles skia rust-azure rust-stb-image rust-geom rust-glut rust-layers rust-http-client libparserutils libhubbub libcss rust-netsurfcss rust-css rust-hubbub sharegl rust-mozjs mozjs"
if [ $CFG_OSTYPE = "apple-darwin" ]
then
@ -496,23 +488,11 @@ do
CONFIGURE_SCRIPT="${CFG_SRC_DIR}src/${i}/js/src/configure"
fi
# needed because Azure's configure wants "--enable-cairo --enable-skia"
# needed because Azure's configure wants "--enable-skia"
CONFIGURE_ARGS=""
ENV_VARS=""
if [ $i = "rust-azure" ]; then
CONFIGURE_ARGS="--enable-cairo --enable-skia"
fi
# libpng isn't available by default on OS X so don't make it required for cairo
# png is in turn required for the svg backend
if [ $i = "cairo" -a ${CFG_OSTYPE} = "apple-darwin" ]; then
CONFIGURE_ARGS="--enable-png=no --enable-svg=no --enable-ft=no --enable-xlib=no"
fi
# Tell pkg-config that the pixman library is in-tree
if [ $i = "cairo" ]; then
export PKG_CONFIG_PATH=../pixman
else
export PKG_CONFIG_PATH=
CONFIGURE_ARGS="--enable-skia"
fi
if [ -f ${CONFIGURE_SCRIPT} ]

View file

@ -1,8 +1,6 @@
# Tests for these submodules will not be run by the default `make check` target.
SLOW_TESTS += \
mozjs \
pixman \
cairo \
$(NULL)
# These submodules will not be cleaned by the `make clean-fast` target.
@ -13,8 +11,6 @@ SLOW_BUILDS += \
mozjs \
sharegl \
skia \
pixman \
cairo \
$(NULL)
# Builds that do not require rustc
@ -25,8 +21,6 @@ NATIVE_BUILDS += \
libwapcaplet \
mozjs \
skia \
pixman \
cairo \
$(NULL)
# NOTE: the make magic can only compute transitive build dependencies,
@ -35,13 +29,8 @@ NATIVE_BUILDS += \
# NB. This should not be a problem once a real package system exists.
DEPS_rust-cairo += \
cairo \
$(NULL)
DEPS_rust-azure += \
rust-geom \
rust-cairo \
skia \
$(NULL)
@ -51,7 +40,6 @@ DEPS_rust-glut += \
DEPS_rust-layers += \
rust-azure \
rust-cairo \
rust-geom \
rust-glut \
rust-opengles \
@ -102,14 +90,6 @@ DEPS_libcss += \
libparserutils \
$(NULL)
DONE_pixman = "$(B)src/pixman/pixman/.libs/libpixman-1.a"
DONE_cairo = "$(B)src/cairo/src/.libs/libcairo.a"
DEPS_cairo += \
pixman \
$(NULL)
# Platform-specific dependencies
ifeq ($(CFG_OSTYPE),apple-darwin)
DEPS_rust-azure += \
@ -119,11 +99,6 @@ DEPS_rust-azure += \
skia \
$(NULL)
DEPS_rust-cairo += \
rust-core-foundation \
rust-core-graphics \
$(NULL)
DEPS_rust-io-surface += \
rust-core-foundation \
$(NULL)
@ -152,12 +127,6 @@ endif
ifeq ($(CFG_OSTYPE),unknown-linux-gnu)
DEPS_rust-cairo += \
rust-freetype \
rust-fontconfig \
rust-xlib \
$(NULL)
DEPS_rust-azure += \
rust-freetype \
rust-fontconfig \

View file

@ -16,7 +16,6 @@ These are the main servo projects, as well as projects that are pure Rust (not b
## Third-party projects
* _cairo_ - The cairo rendering library
* _libcss_ - The CSS library from the NetSurf web browser. We are using this for parsing
and selector matching until we have a Rust solution
* _libhubbub_ - The HTML parser from the NetSurf web browser. We are using this for parsing
@ -24,7 +23,6 @@ These are the main servo projects, as well as projects that are pure Rust (not b
* _libparserutils_ - A parsing library used by libcss and libhubbub
* _libwapcaplet_ - A string internment library used by libcss and libhubbub
* _mozjs_ - The SpiderMonkey JavaScript engine, forked from mozilla-central
* _pixman_ - Pixel manipulation library (used by cairo)
* _rust-azure_ - mozilla-central's 2D vector graphics abstraction layer and bindings
* _rust-harfbuzz_ - The harfbuzz text shaping library and bindings
* _rust-stb-image_ - The stb_image library and bindings. We are using this for image decoding
@ -33,7 +31,6 @@ These are the main servo projects, as well as projects that are pure Rust (not b
## Library bindings
* _rust-cairo_ - Bindings to the cairo drawing library, a backend for Azure
* _rust-cocoa_ - Bindings to OS X's Cocoa framework
* _rust-core-foundation_ - Bindings to OS X's Core Foundation framework
* _rust-core-graphics_ - Bindings to OS X's Core Graphics framework, a backend for Azure

View file

@ -62,7 +62,7 @@ pub fn from_cmdline_args(args: &[~str]) -> Opts {
fail!(~"unknown backend type")
}
}
None => CairoBackend
None => SkiaBackend
};
let tile_size: uint = match getopts::opt_maybe_str(&opt_match, ~"s") {

View file

@ -5,7 +5,6 @@
#[crate_type = "lib"];
extern mod azure;
extern mod cairo;
extern mod geom;
extern mod http_client;
extern mod stb_image;

View file

@ -10,7 +10,6 @@
#[legacy_records];
extern mod azure;
extern mod cairo;
extern mod geom;
extern mod gfx (name = "servo_gfx");
extern mod glut;