cld2 1.0.1 → 1.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODJiNGUxYTA3OTUwYTYzOGYzMmI3OGY1Yjk3MGE4ZjUyM2M4ZjJlMQ==
+    OWYzYzk1MWJkZGEwNTZmYTdlZDZkNjUyNmVhZTdiODEyOTk1ZDNlZQ==
   data.tar.gz: !binary |-
-    YmNmOWZkNjJlOTdkZDAxYzQ4NzUwNGJjMGU0YzNiYTgzZGE0YTM2ZA==
+    NGY1YzZkNTYzNzc5ODVkM2Y0ZjZjMWY2MDliZDNlMmY1MGY5N2Y5OA==
 SHA512:
   metadata.gz: !binary |-
-    YTQ0YjIzMmM5NTQzMzZhMmI2NzlmMzI0ZGM5ZDU4YjMxZjFiNzg4ZTQ3ZGZj
-    ODQxMzRhOTNjZTVhNWM4ZjBmNjEwMDZjY2ExNWE1ZGM3ZWZhZmFiOTk5Y2Zk
-    ZmVjM2U1ZGE3M2EwNGE5ZTViNzI2ZTBkMDgyN2NlMDk0NzhjNjE=
+    MDNiMjgyNDdlYTgwODUzOTZlMTQ2NjljZThiZThiZmZhNTM1MzA4ZTU0ODcw
+    NTgxZTIwODA0YWZiNDNkYjM3MDNkY2Y2YTFhZTJlMTIyZGNhMzI2NzY0ZTNl
+    M2FiYzUyZTE5YmZiZTRlNzMwOTU1YTZjMzBhMjI4NzdjODZjOTA=
   data.tar.gz: !binary |-
-    YjBhNDQzMGRjZGM5ZmQzYzA4MDA0MDFlMTMxYTA1MDNjZmYzMzVmMzJiN2Q2
-    M2QzYmY0ZmYwY2IwYmNiNTAyNGM1NGYzODhkNjAxZjI1ZWViNGQzNDdiMWUy
-    NjdiZDA1NjI0YzRlOTI3ZGE4YTBjMTZmMjg4MTE5Mzc0MjRlZjU=
+    M2ZiMTBiMzczZTJlMzY3OTQzOTJmMDlkNDM1NGI1Njc2NzE5OWMwYjJkNWQx
+    M2E5NTM2MWE4MWFkZjBmZWU0MjZmZTRiYzQ2OGYxNWYyNWExYjExYjk2MGZl
+    ZmY5OTQxYzliNmQzY2QyZmQ1MDZmM2Q1MGJhYjNkNmRhZDIxN2E=

data/.gitignore

@@ -26,3 +26,7 @@ ext/cld/lib
 *.log
 build/
 install_manifest.txt
+*.o
+*.bundle
+*.so
+*.dll

data/ext/cld/extconf.rb

@@ -1,7 +1,38 @@
 require 'mkmf'
 
-if !find_executable('cmake')
-  abort "ERROR: CMake is required to build CLD."
-end
+# HACK: mkmf doesn't support multiple subdirs for the same library
+$objs = ["internal/cldutil.o",
+  "internal/cldutil_shared.o",
+  "internal/compact_lang_det.o",
+  "internal/compact_lang_det_hint_code.o",
+  "internal/compact_lang_det_impl.o",
+  "internal/debug.o",
+  "internal/fixunicodevalue.o",
+  "internal/generated_entities.o",
+  "internal/generated_language.o",
+  "internal/generated_ulscript.o",
+  "internal/getonescriptspan.o",
+  "internal/lang_script.o",
+  "internal/offsetmap.o",
+  "internal/scoreonescriptspan.o",
+  "internal/tote.o",
+  "internal/utf8statetable.o",
+  "internal/cld_generated_cjk_uni_prop_80.o",
+  "internal/cld2_generated_cjk_compatible.o",
+  "internal/cld_generated_cjk_delta_bi_4.o",
+  "internal/generated_distinct_bi_0.o",
+  "internal/cld2_generated_quadchrome0122_2.o",
+  "internal/cld2_generated_deltaoctachrome0122.o",
+  "internal/cld2_generated_distinctoctachrome0122.o",
+  "internal/cld_generated_score_quad_octa_0122_2.o",
+  "thunk.o"]
 
-`cmake -DCMAKE_BUILD_TYPE=Release .` unless File.exists?('Makefile')
+create_makefile('libcld2')
+
+# to clean up object files under internal subdirectory.
+open('Makefile', 'a') do |f|
+  f.write <<EOS
+
+  CLEANOBJS := $(CLEANOBJS) internal/*.#{CONFIG["OBJEXT"]}
+EOS
+end

data/lib/cld.rb

@@ -3,7 +3,15 @@ require "ffi"
 
 module CLD
   extend FFI::Library
-  ffi_lib "#{File.expand_path("../../", __FILE__)}/ext/cld/lib/libcld2.so"
+
+  # Workaround FFI dylib/bundle issue.  See https://github.com/ffi/ffi/issues/42
+  suffix = if FFI::Platform.mac?
+    'bundle'
+  else
+    FFI::Platform::LIBSUFFIX
+  end
+
+  ffi_lib File.join(File.expand_path(File.dirname(__FILE__)), '..', 'ext', 'cld', 'libcld2.' + suffix)
 
   def self.detect_language(text, is_plain_text=true)
     result = detect_language_ext(text.to_s, is_plain_text)

data/lib/cld/version.rb

@@ -1,3 +1,3 @@
 module CLD
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require "rubygems"
 require "bundler/setup"
 Bundler.require(:default)
+require File.dirname(__FILE__) + '/../lib/cld.rb'
 
 RSpec.configure do |config|
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cld2
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Alessandro Dal Grande
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-05 00:00:00.000000000 Z
+date: 2014-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -54,7 +54,6 @@ files:
 - README.md
 - Rakefile
 - cld2.gemspec
-- ext/cld/CMakeLists.txt
 - ext/cld/extconf.rb
 - ext/cld/internal/cld2_do_score.cc
 - ext/cld/internal/cld2_dynamic_data.cc

data/ext/cld/CMakeLists.txt

@@ -1,45 +0,0 @@
-project(CLD2)
-
-cmake_minimum_required (VERSION 2.6)
-
-set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug, Release" FORCE)
-
-set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/build")
-
-if(UNIX)
-  SET(CMAKE_C_FLAGS_RELEASE "-O3")
-  SET(CMAKE_CXX_FLAGS_RELEASE "-O3")
-endif(UNIX)
-
-include_directories("internal/")
-
-set(CLD2_SRCS
-  "internal/cldutil.cc"
-  "internal/cldutil_shared.cc"
-  "internal/compact_lang_det.cc"
-  "internal/compact_lang_det_hint_code.cc"
-  "internal/compact_lang_det_impl.cc"
-  "internal/debug.cc"
-  "internal/fixunicodevalue.cc"
-  "internal/generated_entities.cc"
-  "internal/generated_language.cc"
-  "internal/generated_ulscript.cc"
-  "internal/getonescriptspan.cc"
-  "internal/lang_script.cc"
-  "internal/offsetmap.cc"
-  "internal/scoreonescriptspan.cc"
-  "internal/tote.cc"
-  "internal/utf8statetable.cc"
-  "internal/cld_generated_cjk_uni_prop_80.cc"
-  "internal/cld2_generated_cjk_compatible.cc"
-  "internal/cld_generated_cjk_delta_bi_4.cc"
-  "internal/generated_distinct_bi_0.cc"
-  "internal/cld2_generated_quadchrome0122_2.cc"
-  "internal/cld2_generated_deltaoctachrome0122.cc"
-  "internal/cld2_generated_distinctoctachrome0122.cc"
-  "internal/cld_generated_score_quad_octa_0122_2.cc"
-  "thunk.cc")
-
-add_library(cld2 MODULE ${CLD2_SRCS})
-
-install(TARGETS cld2 DESTINATION "${PROJECT_BINARY_DIR}/lib")