Switch over to Makefile based builds

Rustpkg is not really usable

Author: sfackler

.gitignore

@@ -1,4 +1,2 @@
-/.rust/
 /doc/
-/test
-/rust-postgres
+/build/

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "submodules/rust-openssl"]
+	path = submodules/rust-openssl
+	url = git://github.com/sfackler/rust-openssl

.travis.yml

@@ -9,4 +9,4 @@ before_script:
   - ./travis/setup.sh
 script:
   - make
-  - make test
+  - make check

Makefile

@@ -1,15 +1,41 @@
-RUSTPKG ?= rustpkg
-RUSTC ?= rustc
-RUST_FLAGS ?= -Z debug-info -O
+export RUSTC = rustc
+BUILDDIR = build
+export RUSTFLAGS = -O -Z debug-info
 
-all:
-	$(RUSTPKG) $(RUST_FLAGS) install
+POSTGRES_LIB = lib.rs
+POSTGRES = $(BUILDDIR)/$(shell $(RUSTC) --crate-file-name $(POSTGRES_LIB))
+POSTGRES_TEST = $(BUILDDIR)/$(shell $(RUSTC) --test --crate-file-name $(POSTGRES_LIB))
+OPENSSL_DIR = submodules/rust-openssl
+OPENSSL = $(OPENSSL_DIR)/$(shell $(MAKE) -s -C $(OPENSSL_DIR) print-target)
 
-test:
-	$(RUSTC) $(RUST_FLAGS) --test lib.rs
-	./rust-postgres
+all: $(POSTGRES)
 
-.PHONY: test
+-include $(BUILDDIR)/postgres.d
+-include $(BUILDDIR)/postgres_test.d
+
+$(BUILDDIR):
+	mkdir -p $@
+
+$(BUILDDIR)/rust-openssl-trigger: submodules/rust-openssl-trigger | $(BUILDDIR)
+	git submodule init
+	git submodule update
+	touch $@
+
+$(OPENSSL): $(BUILDDIR)/rust-openssl-trigger | $(BUILDDIR)
+	$(MAKE) -C $(OPENSSL_DIR)
+
+$(POSTGRES): $(POSTGRES_LIB) $(OPENSSL) | $(BUILDDIR)
+	$(RUSTC) $(RUSTFLAGS) --dep-info $(@D)/postgres.d --out-dir $(@D) \
+		-L $(dir $(OPENSSL)) $<
+
+$(POSTGRES_TEST): $(POSTGRES_LIB) $(OPENSSL) | $(BUILDDIR)
+	$(RUSTC) $(RUSTFLAGS) --dep-info $(@D)/postgres_test.d --out-dir $(@D) \
+		-L $(dir $(OPENSSL)) --test $<
+
+check: $(POSTGRES_TEST)
+	$<
 
 clean:
-	rm -rf .rust rust-postgres rust-postgres.dSYM
+	rm -rf $(BUILDDIR)
+
+.PHONY: all check clean

lib.rs

@@ -55,7 +55,7 @@ fn main() {
 ```
  */
 
-#[crate_id="github.com/sfackler/rust-postgres"];
+#[crate_id="github.com/sfackler/rust-postgres#postgres:0.0"];
 #[crate_type="lib"];
 #[doc(html_root_url="http://sfackler.github.io/rust-postgres/doc/")];
 
@@ -65,7 +65,7 @@ fn main() {
 #[macro_escape];
 
 extern mod extra;
-extern mod openssl = "github.com/sfackler/rust-openssl";
+extern mod openssl;
 
 use extra::container::Deque;
 use extra::hex::ToHex;

submodules/rust-openssl

@@ -0,0 +1 @@
+Sat Jan 18 13:39:47 PST 2014