You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by cx...@apache.org on 2017/04/18 07:58:51 UTC
[4/5] incubator-weex git commit: + [ios] update podspec
+ [ios] update podspec
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/dd047ba5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/dd047ba5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/dd047ba5
Branch: refs/heads/0.12-dev
Commit: dd047ba525709c9c0f002d560f58676886d350e4
Parents: 18fd3e6
Author: \u9f50\u5c71 <su...@163.com>
Authored: Tue Apr 18 14:25:26 2017 +0800
Committer: \u9f50\u5c71 <su...@163.com>
Committed: Tue Apr 18 14:25:26 2017 +0800
----------------------------------------------------------------------
WeexSDK.podspec | 8 ++--
ios/playground/Podfile | 3 +-
.../WeexDemo.xcodeproj/project.pbxproj | 20 +--------
ios/sdk/WeexSDK.podspec | 47 --------------------
4 files changed, 7 insertions(+), 71 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dd047ba5/WeexSDK.podspec
----------------------------------------------------------------------
diff --git a/WeexSDK.podspec b/WeexSDK.podspec
index 6ec182f..8279ec3 100644
--- a/WeexSDK.podspec
+++ b/WeexSDK.podspec
@@ -27,18 +27,16 @@ Pod::Spec.new do |s|
s.platform = :ios
s.ios.deployment_target = '7.0'
s.source = { :path => '.' }
- s.source_files = 'ios/playground/WeexSDK/Sources/**/*.{h,m,mm,c}'
- s.resources = 'ios/playground/WeexSDK/Resources/main.js', 'ios/playground/WeexSDK/Resources/wx_load_error@3x.png'
+ s.source_files = 'ios/sdk/WeexSDK/Sources/**/*.{h,m,mm,c}'
+ s.resources = 'ios/sdk/WeexSDK/Resources/main.js', 'ios/sdk/WeexSDK/Resources/wx_load_error@3x.png'
s.requires_arc = true
- s.prefix_header_file = 'ios/playground/WeexSDK/Sources/Supporting Files/WeexSDK-Prefix.pch'
+ s.prefix_header_file = 'ios/sdk/WeexSDK/Sources/Supporting Files/WeexSDK-Prefix.pch'
# s.xcconfig = { "GCC_PREPROCESSOR_DEFINITIONS" => '$(inherited) DEBUG=1' }
s.xcconfig = { "OTHER_LINK_FLAG" => '$(inherited) -ObjC'}
- s.user_target_xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => "'$(PODS_ROOT)/WeexSDK'" }
-
s.frameworks = 'CoreMedia','MediaPlayer','AVFoundation','AVKit','JavaScriptCore', 'GLKit'
s.dependency 'SocketRocket'
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dd047ba5/ios/playground/Podfile
----------------------------------------------------------------------
diff --git a/ios/playground/Podfile b/ios/playground/Podfile
index b9e11fb..8c47e78 100644
--- a/ios/playground/Podfile
+++ b/ios/playground/Podfile
@@ -3,12 +3,13 @@ platform :ios, '7.0'
#inhibit_all_warnings!
def common
- pod 'WeexSDK', :path=>'../sdk/'
+ pod 'WeexSDK', :path=>'../../'
pod 'WXDevtool', '0.9.5'
pod 'SDWebImage', '3.7.5'
pod 'SocketRocket', '0.4.2'
pod 'ATSDK-Weex', '0.0.1'
+ # WeexGcanvas is added by Weex Plugin, more info at https://market.dotwe.org/ext/list.htm
pod 'WeexGcanvas', '0.0.1.5'
end
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dd047ba5/ios/playground/WeexDemo.xcodeproj/project.pbxproj
----------------------------------------------------------------------
diff --git a/ios/playground/WeexDemo.xcodeproj/project.pbxproj b/ios/playground/WeexDemo.xcodeproj/project.pbxproj
index b613286..c005e17 100644
--- a/ios/playground/WeexDemo.xcodeproj/project.pbxproj
+++ b/ios/playground/WeexDemo.xcodeproj/project.pbxproj
@@ -364,7 +364,6 @@
84361D431CA10F8E00F43825 /* Resources */,
84361D6F1CA10F8E00F43825 /* [CP] Copy Pods Resources */,
84361D701CA10F8E00F43825 /* [CP] Embed Pods Frameworks */,
- 567369891CE436EB000A646C /* ShellScript */,
);
buildRules = (
);
@@ -447,21 +446,6 @@
/* End PBXResourcesBuildPhase section */
/* Begin PBXShellScriptBuildPhase section */
- 36DF47C61FC947C616E7CB76 /* [CP] Copy Pods Resources */ = {
- isa = PBXShellScriptBuildPhase;
- buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- );
- name = "[CP] Copy Pods Resources";
- outputPaths = (
- );
- runOnlyForDeploymentPostprocessing = 0;
- shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WeexDemo/Pods-WeexDemo-resources.sh\"\n";
- showEnvVarsInLog = 0;
- };
685399B3421CD1410375A2AD /* [CP] Embed Pods Frameworks */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
@@ -474,7 +458,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "myFile=\"XcodeCoverage/exportenv.sh\"\n\nif [ -f \"$myFile\" ]; then\nXcodeCoverage/exportenv.sh\nfi";
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WeexDemo/Pods-WeexDemo-frameworks.sh\"\n";
};
74CC7A221C2C13BF00829368 /* Start Samples */ = {
isa = PBXShellScriptBuildPhase;
@@ -562,7 +546,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WeexDemo/Pods-WeexDemo-frameworks.sh\"\n";
+ shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-WeexDemo/Pods-WeexDemo-resources.sh\"\n";
showEnvVarsInLog = 0;
};
/* End PBXShellScriptBuildPhase section */
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/dd047ba5/ios/sdk/WeexSDK.podspec
----------------------------------------------------------------------
diff --git a/ios/sdk/WeexSDK.podspec b/ios/sdk/WeexSDK.podspec
deleted file mode 100644
index 5cc5805..0000000
--- a/ios/sdk/WeexSDK.podspec
+++ /dev/null
@@ -1,47 +0,0 @@
-# coding: utf-8
-Pod::Spec.new do |s|
-
- s.name = "WeexSDK"
-
- s.version = "0.11.0"
-
- s.summary = "WeexSDK Source ."
-
- s.description = <<-DESC
- A framework for building Mobile cross-platform UI
- DESC
-
- s.homepage = "https://github.com/alibaba/weex"
- s.license = {
- :type => 'Copyright',
- :text => <<-LICENSE
- Alibaba-INC copyright
- LICENSE
- }
- s.authors = { "cxfeng1" => "cxfeng1@gmail.com",
- "boboning" => "ningli928@163.com",
- "yangshengtao" => "yangshengtao1314@163.com",
- "kfeagle" => "sunjjbobo@163.com",
- "acton393" => "zhangxing610321@gmail.com"
- }
- s.platform = :ios
- s.ios.deployment_target = '7.0'
- s.source = { :path => '.' }
- s.source_files = 'WeexSDK/Sources/**/*.{h,m,mm,c}'
- s.resources = 'WeexSDK/Resources/main.js', 'WeexSDK/Resources/wx_load_error@3x.png'
-
- s.requires_arc = true
- s.prefix_header_file = 'WeexSDK/Sources/Supporting Files/WeexSDK-Prefix.pch'
-
-# s.xcconfig = { "GCC_PREPROCESSOR_DEFINITIONS" => '$(inherited) DEBUG=1' }
-
- s.xcconfig = { "OTHER_LINK_FLAG" => '$(inherited) -ObjC'}
-
- s.user_target_xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => "'$(PODS_ROOT)/WeexSDK'" }
-
- s.frameworks = 'CoreMedia','MediaPlayer','AVFoundation','AVKit','JavaScriptCore', 'GLKit'
-
- s.dependency 'SocketRocket'
- s.libraries = "stdc++"
-
-end