Browse Source

Merge pull request #300 from stephanheilner/podspec_update

Created separate FTS subspec which includes custom FM tokenizers
August "Gus" Mueller 11 years ago
parent
commit
911279324f
1 changed files with 23 additions and 8 deletions
  1. 23 8
      FMDB.podspec

+ 23 - 8
fmdb.podspec → FMDB.podspec

@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
   s.name = 'FMDB'
-  s.version = '2.3'
+  s.version = '2.4'
   s.summary = 'A Cocoa / Objective-C wrapper around SQLite.'
   s.homepage = 'https://github.com/ccgus/fmdb'
   s.license = 'MIT'
   s.author = { 'August Mueller' => 'gus@flyingmeat.com' }
-  s.source = { :git => 'https://github.com/ccgus/fmdb.git',
-                 :tag => 'v2.3' }
+  s.source = { :git => 'https://github.com/ccgus/fmdb.git', :tag => s.version.to_s }
+  s.requires_arc = true
 
   s.default_subspec = 'standard'
 
@@ -15,16 +15,32 @@ Pod::Spec.new do |s|
     ss.exclude_files = 'src/fmdb.m'
   end
 
-  # use a builtin version of sqlite3
+  # use the built-in library version of sqlite3
   s.subspec 'standard' do |ss|
     ss.library = 'sqlite3'
     ss.dependency 'FMDB/common'
   end
 
-  # use a custom built version of sqlite3, with FTS4 enabled
+  # use the built-in library version of sqlite3 with custom FTS tokenizer source files
+  s.subspec 'FTS' do |ss|
+    ss.source_files = 'src/extra/fts3/*.{h,m}'
+    ss.dependency 'FMDB/standard'
+  end
+
+  # use a custom built version of sqlite3
   s.subspec 'standalone' do |ss|
-    ss.dependency 'sqlite3/fts'
+    ss.default_subspec = 'default'
     ss.dependency 'FMDB/common'
+    
+    ss.subspec 'default' do |sss|
+      sss.dependency 'sqlite3'
+    end
+
+    # add FTS, custom FTS tokenizer source files, and unicode61 tokenizer support
+    ss.subspec 'FTS' do |sss|
+      sss.source_files = 'src/extra/fts3/*.{h,m}'
+      sss.dependency 'sqlite3/unicode61'
+    end
   end
 
   # use SQLCipher and enable -DSQLITE_HAS_CODEC flag
@@ -34,5 +50,4 @@ Pod::Spec.new do |s|
     ss.xcconfig = { 'OTHER_CFLAGS' => '$(inherited) -DSQLITE_HAS_CODEC' }
   end
   
-  s.requires_arc = true
-end
+end