Merge pull request #393 from Coeur/podspec

Podspec update

.travis.yml

@@ -98,6 +98,15 @@ matrix:
       before_install:
         - brew install openssl
       env: TOOL="-DMZ_OPENSSL=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl -DOPENSSL_INCLUDE_DIRS=/usr/local/opt/openssl/include -DOPENSSL_CRYPTO_LIBRARY=/usr/local/opt/openssl/lib/libcrypto.dylib -DOPENSSL_SSL_LIBRARY=/usr/local/opt/openssl/lib/libssl.dylib"
+    - stage: macintosh
+      os: osx
+      before_script:
+        - mkdir example
+        - cd example
+        - cmake -G Xcode ..
+        - echo "target 'minizip' do pod 'Minizip', :path => '..'; platform :osx; end" > Podfile
+      script:
+        - pod install
 
 before_install:
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then sudo apt-get -y install libbsd-dev libssl-dev; fi

Minizip.podspec

@@ -13,25 +13,48 @@ DESC
   s.homepage = 'https://github.com/nmoinvaz/minizip'
   s.authors = 'Nathan Moinvaziri', 'Gilles Vollant'
 
-  s.source   = { :git => 'https://github.com/nmoinvaz/minizip.git' }
-  s.libraries = 'z'
+  s.source   = { :git => 'https://github.com/nmoinvaz/minizip.git', :tag => "#{s.version}" }
+  s.libraries = 'z', 'iconv'
+  s.default_subspecs = 'Core', 'PKCRYPT', 'WZAES_APPLE', 'BZIP2'
 
   s.subspec 'Core' do |sp|
-    sp.source_files = '{mz_os,mz_compat,mz_strm,mz_strm_mem,mz_strm_buf,mz_zip,mz_strm_crypt,mz_strm_posix,mz_strm_zlib}.{c,h}'
+    sp.source_files = '{mz,mz_os,mz_os_posix,mz_compat,mz_crypt,mz_strm,mz_strm_mem,mz_strm_buf,mz_strm_crypt,mz_strm_os_posix,mz_strm_zlib,mz_zip}.{c,h}'
+    sp.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'HAVE_INTTYPES_H HAVE_STDINT_H HAVE_ZLIB' }
   end
 
-  s.subspec 'AES' do |sp|
+  s.subspec 'PKCRYPT' do |sp|
+    # Enables PKWARE traditional encryption
     sp.dependency 'Minizip/Core'
-    sp.source_files = 'lib/aes/*.{c,h}', 'mz_strm_aes.{c,h}'
+    sp.source_files = 'mz_strm_pkcrypt.{c,h}'
+    sp.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'HAVE_PKCRYPT' }
+  end
+
+  s.subspec 'WZAES_APPLE' do |sp|
+    # Enables Apple's Security framework for AES
+    sp.dependency 'Minizip/Core'
+    sp.source_files = 'mz_strm_wzaes.{c,h}', 'mz_crypt_apple.c'
+    sp.framework = 'Security'
+    sp.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'HAVE_WZAES MZ_ZIP_NO_SIGNING' }
+  end
+
+  s.subspec 'WZAES_BRG' do |sp|
+    # Enables Brian Gladman's encryption library for AES
+    sp.dependency 'Minizip/Core'
+    sp.source_files = 'lib/brg/*.{c,h}', 'mz_strm_wzaes.{c,h}', 'mz_crypt_brg.c'
+    sp.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'HAVE_ARC4RANDOM_BUF HAVE_WZAES MZ_ZIP_NO_SIGNING' }
   end
 
   s.subspec 'BZIP2' do |sp|
+    # Enables BZIP2 compression
     sp.dependency 'Minizip/Core'
     sp.source_files = 'lib/bzip2/*.{c,h}', 'mz_strm_bzip.{c,h}'
+    sp.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'HAVE_BZIP2' }
   end
 
   s.subspec 'LZMA' do |sp|
+    # Enables LZMA compression
     sp.dependency 'Minizip/Core'
-    sp.source_files = 'lib/liblzma/*.{c,h}', 'mz_strm_lzma.{c,h}'
+    sp.source_files = 'lib/liblzma/**/*.{c,h}', 'mz_strm_lzma.{c,h}'
+    sp.pod_target_xcconfig = { 'GCC_PREPROCESSOR_DEFINITIONS' => 'HAVE_LZMA' }
   end
 end