cld2 1.0.1 → 1.0.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- ODJiNGUxYTA3OTUwYTYzOGYzMmI3OGY1Yjk3MGE4ZjUyM2M4ZjJlMQ==
4
+ OWYzYzk1MWJkZGEwNTZmYTdlZDZkNjUyNmVhZTdiODEyOTk1ZDNlZQ==
5
5
  data.tar.gz: !binary |-
6
- YmNmOWZkNjJlOTdkZDAxYzQ4NzUwNGJjMGU0YzNiYTgzZGE0YTM2ZA==
6
+ NGY1YzZkNTYzNzc5ODVkM2Y0ZjZjMWY2MDliZDNlMmY1MGY5N2Y5OA==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- YTQ0YjIzMmM5NTQzMzZhMmI2NzlmMzI0ZGM5ZDU4YjMxZjFiNzg4ZTQ3ZGZj
10
- ODQxMzRhOTNjZTVhNWM4ZjBmNjEwMDZjY2ExNWE1ZGM3ZWZhZmFiOTk5Y2Zk
11
- ZmVjM2U1ZGE3M2EwNGE5ZTViNzI2ZTBkMDgyN2NlMDk0NzhjNjE=
9
+ MDNiMjgyNDdlYTgwODUzOTZlMTQ2NjljZThiZThiZmZhNTM1MzA4ZTU0ODcw
10
+ NTgxZTIwODA0YWZiNDNkYjM3MDNkY2Y2YTFhZTJlMTIyZGNhMzI2NzY0ZTNl
11
+ M2FiYzUyZTE5YmZiZTRlNzMwOTU1YTZjMzBhMjI4NzdjODZjOTA=
12
12
  data.tar.gz: !binary |-
13
- YjBhNDQzMGRjZGM5ZmQzYzA4MDA0MDFlMTMxYTA1MDNjZmYzMzVmMzJiN2Q2
14
- M2QzYmY0ZmYwY2IwYmNiNTAyNGM1NGYzODhkNjAxZjI1ZWViNGQzNDdiMWUy
15
- NjdiZDA1NjI0YzRlOTI3ZGE4YTBjMTZmMjg4MTE5Mzc0MjRlZjU=
13
+ M2ZiMTBiMzczZTJlMzY3OTQzOTJmMDlkNDM1NGI1Njc2NzE5OWMwYjJkNWQx
14
+ M2E5NTM2MWE4MWFkZjBmZWU0MjZmZTRiYzQ2OGYxNWYyNWExYjExYjk2MGZl
15
+ ZmY5OTQxYzliNmQzY2QyZmQ1MDZmM2Q1MGJhYjNkNmRhZDIxN2E=
data/.gitignore CHANGED
@@ -26,3 +26,7 @@ ext/cld/lib
26
26
  *.log
27
27
  build/
28
28
  install_manifest.txt
29
+ *.o
30
+ *.bundle
31
+ *.so
32
+ *.dll
@@ -1,7 +1,38 @@
1
1
  require 'mkmf'
2
2
 
3
- if !find_executable('cmake')
4
- abort "ERROR: CMake is required to build CLD."
5
- end
3
+ # HACK: mkmf doesn't support multiple subdirs for the same library
4
+ $objs = ["internal/cldutil.o",
5
+ "internal/cldutil_shared.o",
6
+ "internal/compact_lang_det.o",
7
+ "internal/compact_lang_det_hint_code.o",
8
+ "internal/compact_lang_det_impl.o",
9
+ "internal/debug.o",
10
+ "internal/fixunicodevalue.o",
11
+ "internal/generated_entities.o",
12
+ "internal/generated_language.o",
13
+ "internal/generated_ulscript.o",
14
+ "internal/getonescriptspan.o",
15
+ "internal/lang_script.o",
16
+ "internal/offsetmap.o",
17
+ "internal/scoreonescriptspan.o",
18
+ "internal/tote.o",
19
+ "internal/utf8statetable.o",
20
+ "internal/cld_generated_cjk_uni_prop_80.o",
21
+ "internal/cld2_generated_cjk_compatible.o",
22
+ "internal/cld_generated_cjk_delta_bi_4.o",
23
+ "internal/generated_distinct_bi_0.o",
24
+ "internal/cld2_generated_quadchrome0122_2.o",
25
+ "internal/cld2_generated_deltaoctachrome0122.o",
26
+ "internal/cld2_generated_distinctoctachrome0122.o",
27
+ "internal/cld_generated_score_quad_octa_0122_2.o",
28
+ "thunk.o"]
6
29
 
7
- `cmake -DCMAKE_BUILD_TYPE=Release .` unless File.exists?('Makefile')
30
+ create_makefile('libcld2')
31
+
32
+ # to clean up object files under internal subdirectory.
33
+ open('Makefile', 'a') do |f|
34
+ f.write <<EOS
35
+
36
+ CLEANOBJS := $(CLEANOBJS) internal/*.#{CONFIG["OBJEXT"]}
37
+ EOS
38
+ end
data/lib/cld.rb CHANGED
@@ -3,7 +3,15 @@ require "ffi"
3
3
 
4
4
  module CLD
5
5
  extend FFI::Library
6
- ffi_lib "#{File.expand_path("../../", __FILE__)}/ext/cld/lib/libcld2.so"
6
+
7
+ # Workaround FFI dylib/bundle issue. See https://github.com/ffi/ffi/issues/42
8
+ suffix = if FFI::Platform.mac?
9
+ 'bundle'
10
+ else
11
+ FFI::Platform::LIBSUFFIX
12
+ end
13
+
14
+ ffi_lib File.join(File.expand_path(File.dirname(__FILE__)), '..', 'ext', 'cld', 'libcld2.' + suffix)
7
15
 
8
16
  def self.detect_language(text, is_plain_text=true)
9
17
  result = detect_language_ext(text.to_s, is_plain_text)
@@ -1,3 +1,3 @@
1
1
  module CLD
2
- VERSION = "1.0.1"
2
+ VERSION = "1.0.2"
3
3
  end
@@ -1,6 +1,7 @@
1
1
  require "rubygems"
2
2
  require "bundler/setup"
3
3
  Bundler.require(:default)
4
+ require File.dirname(__FILE__) + '/../lib/cld.rb'
4
5
 
5
6
  RSpec.configure do |config|
6
7
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cld2
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.1
4
+ version: 1.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Alessandro Dal Grande
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2014-05-05 00:00:00.000000000 Z
12
+ date: 2014-05-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: ffi
@@ -54,7 +54,6 @@ files:
54
54
  - README.md
55
55
  - Rakefile
56
56
  - cld2.gemspec
57
- - ext/cld/CMakeLists.txt
58
57
  - ext/cld/extconf.rb
59
58
  - ext/cld/internal/cld2_do_score.cc
60
59
  - ext/cld/internal/cld2_dynamic_data.cc
@@ -1,45 +0,0 @@
1
- project(CLD2)
2
-
3
- cmake_minimum_required (VERSION 2.6)
4
-
5
- set(CMAKE_BUILD_TYPE "Release" CACHE STRING "Choose the type of build, options are: Debug, Release" FORCE)
6
-
7
- set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/build")
8
-
9
- if(UNIX)
10
- SET(CMAKE_C_FLAGS_RELEASE "-O3")
11
- SET(CMAKE_CXX_FLAGS_RELEASE "-O3")
12
- endif(UNIX)
13
-
14
- include_directories("internal/")
15
-
16
- set(CLD2_SRCS
17
- "internal/cldutil.cc"
18
- "internal/cldutil_shared.cc"
19
- "internal/compact_lang_det.cc"
20
- "internal/compact_lang_det_hint_code.cc"
21
- "internal/compact_lang_det_impl.cc"
22
- "internal/debug.cc"
23
- "internal/fixunicodevalue.cc"
24
- "internal/generated_entities.cc"
25
- "internal/generated_language.cc"
26
- "internal/generated_ulscript.cc"
27
- "internal/getonescriptspan.cc"
28
- "internal/lang_script.cc"
29
- "internal/offsetmap.cc"
30
- "internal/scoreonescriptspan.cc"
31
- "internal/tote.cc"
32
- "internal/utf8statetable.cc"
33
- "internal/cld_generated_cjk_uni_prop_80.cc"
34
- "internal/cld2_generated_cjk_compatible.cc"
35
- "internal/cld_generated_cjk_delta_bi_4.cc"
36
- "internal/generated_distinct_bi_0.cc"
37
- "internal/cld2_generated_quadchrome0122_2.cc"
38
- "internal/cld2_generated_deltaoctachrome0122.cc"
39
- "internal/cld2_generated_distinctoctachrome0122.cc"
40
- "internal/cld_generated_score_quad_octa_0122_2.cc"
41
- "thunk.cc")
42
-
43
- add_library(cld2 MODULE ${CLD2_SRCS})
44
-
45
- install(TARGETS cld2 DESTINATION "${PROJECT_BINARY_DIR}/lib")