dep-selector-libgecode 1.0.0.rc.0 → 1.0.0.rc.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7826df2f6df2bec604a368465b0c723b80b36f81
-  data.tar.gz: 19e4dbce7cdefa6dd28f388f7f58074185279b66
+  metadata.gz: 57c87af7ab1fce36c3b3f8c6bcb23c34403b21f7
+  data.tar.gz: 60ab85b3728fbc2d188ef441ef35c55ab1e1c557
 SHA512:
-  metadata.gz: 9eaf22f6fd887d2dacd0b394b9c31ed623ca16b7abc1514b3e8b71242417af03b78745aba59f3573a29eb2fbc686e178b1c46c0ed31680468184c3958a5594c1
-  data.tar.gz: ccb167a07d98026a4a17fee556eefd3549cfaa88a85707d52a7492ba1cd483355d2518d7769a53580063c5d9bf28f049e4282980fb86a0c78bd2e41782f3e762
+  metadata.gz: a32ea206ccc981061a1f42f7d15f23c75f2d3d48aea3174cfa321e3be045e2edbe374e07db8f70e2cdc87f58b3def47493e9467ca86625a9399becb5eb285f26
+  data.tar.gz: 8c55add3a812c9e834f226f3bb0a26508894a398500b76f5539e14ce6a5cb19bc35537df53b45778508013236699a74da3cd05c4171c5c69d46db1b6926a3ed5

data/CONTRIBUTING.md

@@ -1,6 +1,16 @@
 # Contributing
 
-We (Chef Software, Inc.) are currently discussing whether to change the
-license on the packaging code in this repository to MIT. Until we make a
-decision, we cannot accept contributions from outside our organization.
-We should have this resolved very soon.
+## Summary
+
+1. Fork it
+2. Create your feature branch (`git checkout -b my-new-feature`)
+3. Commit your changes (`git commit -am 'Add some feature'`)
+4. Push to the branch (`git push origin my-new-feature`)
+5. Create new Pull Request
+
+## Licensing
+
+Gecode itself is MIT licensed. If you make changes to the vendored
+Gecode source in ext/libgecode3/vendor, your changes will we distributed
+under the terms of the MIT license. All other code in this repository is
+distributed under the terms of the Apache 2.0 license.

data/ext/libgecode3/extconf.rb

@@ -48,6 +48,26 @@ module GecodeBuild
       ENV['CC'] = 'gcc'
       ENV['CXX'] = 'g++'
     end
+
+    # Configure the gecode libraries to look for other gecode libraries in the
+    # installed lib dir. This isn't needed for dep-selector to correctly link
+    # the libraries it uses, but if you check the libraries with `ldd`, they
+    # will appear to have missing deps or to link to system installed gecode.
+    # When used inside an Omnibus project, this will make the health checker
+    # report an error.
+    libpath = File.join(PREFIX, "lib")
+    ENV['LD_RUN_PATH'] = libpath
+  end
+
+  # Depending on the version of mingw we're using, g++ may or may not fail when
+  # given the -pthreads option. When testing with `gcc version 4.6.2 (GCC)`
+  # mingw, this patch is required for the build to succeed.
+  def self.patch_configure
+    if windows?
+      original_configure = IO.read(configure)
+      original_configure.gsub!('pthread', 'mthread')
+      File.open(configure, "w+") { |f| f.print(original_configure) }
+    end
   end
 
   def self.system(*args)
@@ -57,6 +77,7 @@ module GecodeBuild
 
   def self.run_build_commands
     setup_env
+    patch_configure
     system(*configure_cmd) &&
       system("make", "clean") &&
       system("make", "-j", "5") &&

data/lib/dep-selector-libgecode/version.rb

@@ -1,3 +1,3 @@
 module DepSelectorLibgecode
-  VERSION = "1.0.0.rc.0"
+  VERSION = "1.0.0.rc.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dep-selector-libgecode
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc.0
+  version: 1.0.0.rc.1
 platform: ruby
 authors:
 - danielsdeleo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-08 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler