From aad67d1b3c49d6ff576dd1c5686cb25f9a9e9fe3 Mon Sep 17 00:00:00 2001 From: Jan Niklas Hasse Date: Mon, 9 Dec 2013 20:09:25 +0100 Subject: [PATCH] Use rustpkg (see #15). Make is still needed for codegen --- .gitignore | 4 ++++ Makefile | 32 ++++++++++++++++------------- README.md | 4 ++-- src/codegen/{codegen.rs => main.rs} | 0 demo/demo.rc => src/demo/main.rs | 0 {demo => src/demo}/video.rs | 0 src/{ => sdl2}/controller.rs | 0 src/{ => sdl2}/event.rs | 0 src/{ => sdl2}/gesture.rs | 0 src/{ => sdl2}/joystick.rs | 0 src/{ => sdl2}/keyboard.rs | 0 src/{sdl2.rc => sdl2/lib.rs} | 5 ++--- src/{ => sdl2}/mouse.rs | 0 src/{ => sdl2}/pixels.rs | 0 src/{ => sdl2}/rect.rs | 0 src/{ => sdl2}/render.rs | 0 src/{ => sdl2}/rwops.rs | 0 src/{ => sdl2}/sdl.rs | 0 src/{ => sdl2}/surface.rs | 0 src/{ => sdl2}/timer.rs | 0 src/{ => sdl2}/touch.rs | 0 src/{ => sdl2}/video.rs | 0 22 files changed, 26 insertions(+), 19 deletions(-) rename src/codegen/{codegen.rs => main.rs} (100%) rename demo/demo.rc => src/demo/main.rs (100%) rename {demo => src/demo}/video.rs (100%) rename src/{ => sdl2}/controller.rs (100%) rename src/{ => sdl2}/event.rs (100%) rename src/{ => sdl2}/gesture.rs (100%) rename src/{ => sdl2}/joystick.rs (100%) rename src/{ => sdl2}/keyboard.rs (100%) rename src/{sdl2.rc => sdl2/lib.rs} (91%) rename src/{ => sdl2}/mouse.rs (100%) rename src/{ => sdl2}/pixels.rs (100%) rename src/{ => sdl2}/rect.rs (100%) rename src/{ => sdl2}/render.rs (100%) rename src/{ => sdl2}/rwops.rs (100%) rename src/{ => sdl2}/sdl.rs (100%) rename src/{ => sdl2}/surface.rs (100%) rename src/{ => sdl2}/timer.rs (100%) rename src/{ => sdl2}/touch.rs (100%) rename src/{ => sdl2}/video.rs (100%) diff --git a/.gitignore b/.gitignore index c83f90a2..a25a6ca2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,5 @@ +.rust/ +build/ +bin/ +lib/ src/generated diff --git a/Makefile b/Makefile index b72bef0b..532f55ef 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,8 @@ -RUSTC ?= rustc RUSTFLAGS ?= RUST_SRC = $(shell find src/. -type f -name '*.rs') \ - src/generated/keycode.rs \ - src/generated/scancode.rs + src/sdl2/generated/keycode.rs \ + src/sdl2/generated/scancode.rs .PHONY: all all: libsdl2.dummy @@ -28,24 +27,29 @@ ifeq ($(UNAME),Darwin) endif endif -src/codegen/codegen: $(wildcard src/codegen/*.rs) - $(RUSTC) $(RUSTFLAGS) $@.rs +bin/codegen: $(wildcard src/codegen/*.rs) + rustpkg install codegen $(RUSTFLAGS) -src/generated/%.rs: src/codegen/codegen - src/codegen/codegen $(patsubst src/generated/%,%,$@) src/generated/ +src/sdl2/generated/%.rs: bin/codegen + bin/codegen $(patsubst src/sdl2/generated/%,%,$@) src/sdl2/generated/ -libsdl2.dummy: src/sdl2.rc $(RUST_SRC) - $(RUSTC) $(RUSTFLAGS) $< -o $@ +libsdl2.dummy: src/sdl2/lib.rs $(RUST_SRC) + rustpkg build sdl2 $(RUSTFLAGS) touch $@ -demos: demo/demo.rc demo/video.rs libsdl2.dummy - $(RUSTC) -L . $< -o $@ +demos: src/demo/main.rs src/demo/video.rs libsdl2.dummy + rustpkg install demo demo: demos - ./demos + ./bin/demo .PHONY: clean clean: - rm -f *.so *.dylib *.dll *.dummy demos src/codegen/codegen - rm -rf *.dSYM src/generated/ src/codegen/codegen.dSYM + rustpkg clean codegen + rustpkg uninstall codegen + rustpkg clean sdl2 + rustpkg clean demo + rustpkg uninstall demo + rm -f *.dummy + rm -rf src/sdl2/generated diff --git a/README.md b/README.md index a1d35a47..ad5cf866 100644 --- a/README.md +++ b/README.md @@ -30,12 +30,12 @@ Clone this repo run `make`. To see an example of the code in use, *make demos*. To compile the demo: -> rustc -L$PWD/src demo/demo.rc +> rustpkg install demo Then run: -> ./demo/demo +> ./bin/demo Or you could instead just use diff --git a/src/codegen/codegen.rs b/src/codegen/main.rs similarity index 100% rename from src/codegen/codegen.rs rename to src/codegen/main.rs diff --git a/demo/demo.rc b/src/demo/main.rs similarity index 100% rename from demo/demo.rc rename to src/demo/main.rs diff --git a/demo/video.rs b/src/demo/video.rs similarity index 100% rename from demo/video.rs rename to src/demo/video.rs diff --git a/src/controller.rs b/src/sdl2/controller.rs similarity index 100% rename from src/controller.rs rename to src/sdl2/controller.rs diff --git a/src/event.rs b/src/sdl2/event.rs similarity index 100% rename from src/event.rs rename to src/sdl2/event.rs diff --git a/src/gesture.rs b/src/sdl2/gesture.rs similarity index 100% rename from src/gesture.rs rename to src/sdl2/gesture.rs diff --git a/src/joystick.rs b/src/sdl2/joystick.rs similarity index 100% rename from src/joystick.rs rename to src/sdl2/joystick.rs diff --git a/src/keyboard.rs b/src/sdl2/keyboard.rs similarity index 100% rename from src/keyboard.rs rename to src/sdl2/keyboard.rs diff --git a/src/sdl2.rc b/src/sdl2/lib.rs similarity index 91% rename from src/sdl2.rc rename to src/sdl2/lib.rs index d89fbc33..bb853ff2 100644 --- a/src/sdl2.rc +++ b/src/sdl2/lib.rs @@ -1,11 +1,11 @@ #[link(name = "sdl2", + package_id = "sdl2", vers = "0.0.1", uuid = "263e35b2-0727-11e3-b3dd-29219a890b3c", url = "http://github.com/AngryLawyer/rust-sdl2")]; -#[comment = "SDL2 bindings"]; +#[desc = "SDL2 bindings"]; #[license = "MIT"]; -#[crate_type = "lib"]; #[feature(globs)]; #[feature(link_args)]; @@ -31,4 +31,3 @@ pub mod timer; pub mod render; pub mod rwops; pub mod sdl; - diff --git a/src/mouse.rs b/src/sdl2/mouse.rs similarity index 100% rename from src/mouse.rs rename to src/sdl2/mouse.rs diff --git a/src/pixels.rs b/src/sdl2/pixels.rs similarity index 100% rename from src/pixels.rs rename to src/sdl2/pixels.rs diff --git a/src/rect.rs b/src/sdl2/rect.rs similarity index 100% rename from src/rect.rs rename to src/sdl2/rect.rs diff --git a/src/render.rs b/src/sdl2/render.rs similarity index 100% rename from src/render.rs rename to src/sdl2/render.rs diff --git a/src/rwops.rs b/src/sdl2/rwops.rs similarity index 100% rename from src/rwops.rs rename to src/sdl2/rwops.rs diff --git a/src/sdl.rs b/src/sdl2/sdl.rs similarity index 100% rename from src/sdl.rs rename to src/sdl2/sdl.rs diff --git a/src/surface.rs b/src/sdl2/surface.rs similarity index 100% rename from src/surface.rs rename to src/sdl2/surface.rs diff --git a/src/timer.rs b/src/sdl2/timer.rs similarity index 100% rename from src/timer.rs rename to src/sdl2/timer.rs diff --git a/src/touch.rs b/src/sdl2/touch.rs similarity index 100% rename from src/touch.rs rename to src/sdl2/touch.rs diff --git a/src/video.rs b/src/sdl2/video.rs similarity index 100% rename from src/video.rs rename to src/sdl2/video.rs