From 52c26e008ff3f4b9c3f4b5eee0a04e7aee5af98e Mon Sep 17 00:00:00 2001 From: Fabio Pelosin Date: Wed, 20 Mar 2013 22:57:58 +0100 Subject: [PATCH] [Fix] Deprecated hooks --- Ejecta/1.2/Ejecta.podspec | 54 +++++++++++++++++-------- SSZipArchive/0.2.2/SSZipArchive.podspec | 7 +--- box2d/2.3.0/box2d.podspec | 6 +-- cocos2d/1.1.rc0/cocos2d.podspec | 10 ++--- cocos2d/2.0.0/cocos2d.podspec | 4 +- cocos2d/2.0.rc1/cocos2d.podspec | 5 +-- cocos2d/2.1.rc0/cocos2d.podspec | 6 +-- glfw/2.7.6/glfw.podspec | 12 +----- jsoncpp/0.6.2.rc2/jsoncpp.podspec | 7 +--- 9 files changed, 50 insertions(+), 61 deletions(-) diff --git a/Ejecta/1.2/Ejecta.podspec b/Ejecta/1.2/Ejecta.podspec index edc8ab30..6a552045 100644 --- a/Ejecta/1.2/Ejecta.podspec +++ b/Ejecta/1.2/Ejecta.podspec @@ -1,31 +1,51 @@ Pod::Spec.new do |s| - s.name = 'Ejecta' - s.version = '1.2' - s.license = 'MIT' - s.summary = 'A Fast, Open Source JavaScript, Canvas & Audio Implementation for iOS.' - s.homepage = 'http://impactjs.com/ejecta' - s.author = { 'Dominic Szablewski' => 'dominic.szablewski@gmail.com' } - s.source = { :git => 'https://github.com/phoboslab/Ejecta.git', :tag => 'v1.2' } - s.platform = :ios + s.name = 'Ejecta' + s.version = '1.2' + s.summary = 'A Fast, Open Source JavaScript, Canvas & Audio Implementation for iOS.' + s.homepage = 'http://impactjs.com/ejecta' + s.author = { 'Dominic Szablewski' => 'dominic.szablewski@gmail.com' } + s.source = { :git => 'https://github.com/phoboslab/Ejecta.git', :tag => 'v1.2' } + s.platform = :ios s.source_files = 'Classes/**/*.{h,m,mm}' s.resources = 'ejecta.js' s.preferred_dependency = 'Library' s.frameworks = 'SystemConfiguration', 'CoreText', 'QuartzCore', 'GameKit', 'CoreGraphics', 'OpenAL', 'AudioToolbox', 'OpenGLES', 'AVFoundation', 'iAd' - - def s.copy_header_mapping(from) - from.relative_path_from(Pathname.new('Classes/Ejecta')) - end + s.header_dir = 'Classes/Ejecta' s.subspec 'Library' do |os| os.source_files = 'JavaScriptCore/*.h', 'lodepng/*.{c,h}' os.preserve_paths = ['libJavaScriptCore.a'] os.library = 'JavaScriptCore', 'stdc++', 'icucore' os.xcconfig = { 'LIBRARY_SEARCH_PATHS' => '"$(PODS_ROOT)/Ejecta"' } - - def os.copy_header_mapping(from) - from.relative_path_from(Pathname.new('')) - end + os.header_mappings_dir = '.' end -end + + s.license = { :type => 'MIT', :text => <<-TXT + Copyright (c) 2013 Dominic Szablewski + + Permission is hereby granted, free of charge, to any person + obtaining a copy of this software and associated + documentation files (the "Software"), to deal in the Software + without restriction, including without limitation the rights + to use, copy, modify, merge, publish, distribute, sublicense, + and/or sell copies of the Software, and to permit persons to + whom the Software is furnished to do so, subject to the + following conditions: + + The above copyright notice and this permission notice shall + be included in all copies or substantial portions of the + Software. + + THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY + KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE + WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE + AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT + HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, + WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR + OTHER DEALINGS IN THE SOFTWARE. + TXT + } +end diff --git a/SSZipArchive/0.2.2/SSZipArchive.podspec b/SSZipArchive/0.2.2/SSZipArchive.podspec index da33e5d1..ef6ac6bc 100644 --- a/SSZipArchive/0.2.2/SSZipArchive.podspec +++ b/SSZipArchive/0.2.2/SSZipArchive.podspec @@ -8,10 +8,5 @@ Pod::Spec.new do |s| s.description = 'SSZipArchive is a simple utility class for zipping and unzipping files on iOS and Mac.' s.source_files = 'SSZipArchive.{h,m}', 'minizip' s.library = 'z' - s.license = { :type => 'MIT', :file => 'LICENSE' } - - # Maintain the dir structure for headers - def s.copy_header_mapping(from) - from - end + s.license = { :type => 'MIT', :file => 'LICENSE' } end diff --git a/box2d/2.3.0/box2d.podspec b/box2d/2.3.0/box2d.podspec index 62c6d089..fdcdf72c 100644 --- a/box2d/2.3.0/box2d.podspec +++ b/box2d/2.3.0/box2d.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'box2d' - s.license = { :type => 'zlib', :file => 'License.txt' } + s.license = { :type => 'zlib' } s.version = '2.3.0' s.summary = 'Box2D is an open source C++ engine for simulating rigid bodies in 2D.' s.description = 'Box2D is an open source C++ engine for simulating rigid bodies in 2D. Box2D is developed by Erin Catto and has the zlib license. While the zlib license does not require acknowledgement, we encourage you to give credit to Box2D in your product.' @@ -8,7 +8,5 @@ Pod::Spec.new do |s| s.author = 'Erin Catto' s.source = {:svn => 'http://box2d.googlecode.com/svn/trunk/Box2D', :revision => '249' } s.source_files = 'Box2D/**/*.{h,cpp}' - def s.copy_header_mapping(from) - from.relative_path_from(Pathname.new('Box2D')) - end + s.header_mappings_dir = 'Box2D' end diff --git a/cocos2d/1.1.rc0/cocos2d.podspec b/cocos2d/1.1.rc0/cocos2d.podspec index b1f20488..c7ef8715 100644 --- a/cocos2d/1.1.rc0/cocos2d.podspec +++ b/cocos2d/1.1.rc0/cocos2d.podspec @@ -3,7 +3,7 @@ Pod::Spec.new do |s| s.license = { :type => 'MIT', :file => 'LICENSE_cocos2d.txt' } s.version = '1.1.rc0' s.summary = 'cocos2d for iPhone is a framework for building 2D games, demos, and other graphical/interactive applications.' - s.description = 'cocos2d for iPhone is a framework for building 2D games, demos, and other graphical/interactive applications for iPod Touch, iPhone, iPad and Mac. It is based on the cocos2d design but instead of using python it, uses objective-c.' + s.description = 'cocos2d for iPhone is a framework for building 2D games, demos, and other graphical/interactive applications for iPod Touch, iPhone, iPad and Mac. It is based on the cocos2d design but instead of using python it, uses Objective-C.' s.homepage = 'http://www.cocos2d-iphone.org' s.author = { 'Ricardo Quesada' => 'ricardoquesada@gmail.com', 'Zynga Inc.' => 'https://zynga.com/' } s.source = {:git => 'https://github.com/cocos2d/cocos2d-iphone.git', :commit => '7ee5b9abf645c32379a45317986a308204277bb1'} @@ -14,11 +14,7 @@ Pod::Spec.new do |s| cc.frameworks = ["CoreGraphics", "OpenGLES", "QuartzCore"] cc.library = 'z' cc.resources = "Resources/Fonts/fps_images*.png" - - def cc.copy_header_mapping(from) - from.relative_path_from(Pathname.new('cocos2d')) - end - + cc.header_mappings_dir = 'cocos2d' cc.ios.dependency 'FontLabel' end @@ -26,4 +22,4 @@ Pod::Spec.new do |s| cd.source_files = 'CocosDenshion/CocosDenshion/*.{h,m}' cd.frameworks = ["AVFoundation", "OpenAL", "CoreFoundation", "AudioToolbox", "Foundation"] end -end \ No newline at end of file +end diff --git a/cocos2d/2.0.0/cocos2d.podspec b/cocos2d/2.0.0/cocos2d.podspec index ccda1c14..24e2657a 100644 --- a/cocos2d/2.0.0/cocos2d.podspec +++ b/cocos2d/2.0.0/cocos2d.podspec @@ -25,7 +25,5 @@ Pod::Spec.new do |s| #define CC_ENABLE_GL_STATE_CACHE 1 ''' - def s.copy_header_mapping(from) - from.relative_path_from(Pathname.new('cocos2d')) - end + s.header_mappings_dir = 'cocos2d' end diff --git a/cocos2d/2.0.rc1/cocos2d.podspec b/cocos2d/2.0.rc1/cocos2d.podspec index 798d2765..e57f2ea4 100644 --- a/cocos2d/2.0.rc1/cocos2d.podspec +++ b/cocos2d/2.0.rc1/cocos2d.podspec @@ -17,8 +17,5 @@ Pod::Spec.new do |s| s.frameworks = ["OpenGLES", "OpenAL", "AVFoundation", "AudioToolbox", "QuartzCore", "GameKit"] s.library = 'z' - - def s.copy_header_mapping(from) - from.relative_path_from(Pathname.new('cocos2d')) - end + s.header_mappings_dir = 'cocos2d' end diff --git a/cocos2d/2.1.rc0/cocos2d.podspec b/cocos2d/2.1.rc0/cocos2d.podspec index 2d4912c0..e014faff 100644 --- a/cocos2d/2.1.rc0/cocos2d.podspec +++ b/cocos2d/2.1.rc0/cocos2d.podspec @@ -10,14 +10,12 @@ Pod::Spec.new do |s| s.source_files = 'cocos2d/**/*.{h,m,c}', 'CocosDenshion/*.{h,m}', FileList['external/libpng/*.{h,c}'].exclude(/pngtest.c/, /example.c/), 'external/kazmath/src/**/*.{c,h}', 'external/kazmath/include/**/*.{c,h}' - + s.xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_ROOT}/cocos2d/external/kazmath/include"' } s.frameworks = ["OpenGLES", "OpenAL", "AVFoundation", "AudioToolbox", "QuartzCore", "GameKit"] s.library = 'z' - def s.copy_header_mapping(from) - from.relative_path_from(Pathname.new('cocos2d')) - end + s.header_mappings_dir = 'cocos2d' end diff --git a/glfw/2.7.6/glfw.podspec b/glfw/2.7.6/glfw.podspec index 0aeb6127..e9ab1e44 100644 --- a/glfw/2.7.6/glfw.podspec +++ b/glfw/2.7.6/glfw.podspec @@ -1,7 +1,7 @@ Pod::Spec.new do |s| s.name = "glfw" s.version = "2.7.6" - s.summary = "GLFW is a free, Open Source, multi-platform library for opening a window, creating an OpenGL context and managing input. " + s.summary = "GLFW is a free, Open Source, multi-platform library for opening a window, creating an OpenGL context and managing input." s.description = <<-DESC GLFW is a free, Open Source, multi-platform library for opening a window, creating an OpenGL context and managing input. It is easy to integrate into @@ -10,21 +10,13 @@ Pod::Spec.new do |s| GLFW is written in C and has native support for Windows, Mac OS X and many Unix-like systems using the X Window System, such as Linux and FreeBSD. DESC s.homepage = "http://www.glfw.org" - s.license = { :type => "zlib/libpng", :file => "COPYING.txt" } - s.author = 'glfw project' - s.source = { :svn => 'http://glfw.svn.sourceforge.net/svnroot/glfw/tags/2.7.6/' } - s.platform = :osx s.source_files = 'lib/*.{c,h}', 'lib/cocoa', 'include/**/*.h' s.public_header_files = 'include/**/*.h' - #s.header_mappings_dir = 'include' + s.header_mappings_dir = 'include' s.frameworks = 'IOKit', 'OpenGL', 'Cocoa' - - def s.copy_header_mapping(from) - from.relative_path_from(Pathname.new('include')) - end end diff --git a/jsoncpp/0.6.2.rc2/jsoncpp.podspec b/jsoncpp/0.6.2.rc2/jsoncpp.podspec index fcb58b9d..fc1bd675 100644 --- a/jsoncpp/0.6.2.rc2/jsoncpp.podspec +++ b/jsoncpp/0.6.2.rc2/jsoncpp.podspec @@ -12,6 +12,7 @@ Pod::Spec.new do |s| s.source = { :svn => 'https://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/tags/jsoncpp/0.6.0-rc2/' } s.source_files = 'dist', 'dist/**/*.{h,cpp}' s.preserve_paths = "amalgamate.py", "include", "src" + s.header_mappings_dir = 'dist' def s.pre_install(pod, target_definition) Dir.chdir(pod.root) do @@ -29,10 +30,4 @@ Pod::Spec.new do |s| `perl -pi -e 's/^.+(#\\s*define\\s+JSON_IS_AMALGAMATION)/$1/g' dist/json/json.h` end end - - def s.copy_header_mapping(from) - # Need this to make sure json.h is copied to json/json.h - # (as it is included from this path) - from.relative_path_from(Pathname.new('dist')) - end end