Split out the FFI bindings.

Also, make some of modules in some of the libraries private, so that globs
work.

Author: SiegeLordEx

.gitignore

@@ -1 +1,3 @@
 build
+*/target
+*/Cargo.lock

all_crates.py

@@ -0,0 +1,61 @@
+#!/usr/bin/env python
+
+import argparse
+import fileinput
+import re
+from subprocess import Popen
+
+crate_list="""
+allegro-sys
+allegro_image-sys
+allegro_audio-sys
+allegro_acodec-sys
+allegro_dialog-sys
+allegro_primitives-sys
+allegro_font-sys
+allegro_ttf-sys
+allegro
+allegro_image
+allegro_audio
+allegro_acodec
+allegro_dialog
+allegro_primitives
+allegro_font
+allegro_ttf
+examples
+"""
+
+parser = argparse.ArgumentParser(description='Perform an operation on all crates.')
+parser.add_argument('--version', metavar='VERSION', default='', help='set the version to VERSION')
+parser.add_argument('--publish', action='store_true', help='publish the crates')
+parser.add_argument('--build', action='store_true', help='build the crates')
+parser.add_argument('--clean', action='store_true', help='clean the crates')
+
+args = parser.parse_args()
+
+crate_list = crate_list.split('\n')
+crate_list = filter(lambda crate: len(crate) > 0, crate_list)
+
+if len(args.version) > 0:
+	for crate in crate_list:
+		cargo_toml = crate + '/Cargo.toml'
+		print 'Processing', cargo_toml
+
+		for line in fileinput.input(cargo_toml, inplace=1):
+			line = re.sub('version = "(=?).*" #auto', 'version = "\g<1>' + args.version + '" #auto', line)
+			print line,
+
+if args.publish:
+	for crate in crate_list:
+		print 'Publishing', crate
+		Popen(['cargo', 'publish'], cwd=crate).communicate()
+
+if args.build:
+	for crate in crate_list:
+		print 'Building', crate
+		Popen(['cargo', 'build'], cwd=crate).communicate()
+
+if args.clean:
+	for crate in crate_list:
+		print 'Cleaning', crate
+		Popen(['cargo', 'clean'], cwd=crate).communicate()

allegro-sys/Cargo.toml

@@ -0,0 +1,24 @@
+[package]
+
+name = "allegro-sys"
+version = "0.0.1" #auto
+license = "Zlib"
+repository = "https://github.com/SiegeLord/RustAllegro"
+documentation = "http://siegelord.github.io/RustAllegro/doc/allegro-sys/index.html"
+keywords = ["input", "windowing", "opengl", "direct3d"]
+authors = [ "SiegeLord <[email protected]>" ]
+description = "Allegro 5 core library Rust binding"
+build = "build.rs"
+links = "allegro"
+
+[lib]
+
+name = "allegro-sys"
+path = "src/lib.rs"
+
+[features]
+
+link_none = []
+link_monolith = []
+link_debug = []
+link_static = []

allegro-sys/build.rs

@@ -0,0 +1,33 @@
+// Copyright (c) 2014 by SiegeLord
+//
+// All rights reserved. Distributed under ZLib. For full terms see the file LICENSE.
+
+use std::os::getenv;
+
+fn main()
+{
+	if getenv("CARGO_FEATURE_LINK_NONE").is_some()
+	{
+		return;
+	}
+
+	let debug = match getenv("CARGO_FEATURE_LINK_DEBUG")
+	{
+		None => "",
+		Some(_) => "-debug"
+	};
+
+	let static_ = match getenv("CARGO_FEATURE_LINK_STATIC")
+	{
+		None => "",
+		Some(_) => "-static"
+	};
+
+	let monolith = match getenv("CARGO_FEATURE_LINK_MONOLITH")
+	{
+		None => "",
+		Some(_) => "-monolith"
+	};
+
+	println!("cargo:rustc-flags=-l allegro{}{}{}", monolith, static_, debug);
+}

allegro/src/ffi/altime.rs renamed to allegro-sys/src/altime.rs

@@ -4,7 +4,7 @@
 
 use libc::*;
 
-use ffi::color::ALLEGRO_COLOR;
+use color::ALLEGRO_COLOR;
 use rust_util::c_bool;
 
 opaque!(ALLEGRO_BITMAP);

allegro/src/ffi/base.rs renamed to allegro-sys/src/base.rs

@@ -4,8 +4,8 @@
 
 use libc::*;
 
-use ffi::bitmap::*;
-use ffi::color::*;
+use bitmap::*;
+use color::*;
 
 pub const ALLEGRO_FLIP_HORIZONTAL: u32 = 1;
 pub const ALLEGRO_FLIP_VERTICAL: u32 = 2;

allegro/src/ffi/bitmap.rs renamed to allegro-sys/src/bitmap.rs

@@ -4,7 +4,7 @@
 
 use libc::*;
 
-use ffi::bitmap::*;
+use bitmap::*;
 use rust_util::c_bool;
 
 pub type ALLEGRO_IIO_LOADER_FUNCTION =  extern "C" fn(arg1: *const c_char) -> *mut ALLEGRO_BITMAP;

allegro/src/ffi/bitmap_draw.rs renamed to allegro-sys/src/bitmap_draw.rs

@@ -4,8 +4,8 @@
 
 use libc::*;
 
-use ffi::events::ALLEGRO_EVENT_SOURCE;
-use ffi::bitmap::ALLEGRO_BITMAP;
+use events::ALLEGRO_EVENT_SOURCE;
+use bitmap::ALLEGRO_BITMAP;
 use rust_util::c_bool;
 
 pub const ALLEGRO_WINDOWED: u32                  = 1 << 0;

allegro/src/ffi/bitmap_io.rs renamed to allegro-sys/src/bitmap_io.rs

@@ -4,7 +4,7 @@
 
 use libc::*;
 
-use ffi::color::*;
+use color::*;
 
 extern "C"
 {

allegro/src/ffi/color.rs renamed to allegro-sys/src/color.rs

@@ -9,12 +9,12 @@ use std::mem;
 
 use rust_util::c_bool;
 
-use ffi::altime::ALLEGRO_TIMEOUT;
-use ffi::display::ALLEGRO_DISPLAY;
-use ffi::keyboard::ALLEGRO_KEYBOARD;
-use ffi::mouse::ALLEGRO_MOUSE;
-use ffi::joystick::ALLEGRO_JOYSTICK;
-use ffi::timer::ALLEGRO_TIMER;
+use altime::ALLEGRO_TIMEOUT;
+use display::ALLEGRO_DISPLAY;
+use keyboard::ALLEGRO_KEYBOARD;
+use mouse::ALLEGRO_MOUSE;
+use joystick::ALLEGRO_JOYSTICK;
+use timer::ALLEGRO_TIMER;
 
 #[repr(C)]
 #[deriving(Copy)]

allegro/src/ffi/display.rs renamed to allegro-sys/src/display.rs

@@ -5,7 +5,7 @@
 use libc::*;
 use rust_util::c_bool;
 
-use ffi::events::ALLEGRO_EVENT_SOURCE;
+use events::ALLEGRO_EVENT_SOURCE;
 
 opaque!(ALLEGRO_JOYSTICK);
 

allegro/src/ffi/drawing.rs renamed to allegro-sys/src/drawing.rs

@@ -6,8 +6,8 @@
 
 use libc::*;
 
-use ffi::events::ALLEGRO_EVENT_SOURCE;
-use ffi::display::ALLEGRO_DISPLAY;
+use events::ALLEGRO_EVENT_SOURCE;
+use display::ALLEGRO_DISPLAY;
 use rust_util::c_bool;
 
 opaque!(ALLEGRO_KEYBOARD);

allegro/src/ffi/events.rs renamed to allegro-sys/src/events.rs

@@ -0,0 +1,55 @@
+// Copyright (c) 2014 by SiegeLord
+//
+// All rights reserved. Distributed under ZLib. For full terms see the file LICENSE.
+
+#![crate_name="allegro-sys"]
+
+#![crate_type = "lib"]
+#![feature(globs)]
+#![feature(macro_rules)]
+#![allow(non_camel_case_types)]
+
+extern crate libc;
+
+pub use altime::*;
+pub use base::*;
+pub use bitmap::*;
+pub use bitmap_draw::*;
+pub use bitmap_io::*;
+pub use color::*;
+pub use display::*;
+pub use drawing::*;
+pub use events::*;
+pub use joystick::*;
+pub use keyboard::*;
+pub use keycodes::*;
+pub use monitor::*;
+pub use mouse::*;
+pub use utf8::*;
+pub use system::*;
+pub use timer::*;
+pub use transformations::*;
+
+#[macro_escape]
+mod macros;
+mod rust_util;
+
+pub mod altime;
+pub mod base;
+pub mod color;
+pub mod bitmap;
+pub mod bitmap_draw;
+pub mod bitmap_io;
+pub mod display;
+pub mod drawing;
+pub mod events;
+pub mod joystick;
+pub mod keyboard;
+pub mod keycodes;
+pub mod monitor;
+pub mod mouse;
+pub mod path;
+pub mod utf8;
+pub mod system;
+pub mod timer;
+pub mod transformations;

allegro/src/ffi/joystick.rs renamed to allegro-sys/src/joystick.rs

@@ -5,8 +5,8 @@
 #![allow(raw_pointer_deriving)]
 
 use libc::*;
-use ffi::display::ALLEGRO_DISPLAY;
-use ffi::events::ALLEGRO_EVENT_SOURCE;
+use display::ALLEGRO_DISPLAY;
+use events::ALLEGRO_EVENT_SOURCE;
 use rust_util::c_bool;
 
 opaque!(ALLEGRO_MOUSE);

allegro/src/ffi/keyboard.rs renamed to allegro-sys/src/keyboard.rs

@@ -0,0 +1 @@
+../../src/rust_util.rs

allegro/src/ffi/keycodes.rs renamed to allegro-sys/src/keycodes.rs

@@ -4,7 +4,7 @@
 
 use libc::*;
 
-use ffi::path::*;
+use path::*;
 use rust_util::c_bool;
 
 opaque!(ALLEGRO_SYSTEM);

allegro-sys/src/lib.rs

@@ -5,7 +5,7 @@
 use libc::*;
 use rust_util::c_bool;
 
-use ffi::events::ALLEGRO_EVENT_SOURCE;
+use events::ALLEGRO_EVENT_SOURCE;
 
 opaque!(ALLEGRO_TIMER);
 

allegro_primitives/src/macros.rs renamed to allegro-sys/src/macros.rs

@@ -13,3 +13,15 @@ description = "Allegro 5 core library Rust wrapper"
 
 name = "allegro"
 path = "src/lib.rs"
+
+[features]
+
+link_none = ["allegro-sys/link_none"]
+link_monolith = ["allegro-sys/link_monolith"]
+link_debug = ["allegro-sys/link_debug"]
+link_static = ["allegro-sys/link_static"]
+
+[dependencies.allegro-sys]
+
+path = "../allegro-sys"
+version = "=0.0.1" #auto

allegro/src/ffi/monitor.rs renamed to allegro-sys/src/monitor.rs

@@ -10,6 +10,7 @@
 #![feature(unsafe_destructor)]
 
 extern crate libc;
+extern crate "allegro-sys" as ffi;
 
 pub use internal::bitmap::external::*;
 pub use internal::bitmap_like::*;
@@ -24,18 +25,9 @@ pub use internal::timer::*;
 pub use internal::transformations::external::*;
 pub use rust_util::*;
 
-#[cfg(not(manual_link))]
-mod link_name
-{
-	#[link(name = "allegro")]
-	extern "C" {}
-}
-
 #[macro_escape]
-pub mod macros;
-
-pub mod rust_util;
-pub mod ffi;
+mod macros;
+mod rust_util;
 
 mod internal
 {