@op-engineering/op-sqlite 10.0.0-tokenizers-beta5 → 10.0.0-tokenizers-beta7

package/android/build.gradle

@@ -168,14 +168,17 @@ android {
             // def tokenizerInitStrings = 0
             def tokenizersHeaderPath = 0
             if (!tokenizers.isEmpty()) {
-              // Scan user directories for .h and .cpp files
               def sourceDir = isInsideNodeModules ? file("$rootDir/../../../c_sources") : file("$rootDir/../c_sources")
-              sourceFiles = fileTree(dir: sourceDir, include: ["**/*.cpp", "**/*.h"])
-//              sourceFiles = fileTree(dir: sourceDir, include: ["**/*.cpp"])
-                      .files
-                      .join(";") // Join paths with `;` for CMake
-              tokenizersHeaderPath = isInsideNodeModules ? "../../../c_sources/tokenizers.h" : "../example/c_sources/tokenizers.h"
-                println("tokenizers header path $tokenizersHeaderPath")
+              def destDir = file("$buildscript.sourceFile.parentFile/c_sources")
+              copy {
+                from sourceDir
+                into destDir
+                include "**/*.cpp", "**/*.h"
+              }
+              sourceFiles = fileTree(dir: destDir, include: ["**/*.cpp", "**/*.h"]).files.join(";")
+              tokenizersHeaderPath = "../c_sources/tokenizers.h" 
+              println("tokenizers header path $tokenizersHeaderPath")
+
             }
 
             cppFlags "-O2", "-fexceptions", "-DONANDROID"

package/op-sqlite.podspec

@@ -83,18 +83,26 @@ Pod::Spec.new do |s|
 
   # Set the path to the `c_sources` directory based on environment
   if is_user_app
-    c_sources_dir = File.join("..", "..", "..", "..", "c_sources")
+    c_sources_dir = File.join("..", "..", "..", "c_sources")
   else
     c_sources_dir = File.join("example", "c_sources")
   end
+  
 
   if tokenizers.any?
-    generate_tokenizers_header_file(tokenizers, File.join(c_sources_dir, "tokenizers.h"), is_user_app)
+    FileUtils.cp_r(c_sources_dir, __dir__)
+    # generate_tokenizers_header_file(tokenizers, File.join(c_sources_dir, "tokenizers.h"), is_user_app)
+    # puts "Current directory: #{__dir__}"
+    # c_sources_dir_output = Dir.glob(File.join(c_sources_dir, "**/*.{h,cpp}"))
+  
+    # puts "c_sources_dir: #{c_sources_dir_output}"
+  
+    # # Add all .h and .c files from the `c_sources` directory
+    source_files += Dir.glob(File.join("c_sources", "**/*.{h,cpp}"))
+    # source_files += ["../../c_sources/tokenizers.h", "../../c_sources/tokenizers.cpp"]
+    # puts "Source files: #{source_files}"
   end
 
-  # Add all .h and .c files from the `c_sources` directory
-  source_files += Dir.glob(File.join(c_sources_dir, "**/*.{h,cpp}"))
-
   # Assign the collected source files to `s.source_files`
   s.source_files = source_files
 
@@ -187,7 +195,7 @@ Pod::Spec.new do |s|
   if tokenizers.any? then
     log_message.call("[OP_SQLITE] Tokenizers enabled: #{tokenizers}")
     if is_user_app then
-      other_cflags += " -DTOKENIZERS_HEADER_PATH=\\\"../../../../c_sources/tokenizers.h\\\""
+      other_cflags += " -DTOKENIZERS_HEADER_PATH=\\\"../c_sources/tokenizers.h\\\""
     else 
       other_cflags += " -DTOKENIZERS_HEADER_PATH=\\\"../example/c_sources/tokenizers.h\\\""
     end

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@op-engineering/op-sqlite",
-  "version": "10.0.0-tokenizers-beta5",
+  "version": "10.0.0-tokenizers-beta7",
   "description": "Next generation SQLite for React Native",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",