Merge pull request #21 from mlubin/master

use BinDeps and WinRPM on windows

Author: quinnj

REQUIRE

@@ -1,4 +1,6 @@
 julia 0.2-
 DataFrames
 DataArrays
-BinDeps
+BinDeps
+@osx Homebrew
+@windows WinRPM

deps/build.jl

@@ -2,7 +2,7 @@ using BinDeps
 
 @BinDeps.setup
 
-deps = [sqlite3_lib = library_dependency("sqlite3_lib", aliases=["sqlite3","sqlite3-64","libsqlite3"])]
+deps = [sqlite3_lib = library_dependency("sqlite3_lib", aliases=["sqlite3","sqlite3-64","libsqlite3","libsqlite3-0"])]
 
 @osx_only begin
   using Homebrew
@@ -13,6 +13,9 @@ end
   provides(AptGet, {"sqlite3" => sqlite3_lib})
 end
 
-provides(Binaries, {URI("http://drive.google.com/uc?export=download&id=0B6x_qYLl89S0TnAxS1Jtd3g3QkU") => sqlite3_lib}, os = :Windows)
+@windows_only begin
+  using WinRPM
+  provides(WinRPM.RPM,"libsqlite",sqlite3_lib, os = :Windows)
+end
 
-@BinDeps.install
+@BinDeps.install [:sqlite3_lib => :sqlite3_lib ]

src/SQLite_consts.jl

@@ -1,25 +1,4 @@
-#http://blog.synopse.info/post/2013/03/23/Latest-version-of-sqlite3.dll-for-Windows-64-bit
-#Link to Sqlite shared library (system-dependent)
-let
-    global sqlite3_lib
-    local lib
-    succeeded=false
-    @linux_only lib_choices = ["libsqlite3"]
-    @windows_only WORD_SIZE == 64 && (lib_choices = [Pkg.dir() * "\\SQLite\\lib\\sqlite3-64"])
-    @windows_only WORD_SIZE != 64 && (lib_choices = [Pkg.dir() * "\\SQLite\\lib\\sqlite3"])
-    @osx_only lib_choices = ["/usr/lib/libsqlite3.dylib", Pkg.dir() * "/SQLite/lib/libsqlite3"]
-    for lib in lib_choices 
-        try
-            dlopen(lib)
-            succeeded=true
-            break
-        end
-    end
-    if !succeeded error("SQLite library not found") end
-    @eval const sqlite3_lib = $lib
-end
-
-# const sqlite3_lib = "C:/Users/karbarcca/Google Drive/Dropbox/Dropbox/GitHub/sqlite.jl/lib/sqlite3-64"
+include("../deps/deps.jl")
 
 #Macros
 macro SUCCEEDED(func)