ffi-radix_tree 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d36fd469f2823e6b56e5d8a4dab8ff7f9cd133f3
-  data.tar.gz: 5cfcb3ed80dc6b731c95e16270fe48a1f7558e1c
+  metadata.gz: 72420ea414f83cefb55eb61ac28185576d766c93
+  data.tar.gz: 3e5efc9029f849f5810a7de4271d6e6079fcd1c3
 SHA512:
-  metadata.gz: e08601eee9895a0a27bbaad76f44f51dc8f1dfd7f0768b23611734e34950a7edae76d45892a5e8316d4369614b4e32f5aca5ab591da0c326cecaaa828f2c0978
-  data.tar.gz: 80435e020cd98216c0699db2559b4b75d63925d70f2d1f1e8c603b4a7539349d446e3ff3305c53d917cfcdd83f60f77f5ce4392f3967a11ed041bb9b75da5e48
+  metadata.gz: 5f26702f873b0414ae563c1e6e33e1e279390870941973826f556ecb491b88505a0d5f3ff958d66908892b9e63b30f8fd7f081cb7606d8983c22f4ef6248e96f
+  data.tar.gz: eddbd1b6f0f25b47d95afb6367b18ac364eedc00fa15a0f888d23c0f70488081f46441907b5d9782d10a5cd9185bc82cbe1c3b2200b5ddd12cbf71d22ae129d8

data/.gitignore

@@ -1,5 +1,6 @@
 *.ruby-*
 *.so
+*.o
 CMakeCache.txt
 /vendor/radixtree/CMakeFiles
 /vendor/radixtree/CMakeFiles/**/*

data/ext/ffi/radixtree/Rakefile

@@ -17,10 +17,9 @@ def find_executable(bin, path = nil)
     return bin if executable_file.call(bin)
     return nil
   end
-  if path ||= ENV['PATH']
-    path = path.split(File::PATH_SEPARATOR)
-  else
-    path = %w[/usr/local/bin /usr/ucb /usr/bin /bin]
+  path = %w[/usr/local/bin /usr/ucb /usr/bin /bin]
+  if additional_path ||= ENV['PATH']
+    path += additional_path.split(File::PATH_SEPARATOR)
   end
   file = nil
   path.each do |dir|
@@ -42,7 +41,7 @@ task :compile_radixtree do
   # Do not attempt to install if we want to use the system radixtree lib
   next if ENV.key?("RADIX_TREE_USE_SYSTEM_LIB")
 
-  if !find_executable("cmake")
+  if !find_executable("gcc")
     abort "ERROR: CMake is required to build ffi-radix_tree"
   end
 
@@ -50,8 +49,8 @@ task :compile_radixtree do
   RADIXTREE_DIR = ::File.join(CWD, "..", "..", "..", "vendor", "radixtree")
 
   ::Dir.chdir(RADIXTREE_DIR) do
-    sys("cmake CMakeLists.txt")
-    sys("make")
+    sys("g++ -c -Wall -Wextra -O3 -fPIC ./ffi_radix_tree.cpp")
+    sys("g++ -shared -o libradixtree.#{::FFI::Platform::LIBSUFFIX} ffi_radix_tree.o")
   end
 
   unless ::File.exist?(::File.join(RADIXTREE_DIR, "libradixtree.#{::FFI::Platform::LIBSUFFIX}"))

data/lib/ffi/radix_tree/version.rb

@@ -1,5 +1,5 @@
 module FFI
   module RadixTree
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffi-radix_tree
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Brandon Dewitt
@@ -100,7 +100,6 @@ files:
 - ffi-radix_tree.gemspec
 - lib/ffi/radix_tree.rb
 - lib/ffi/radix_tree/version.rb
-- vendor/radixtree/CMakeLists.txt
 - vendor/radixtree/COPYING
 - vendor/radixtree/ffi_radix_tree.cpp
 - vendor/radixtree/radix_tree.hpp

data/vendor/radixtree/CMakeLists.txt

@@ -1,10 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-
-project (radixtree)
-set(CMAKE_CXX_FLAGS "-Wall -Wextra")
-set(CMAKE_CXX_FLAGS_DEBUG "-g")
-set(CMAKE_CXX_FLAGS_RELEASE "-O3")
-set(CMAKE_BUILD_TYPE Release)
-
-include_directories(${CMAKE_CURRENT_SOURCE_DIR})
-add_library(radixtree SHARED ffi_radix_tree.cpp)