fastqr 1.0.9 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebdc094c4b99f58f52cb8e96663c42b155a036f419b2fa80239a92bbfb512eb9
-  data.tar.gz: 6dbb33c8d3dd4c35e34db189d47f9ce18490f474fa8faebfa41d843b66ae833f
+  metadata.gz: cecb54f8189d6e136d9543e962a0e3c2852145fc35fd94f3a0a6615ebd95fa60
+  data.tar.gz: dbd35fdf0763e4792d96ca1ea5dceaa191e54b468d788ca00164224577cc7715
 SHA512:
-  metadata.gz: 69e544be8d0454fccb215e7af53cbf8b0f3b50f0491f8cb3802b5070adcdae6265f82e795176488b4105bd174d9e000f37d53446c7f577684488ba28bfa2285f
-  data.tar.gz: 7c2a36f574a7f61cb68d4d317e2e413a5241a86a37e7b2421f0bef36ac653fc1f52158752d41260471f9746eac276a75933e3d7473a8669e736f97929cd0f376
+  metadata.gz: c8e8967e977ebc246706b41848ef042b142d69370c136899a7959fa978a4c244c16894e3d22def54583f65fe432365bc758ed522d6b3b85b25519232cffadd67
+  data.tar.gz: 640f00a79e52a95f836b2b69e56ab106466ebcafa10c0dfb90096714c61a2abd95d1c3adf131a0f3c8b7f27b55ebf05ca701baa0c93d043a2cf831ae8583365c

data/CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.15)
-project(fastqr VERSION 1.0.9 LANGUAGES CXX C)
+project(fastqr VERSION 1.0.11 LANGUAGES CXX C)
 
 set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
@@ -28,12 +28,12 @@ pkg_check_modules(QRENCODE REQUIRED libqrencode)
 # Add library directories
 link_directories(${QRENCODE_LIBRARY_DIRS})
 
-# Main library
-add_library(fastqr
+# Object library for internal use (no linking yet)
+add_library(fastqr_obj OBJECT
     src/fastqr.cpp
 )
 
-target_include_directories(fastqr
+target_include_directories(fastqr_obj
     PUBLIC
         $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
         $<INSTALL_INTERFACE:include>
@@ -42,6 +42,22 @@ target_include_directories(fastqr
         ${PNG_INCLUDE_DIRS}
 )
 
+target_compile_options(fastqr_obj
+    PRIVATE
+        ${QRENCODE_CFLAGS_OTHER}
+)
+
+# Main library (for install and linking by other projects)
+add_library(fastqr
+    $<TARGET_OBJECTS:fastqr_obj>
+)
+
+target_include_directories(fastqr
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:include>
+)
+
 target_link_directories(fastqr
     PRIVATE
         ${QRENCODE_LIBRARY_DIRS}
@@ -53,11 +69,6 @@ target_link_libraries(fastqr
         PNG::PNG
 )
 
-target_compile_options(fastqr
-    PRIVATE
-        ${QRENCODE_CFLAGS_OTHER}
-)
-
 # Set library output name
 set_target_properties(fastqr PROPERTIES
     VERSION ${PROJECT_VERSION}
@@ -70,9 +81,56 @@ add_executable(fastqr-cli
     src/cli.cpp
 )
 
-target_link_libraries(fastqr-cli
-    PRIVATE fastqr
-)
+# For standalone CLI binary, link with object library and static dependencies
+if(NOT BUILD_SHARED_LIBS)
+    # Find static versions of libraries
+    find_library(PNG_STATIC_LIBRARY
+        NAMES libpng.a libpng16.a
+        PATHS
+            ${PNG_LIBRARY_DIRS}
+            /usr/local/lib
+            /opt/homebrew/lib
+            /usr/lib
+        NO_DEFAULT_PATH
+    )
+
+    find_library(QRENCODE_STATIC_LIBRARY
+        NAMES libqrencode.a
+        PATHS
+            ${QRENCODE_LIBRARY_DIRS}
+            /usr/local/lib
+            /opt/homebrew/lib
+            /usr/lib
+        NO_DEFAULT_PATH
+    )
+
+    if(PNG_STATIC_LIBRARY AND QRENCODE_STATIC_LIBRARY)
+        message(STATUS "✓ Found static libpng: ${PNG_STATIC_LIBRARY}")
+        message(STATUS "✓ Found static libqrencode: ${QRENCODE_STATIC_LIBRARY}")
+
+        # Link CLI directly with object library + static libs (no dependency propagation)
+        target_link_libraries(fastqr-cli
+            PRIVATE
+                fastqr_obj
+                ${QRENCODE_STATIC_LIBRARY}
+                ${PNG_STATIC_LIBRARY}
+                z  # zlib is needed by libpng
+        )
+    else()
+        message(WARNING "Static libraries not found, falling back to dynamic linking")
+        message(WARNING "  libpng: ${PNG_STATIC_LIBRARY}")
+        message(WARNING "  libqrencode: ${QRENCODE_STATIC_LIBRARY}")
+
+        target_link_libraries(fastqr-cli
+            PRIVATE fastqr
+        )
+    endif()
+else()
+    # Shared library build
+    target_link_libraries(fastqr-cli
+        PRIVATE fastqr
+    )
+endif()
 
 set_target_properties(fastqr-cli PROPERTIES
     OUTPUT_NAME fastqr

data/VERSION

@@ -1 +1 @@
-1.0.9
+1.0.11

data/bindings/nodejs/index.js

@@ -13,7 +13,7 @@ let fastqr;
 // Use pre-built CLI binary (no FFI needed!)
 if (platform.isPrebuiltAvailable()) {
   const cliPath = path.join(__dirname, 'prebuilt', platform.getPlatformString(), 'bin', 'fastqr');
-  
+
   if (!fs.existsSync(cliPath)) {
     throw new Error(
       'FastQR CLI binary not found. Expected at: ' + cliPath + '\n' +
@@ -25,11 +25,11 @@ if (platform.isPrebuiltAvailable()) {
   fastqr = {
     generate: function(data, outputPath, options = {}) {
       const args = [data, outputPath];
-      
+
       // Support both new 'size' and legacy 'width'/'height'
       const size = options.size || options.width || options.height || 300;
       args.push('-s', size.toString());
-      
+
       if (options.optimizeSize) args.push('-o');
       if (options.foreground) args.push('-f', options.foreground.join(','));
       if (options.background) args.push('-b', options.background.join(','));
@@ -37,7 +37,7 @@ if (platform.isPrebuiltAvailable()) {
       if (options.logo) args.push('-l', options.logo);
       if (options.logoSize) args.push('-p', options.logoSize.toString());
       if (options.quality) args.push('-q', options.quality.toString());
-      
+
       try {
         execFileSync(cliPath, args, { stdio: 'pipe' });
         return true;
@@ -55,7 +55,7 @@ if (platform.isPrebuiltAvailable()) {
     },
     VERSION: null  // Will be set below
   };
-  
+
   fastqr.VERSION = fastqr.version();
 } else {
   throw new Error(

data/bindings/nodejs/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fastqr-pro",
-  "version": "1.0.9",
+  "version": "1.0.11",
   "description": "Fast QR code generator with UTF-8 support, custom colors, logo embedding, and precise size control",
   "main": "index.js",
   "types": "index.d.ts",

data/bindings/ruby/lib/fastqr/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module FastQR
-  VERSION = "1.0.9"
+  VERSION = "1.0.11"
 end
 

data/bindings/ruby/lib/fastqr.rb

@@ -3,33 +3,6 @@
 require_relative "fastqr/version"
 require_relative "fastqr/platform"
 
-# Load pre-built binary if available, otherwise try to load compiled extension
-begin
-  if FastQR::Platform.prebuilt_available?
-    # Load from pre-built binary
-    require 'ffi'
-
-    module FastQR
-      module Native
-        extend FFI::Library
-
-        lib_path = Platform.lib_path
-        ffi_lib lib_path
-
-        # Define C functions
-        attach_function :fastqr_generate_c, :fastqr_generate, [:string, :string, :pointer], :int
-        attach_function :fastqr_version, [], :string
-      end
-    end
-  else
-    # Fall back to compiled extension
-    require_relative "fastqr/fastqr"
-  end
-rescue LoadError => e
-  warn "Warning: Could not load FastQR native extension: #{e.message}"
-  warn "Please run: gem install fastqr -- --with-system-libraries"
-end
-
 module FastQR
   class Error < StandardError; end
 
@@ -37,7 +10,11 @@ module FastQR
   #
   # @return [String] Version string
   def self.version
-    Native.fastqr_version
+    cli_path = Platform.find_binary
+    output = `#{cli_path} -v 2>&1`.strip
+    output.sub('FastQR v', '')
+  rescue => e
+    VERSION
   end
 
   # Generate QR code with options
@@ -77,10 +54,22 @@ module FastQR
     raise Error, "Data cannot be empty" if data.nil? || data.empty?
     raise Error, "Output path cannot be empty" if output_path.nil? || output_path.empty?
 
-    # TODO: Build C struct from options hash
-    # For now, pass nil to use defaults
-    result = Native.fastqr_generate_c(data, output_path, nil)
-    raise Error, "Failed to generate QR code" unless result == 1
+    cli_path = Platform.find_binary
+    args = [data, output_path]
+
+    # Build command arguments from options
+    args += ['-s', options[:size].to_s] if options[:size]
+    args += ['-o'] if options[:optimize_size]
+    args += ['-f', options[:foreground].join(',')] if options[:foreground]
+    args += ['-b', options[:background].join(',')] if options[:background]
+    args += ['-e', options[:error_level]] if options[:error_level]
+    args += ['-l', options[:logo]] if options[:logo]
+    args += ['-p', options[:logo_size].to_s] if options[:logo_size]
+    args += ['-q', options[:quality].to_s] if options[:quality]
+
+    # Execute CLI binary
+    result = system(cli_path, *args, out: File::NULL, err: File::NULL)
+    raise Error, "Failed to generate QR code" unless result
 
     true
   end

data/scripts/build-binaries.sh

@@ -37,10 +37,11 @@ rm -rf build
 mkdir build
 cd build
 
-# Configure with static linking
+echo "🔧 Building standalone CLI with static linking..."
+# Configure for standalone CLI (all dependencies static)
 cmake .. \
     -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_SHARED_LIBS=ON \
+    -DBUILD_SHARED_LIBS=OFF \
     -DCMAKE_INSTALL_PREFIX="$PWD/install" \
     -DFASTQR_BUILD_EXAMPLES=OFF
 
@@ -51,34 +52,14 @@ else
     make -j$(nproc)
 fi
 
-# Install to temporary location
-make install DESTDIR="$PWD/staging"
-
 cd ..
 
-# Copy binaries
-if [[ "$OS" == "macos" ]]; then
-    cp build/staging/usr/local/lib/libfastqr.*.dylib "$OUTPUT_DIR/lib/libfastqr.dylib" 2>/dev/null || \
-    cp build/libfastqr.*.dylib "$OUTPUT_DIR/lib/libfastqr.dylib" 2>/dev/null || \
-    cp build/libfastqr.dylib "$OUTPUT_DIR/lib/libfastqr.dylib"
+# Copy standalone CLI binary (no dylib needed!)
+cp build/fastqr "$OUTPUT_DIR/bin/fastqr"
+echo "✅ Built standalone CLI (all static - no dependencies!)"
 
-    cp build/staging/usr/local/bin/fastqr "$OUTPUT_DIR/bin/fastqr" 2>/dev/null || \
-    cp build/fastqr "$OUTPUT_DIR/bin/fastqr"
-else
-    # Copy all .so files to lib directory
-    if [ -f build/staging/usr/local/lib/libfastqr.so ]; then
-        cp build/staging/usr/local/lib/libfastqr.so* "$OUTPUT_DIR/lib/"
-    else
-        cp build/libfastqr.so* "$OUTPUT_DIR/lib/"
-    fi
-
-    # Copy binary
-    if [ -f build/staging/usr/local/bin/fastqr ]; then
-        cp build/staging/usr/local/bin/fastqr "$OUTPUT_DIR/bin/fastqr"
-    else
-        cp build/fastqr "$OUTPUT_DIR/bin/fastqr"
-    fi
-fi
+# No shared library needed - CLI is standalone!
+# (Ruby and Node.js use CLI binary directly)
 
 # Copy headers
 cp -r include "$OUTPUT_DIR/"

data/scripts/test-npm-real.sh

@@ -57,9 +57,9 @@ console.log('✅ Result:', result2);
 // Test 3: With options
 console.log('');
 console.log('Test 3: QR with optimize...');
-const result3 = fastqr.generate('Test Optimize', 'test_node_opt.png', { 
-  size: 500, 
-  optimizeSize: true 
+const result3 = fastqr.generate('Test Optimize', 'test_node_opt.png', {
+  size: 500,
+  optimizeSize: true
 });
 console.log('✅ Result:', result3);
 

data/src/fastqr.cpp

@@ -25,7 +25,7 @@
 // Enable benchmarking
 // #define FASTQR_BENCHMARK
 
-#define FASTQR_VERSION "1.0.9"
+#define FASTQR_VERSION "1.0.11"
 
 namespace fastqr {
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fastqr
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.11
 platform: ruby
 authors:
 - FastQR Project
@@ -10,20 +10,6 @@ bindir: bin
 cert_chain: []
 date: 2025-10-19 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: ffi
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -104,13 +90,11 @@ files:
 - bindings/ruby/prebuilt/macos-arm64/include/fastqr.h
 - bindings/ruby/prebuilt/macos-arm64/include/stb_image.h
 - bindings/ruby/prebuilt/macos-arm64/include/stb_image_write.h
-- bindings/ruby/prebuilt/macos-arm64/lib/libfastqr.dylib
 - bindings/ruby/prebuilt/macos-x86_64.tar.gz
 - bindings/ruby/prebuilt/macos-x86_64/bin/fastqr
 - bindings/ruby/prebuilt/macos-x86_64/include/fastqr.h
 - bindings/ruby/prebuilt/macos-x86_64/include/stb_image.h
 - bindings/ruby/prebuilt/macos-x86_64/include/stb_image_write.h
-- bindings/ruby/prebuilt/macos-x86_64/lib/libfastqr.dylib
 - build.sh
 - cmake/fastqrConfig.cmake.in
 - composer.json