dep_selector 1.0.0.alpha.1 → 1.0.0.alpha.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eedf57363ca865a2274f202af0d5c2744d107f0e
-  data.tar.gz: 8b0012e3789d25b4ebca6abdadf95937ab8a7f2f
+  metadata.gz: 8649fd62eb39c437fc17f2c7ed3ac12e3cbd0f17
+  data.tar.gz: b99d4e37b75f12200d9fa69e981b202651aac449
 SHA512:
-  metadata.gz: cd94581cafdd7dc198c84fe25cf21eb5de8112d4f24ed767ef326ddc996d1e61f1bc68eda06f11ed9a872855328c95822e890a0eb0208a55d08052d1fd9c76a6
-  data.tar.gz: a2e9623c53220191aedcbb01ba33a3efe27f1ee5cb7728634172fe7c60393ffa49fdd9905dbd00706e14cf4dd4adff248f9855314e0879ae3ce952528470d1e2
+  metadata.gz: 3d58e22b2f94b5f944b7d0121ca890ae258e699d369b9186fa3c2c7989131f64108d85d5cdfaeb8700fbcde90322591d420542e888efbd6c6f6d756a406d68ad
+  data.tar.gz: d8283e0b999e49288d31db6c6ae670ac12b96598de634a7c904d8424f0381c7f8369848ea0f992ef7b8d8456d240fc27109011035ed0008fb264046d81fe868d

data/ext/dep_gecode/extconf.rb

@@ -24,8 +24,13 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
   # ./configure --with-architectures=i386,x86_64
   # to work properly here.
   require 'mkmf'
+  require 'dep-selector-libgecode'
 
-  # $CFLAGS << "-g"
+  opt_path = DepSelectorLibgecode.opt_path
+  include_path = DepSelectorLibgecode.include_path
+  find_library("gecodesupport", nil, opt_path)
+  # find_header doesn't seem to work for stuff like `gecode/thing.hh`
+  $INCFLAGS << " -I#{include_path}"
 
   gecode_installed =
     # Gecode documentation notes:
@@ -57,21 +62,32 @@ if !defined?(RUBY_ENGINE) || RUBY_ENGINE == 'ruby' || RUBY_ENGINE == 'rbx'
   unless gecode_installed
     STDERR.puts <<EOS
 =========================================================================================
-Gecode >3.5 must be installed (http://www.gecode.org/).
+Gecode ~>3.5 must be installed (http://www.gecode.org/).
 
 OSX:
+  cd $( brew --prefix )
+  git checkout 3c5ca25 Library/Formula/gecode.rb
   brew install gecode
 
-For convenience, we have built Gecode for Debian/Ubuntu (<release> is lucid or maverick):
-  Add the following two lines to /etc/apt/sources.list.d/opscode.list:
-    deb http://apt.opscode.com <release> main
-    deb-src http://apt.opscode.com <release> main
-  Then run:
-    curl http://apt.opscode.com/packages@opscode.com.gpg.key | sudo apt-key add -
-    sudo apt-get update
-    sudo apt-get install libgecode-dev
+Debian and Ubuntu:
+  sudo apt-get install libgecode-dev
+
+Build from source:
+  Get gecode 3.7.3 source:
+    curl -O http://www.gecode.org/download/gecode-3.7.3.tar.gz
+  Unpack it:
+    tar zxvf gecode-3.7.3.tar.gz
+  Build:
+    ./configure --disable-doc-dot \
+           --disable-doc-search \
+           --disable-doc-tagfile \
+           --disable-doc-chm \
+           --disable-doc-docset \
+           --disable-qt \
+           --disable-examples
+    make
+    (sudo) make install
 
-Other distributions can build from source.
 =========================================================================================
 EOS
     raise "Gecode not installed"
@@ -83,6 +99,22 @@ else # JRUBY
   require 'rbconfig'
   require 'ffi/platform'
 
+  incflags = "-I."
+  libpath = "-L."
+
+  require 'dep-selector-libgecode'
+  opt_path = DepSelectorLibgecode.opt_path
+  include_path = DepSelectorLibgecode.include_path
+  libpath << " -L#{opt_path}"
+
+  # On MRI, RbConfig::CONFIG["RPATHFLAG"] == "" when using clang/llvm, but this
+  # isn't set on JRuby so we need to detect llvm manually and set rpath on gcc
+  unless `gcc -v` =~ /LLVM/
+    rpath_flag = (" -Wl,-R%1$-s" % [opt_path])
+    libpath << rpath_flag
+  end
+  incflags << " -I#{include_path}"
+
   cflags = ENV['CFLAGS']
   cppflags = ENV['CPPFLAGS']
   cxxflags = ENV['CXXFLAGS']
@@ -121,6 +153,8 @@ else # JRUBY
   ENV['CXX'] = cxx
   ENV["CPPFLAGS"] = cppflags
   ENV["CXXFLAGS"] = cxxflags
+  ENV['INCFLAGS'] = incflags
+  ENV['LIBPATH'] = libpath
 
   dlext = FFI::Platform::LIBSUFFIX
 
@@ -145,7 +179,9 @@ CFLAGS = #{ENV['CFLAGS']}
 LDFLAGS = #{ENV['LDFLAGS']}
 CPPFLAGS = #{ENV['CPPFLAGS']}
 CXXFLAGS = #{ENV['CXXFLAGS']}
-INCFLAGS = -I.
+INCFLAGS = #{ENV['INCFLAGS']}
+LIBPATH = #{ENV['LIBPATH']}
+
 LDSHAREDXX = #{ldsharedxx}
 
 empty =

data/lib/dep_selector/dep_selector_version.rb

@@ -1,3 +1,3 @@
 module DepSelector
-  VERSION = "1.0.0.alpha.1"
+  VERSION = "1.0.0.alpha.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dep_selector
 version: !ruby/object:Gem::Version
-  version: 1.0.0.alpha.1
+  version: 1.0.0.alpha.2
 platform: ruby
 authors:
 - Christopher Walters
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-04 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -25,6 +25,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.9'
+- !ruby/object:Gem::Dependency
+  name: dep-selector-libgecode
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0.alpha
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.0.0.alpha
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement