зеркало из https://github.com/mozilla/gecko-dev.git
servo: Remove rust-sdl, ragel, harfbuzz submodules
Source-Repo: https://github.com/servo/servo Source-Revision: e908ea616137355a203f46bc0d44f5a15254e71a
This commit is contained in:
Родитель
6a54bcb6bb
Коммит
a028a214f3
|
@ -21,7 +21,6 @@ RUSTLIBS = \
|
||||||
-L src/rust-harfbuzz \
|
-L src/rust-harfbuzz \
|
||||||
-L src/rust-mozjs \
|
-L src/rust-mozjs \
|
||||||
-L src/rust-azure \
|
-L src/rust-azure \
|
||||||
-L src/rust-sdl \
|
|
||||||
-L src/rust-cocoa \
|
-L src/rust-cocoa \
|
||||||
-L src/rust-stb-image \
|
-L src/rust-stb-image \
|
||||||
-L src/rust-geom \
|
-L src/rust-geom \
|
||||||
|
@ -63,7 +62,6 @@ SERVO_DEPS += \
|
||||||
src/rust-harfbuzz/libharfbuzz.dummy \
|
src/rust-harfbuzz/libharfbuzz.dummy \
|
||||||
src/rust-mozjs/libmozjs.dummy \
|
src/rust-mozjs/libmozjs.dummy \
|
||||||
src/rust-azure/libazure.dummy \
|
src/rust-azure/libazure.dummy \
|
||||||
src/rust-sdl/libsdl.dummy \
|
|
||||||
src/rust-stb-image/libstb-image.dummy \
|
src/rust-stb-image/libstb-image.dummy \
|
||||||
src/rust-geom/libgeom.dummy \
|
src/rust-geom/libgeom.dummy \
|
||||||
src/rust-opengles/libopengles.dummy \
|
src/rust-opengles/libopengles.dummy \
|
||||||
|
@ -75,7 +73,6 @@ SERVO_DEPS += \
|
||||||
CHECK_DEPS += \
|
CHECK_DEPS += \
|
||||||
check-rust-harfbuzz \
|
check-rust-harfbuzz \
|
||||||
check-rust-mozjs \
|
check-rust-mozjs \
|
||||||
check-rust-sdl \
|
|
||||||
check-rust-azure \
|
check-rust-azure \
|
||||||
check-rust-stb-image \
|
check-rust-stb-image \
|
||||||
check-rust-geom \
|
check-rust-geom \
|
||||||
|
@ -90,7 +87,6 @@ CLEAN_DEPS += \
|
||||||
clean-rust-harfbuzz \
|
clean-rust-harfbuzz \
|
||||||
clean-mozjs \
|
clean-mozjs \
|
||||||
clean-rust-mozjs \
|
clean-rust-mozjs \
|
||||||
clean-rust-sdl \
|
|
||||||
clean-rust-azure \
|
clean-rust-azure \
|
||||||
clean-rust-stb-image \
|
clean-rust-stb-image \
|
||||||
clean-rust-geom \
|
clean-rust-geom \
|
||||||
|
@ -126,9 +122,6 @@ src/rust-mozjs/libmozjs.dummy: src/mozjs/libjs_static.a
|
||||||
src/rust-azure/libazure.dummy: $(AZURE_DEPS)
|
src/rust-azure/libazure.dummy: $(AZURE_DEPS)
|
||||||
RUSTFLAGS="$(RUSTFLAGS) -L ../rust-cocoa -L ../rust-geom" $(MAKE) -C src/rust-azure
|
RUSTFLAGS="$(RUSTFLAGS) -L ../rust-cocoa -L ../rust-geom" $(MAKE) -C src/rust-azure
|
||||||
|
|
||||||
src/rust-sdl/libsdl.dummy:
|
|
||||||
$(MAKE) -C src/rust-sdl
|
|
||||||
|
|
||||||
src/rust-cocoa/libcocoa.dummy:
|
src/rust-cocoa/libcocoa.dummy:
|
||||||
$(MAKE) -C src/rust-cocoa
|
$(MAKE) -C src/rust-cocoa
|
||||||
|
|
||||||
|
@ -169,10 +162,6 @@ check-rust-mozjs: src/mozjs/libjs_static.a
|
||||||
check-rust-azure: $(AZURE_DEPS)
|
check-rust-azure: $(AZURE_DEPS)
|
||||||
RUSTFLAGS="$(RUSTFLAGS) -L ../rust-cocoa -L ../rust-geom" $(MAKE) check -C src/rust-azure
|
RUSTFLAGS="$(RUSTFLAGS) -L ../rust-cocoa -L ../rust-geom" $(MAKE) check -C src/rust-azure
|
||||||
|
|
||||||
.PHONY: check-rust-sdl
|
|
||||||
check-rust-sdl:
|
|
||||||
$(MAKE) check -C src/rust-sdl
|
|
||||||
|
|
||||||
.PHONY: check-rust-cocoa
|
.PHONY: check-rust-cocoa
|
||||||
check-rust-cocoa:
|
check-rust-cocoa:
|
||||||
$(MAKE) check -C src/rust-cocoa
|
$(MAKE) check -C src/rust-cocoa
|
||||||
|
@ -221,10 +210,6 @@ clean-rust-mozjs:
|
||||||
clean-rust-azure:
|
clean-rust-azure:
|
||||||
$(MAKE) clean -C src/rust-azure
|
$(MAKE) clean -C src/rust-azure
|
||||||
|
|
||||||
.PHONY: clean-rust-sdl
|
|
||||||
clean-rust-sdl:
|
|
||||||
$(MAKE) clean -C src/rust-sdl
|
|
||||||
|
|
||||||
.PHONY: clean-rust-cocoa
|
.PHONY: clean-rust-cocoa
|
||||||
clean-rust-cocoa:
|
clean-rust-cocoa:
|
||||||
$(MAKE) clean -C src/rust-cocoa
|
$(MAKE) clean -C src/rust-cocoa
|
||||||
|
@ -261,12 +246,10 @@ ifeq ($(OSTYPE),darwin)
|
||||||
|
|
||||||
package: servo
|
package: servo
|
||||||
mkdir -p Servo.app/Contents/MacOS/src/rust-cocoa
|
mkdir -p Servo.app/Contents/MacOS/src/rust-cocoa
|
||||||
mkdir -p Servo.app/Contents/MacOS/src/rust-sdl
|
|
||||||
mkdir -p Servo.app/Contents/MacOS/src/rust-azure
|
mkdir -p Servo.app/Contents/MacOS/src/rust-azure
|
||||||
cp $(VPATH)/Info.plist Servo.app/Contents/
|
cp $(VPATH)/Info.plist Servo.app/Contents/
|
||||||
cp servo Servo.app/Contents/MacOS/
|
cp servo Servo.app/Contents/MacOS/
|
||||||
cp src/rust-cocoa/lib*.dylib Servo.app/Contents/MacOS/src/rust-cocoa/
|
cp src/rust-cocoa/lib*.dylib Servo.app/Contents/MacOS/src/rust-cocoa/
|
||||||
cp src/rust-sdl/lib*.dylib Servo.app/Contents/MacOS/src/rust-sdl/
|
|
||||||
cp src/rust-azure/lib*.dylib Servo.app/Contents/MacOS/src/rust-azure/
|
cp src/rust-azure/lib*.dylib Servo.app/Contents/MacOS/src/rust-azure/
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
|
@ -8,7 +8,6 @@
|
||||||
#[crate_type = "lib"];
|
#[crate_type = "lib"];
|
||||||
|
|
||||||
use std;
|
use std;
|
||||||
use sdl;
|
|
||||||
use azure;
|
use azure;
|
||||||
use js;
|
use js;
|
||||||
use stb_image;
|
use stb_image;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче