Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

Commit

Permalink
* [Core] Refector code, make jsengine can run on multi thread environ…
Browse files Browse the repository at this point in the history
…ment (#1510)

* Make jsengine can run on multi thread environment
* iOS uses WeexCore
  • Loading branch information
Darin726 authored and YorkShen committed Sep 12, 2018
1 parent 3df521a commit 6059839
Show file tree
Hide file tree
Showing 345 changed files with 28,742 additions and 12,517 deletions.
115 changes: 60 additions & 55 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,110 +1,115 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (2.3.4)
activesupport (4.2.7.1)
CFPropertyList (3.0.0)
activesupport (4.2.10)
i18n (~> 0.7)
json (~> 1.7, >= 1.7.7)
minitest (~> 5.1)
thread_safe (~> 0.3, >= 0.3.4)
tzinfo (~> 1.1)
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
claide (1.0.1)
addressable (2.5.2)
public_suffix (>= 2.0.2, < 4.0)
atomos (0.1.2)
claide (1.0.2)
claide-plugins (0.9.2)
cork
nap
open4 (~> 1.3)
cocoapods (1.1.1)
cocoapods (1.5.3)
activesupport (>= 4.0.2, < 5)
claide (>= 1.0.1, < 2.0)
cocoapods-core (= 1.1.1)
cocoapods-deintegrate (>= 1.0.1, < 2.0)
cocoapods-downloader (>= 1.1.2, < 2.0)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.5.3)
cocoapods-deintegrate (>= 1.0.2, < 2.0)
cocoapods-downloader (>= 1.2.0, < 2.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-stats (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.1.1, < 2.0)
cocoapods-trunk (>= 1.3.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored (~> 1.2)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (~> 2.0.1)
gh_inspector (~> 1.0)
molinillo (~> 0.5.1)
molinillo (~> 0.6.5)
nap (~> 1.0)
xcodeproj (>= 1.3.3, < 2.0)
cocoapods-core (1.1.1)
activesupport (>= 4.0.2, < 5)
ruby-macho (~> 1.1)
xcodeproj (>= 1.5.7, < 2.0)
cocoapods-core (1.5.3)
activesupport (>= 4.0.2, < 6)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
cocoapods-deintegrate (1.0.1)
cocoapods-downloader (1.1.3)
cocoapods-deintegrate (1.0.2)
cocoapods-downloader (1.2.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
cocoapods-stats (1.0.0)
cocoapods-trunk (1.1.2)
cocoapods-trunk (1.3.0)
nap (>= 0.8, < 2.0)
netrc (= 0.7.8)
netrc (~> 0.11)
cocoapods-try (1.1.0)
colored (1.2)
cork (0.2.0)
colored (~> 1.2)
danger (4.0.5)
colored2 (3.1.2)
concurrent-ruby (1.0.5)
cork (0.3.0)
colored2 (~> 3.1)
danger (5.6.2)
claide (~> 1.0)
claide-plugins (>= 0.9.2)
colored (~> 1.2)
colored2 (~> 3.1)
cork (~> 0.1)
faraday (~> 0.9)
faraday-http-cache (~> 1.0)
git (~> 1)
kramdown (~> 1.5)
octokit (~> 4.2)
no_proxy_fix
octokit (~> 4.7)
terminal-table (~> 1)
danger-plugin-api (1.0.0)
danger (> 2.0)
danger-xcode_summary (0.1.0)
danger-xcode_summary (0.5.0)
danger-plugin-api (~> 1.0)
escape (0.0.4)
faraday (0.11.0)
faraday (0.15.2)
multipart-post (>= 1.2, < 3)
faraday-http-cache (1.3.1)
faraday (~> 0.8)
fourflusher (2.0.1)
fuzzy_match (2.0.4)
gh_inspector (1.0.3)
git (1.3.0)
i18n (0.7.0)
json (1.8.3)
kramdown (1.13.2)
minitest (5.10.1)
molinillo (0.5.5)
gh_inspector (1.1.3)
git (1.4.0)
i18n (0.9.5)
concurrent-ruby (~> 1.0)
kramdown (1.17.0)
minitest (5.11.3)
molinillo (0.6.5)
multipart-post (2.0.0)
nanaimo (0.2.3)
nanaimo (0.2.5)
nap (1.1.0)
netrc (0.7.8)
octokit (4.6.2)
netrc (0.11.0)
no_proxy_fix (0.1.2)
octokit (4.9.0)
sawyer (~> 0.8.0, >= 0.5.3)
open4 (1.3.4)
public_suffix (2.0.5)
rouge (1.11.1)
public_suffix (3.0.2)
rouge (2.0.7)
ruby-macho (1.2.0)
sawyer (0.8.1)
addressable (>= 2.3.5, < 2.6)
faraday (~> 0.8, < 1.0)
terminal-table (1.7.3)
unicode-display_width (~> 1.1.1)
thread_safe (0.3.5)
tzinfo (1.2.2)
terminal-table (1.8.0)
unicode-display_width (~> 1.1, >= 1.1.1)
thread_safe (0.3.6)
tzinfo (1.2.5)
thread_safe (~> 0.1)
unicode-display_width (1.1.3)
xcodeproj (1.4.2)
CFPropertyList (~> 2.3.3)
activesupport (>= 3)
claide (>= 1.0.1, < 2.0)
colored (~> 1.2)
nanaimo (~> 0.2.3)
xcpretty (0.2.4)
rouge (~> 1.8)
unicode-display_width (1.4.0)
xcodeproj (1.5.9)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.2)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.2.5)
xcpretty (0.2.8)
rouge (~> 2.0.7)
xcpretty-json-formatter (0.1.0)
xcpretty (~> 0.2, >= 0.0.7)

Expand All @@ -119,4 +124,4 @@ DEPENDENCIES
xcpretty-json-formatter!

BUNDLED WITH
1.13.7
1.16.2
32 changes: 22 additions & 10 deletions WeexSDK.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -19,29 +19,41 @@ Pod::Spec.new do |s|
LICENSE
}
s.authors = { "cxfeng1" => "[email protected]",
"boboning" => "[email protected]",
"yangshengtao" => "[email protected]",
"kfeagle" => "[email protected]",
"acton393" => "[email protected]"
"kfeagle" => "[email protected]"
}
s.platform = :ios
s.ios.deployment_target = '8.0'
s.source = { :path => '.' }
s.source_files = 'ios/sdk/WeexSDK/Sources/**/*.{h,m,mm,c,cpp}'
s.source_files = 'ios/sdk/WeexSDK/Sources/**/*.{h,m,mm,c,cpp,cc}'
s.resources = 'pre-build/*.js','ios/sdk/WeexSDK/Resources/[email protected]'

s.user_target_xcconfig = { 'FRAMEWORK_SEARCH_PATHS' => "'$(PODS_ROOT)/WeexSDK'" }
s.requires_arc = true
s.prefix_header_file = 'ios/sdk/WeexSDK/Sources/Supporting Files/WeexSDK-Prefix.pch'

# s.xcconfig = { "GCC_PREPROCESSOR_DEFINITIONS" => '$(inherited) DEBUG=1' }

s.private_header_files = 'ios/sdk/WeexSDK/Sources/Component/RecycleList/WXJSASTParser.h',
'ios/sdk/WeexSDK/Sources/Layout/WXScrollerComponent+Layout.h'
'ios/sdk/WeexSDK/Sources/Layout/WXScrollerComponent+Layout.h',
'weex_core/Source/**/*.{h,hpp}'

s.xcconfig = { "OTHER_LINK_FLAG" => '$(inherited) -ObjC', 'GCC_PREPROCESSOR_DEFINITIONS' => 'OS_IOS=1' }

s.frameworks = 'CoreMedia','MediaPlayer','AVFoundation','AVKit','JavaScriptCore','GLKit','OpenGLES','CoreText','QuartzCore','CoreGraphics'

s.default_subspec='WeexCore'

s.subspec 'WeexCore' do |w|
w.source_files = 'weex_core/Source/base/**/*.{h,hpp,m,mm,c,cpp,cc}',
'weex_core/Source/core/**/*.{h,hpp,m,mm,c,cpp,cc}',
'weex_core/Source/wson/**/*.{h,hpp,m,mm,c,cpp,cc}',
'weex_core/Source/third_party/**/*.{h,hpp,m,mm,c,cpp,cc}',
'weex_core/Source/include/**/*.{h,hpp,m,mm,c,cpp,cc}'
w.exclude_files = 'weex_core/Source/**/*android.{h,hpp,m,mm,c,cpp,cc}'

s.xcconfig = { "OTHER_LINK_FLAG" => '$(inherited) -ObjC'}
w.xcconfig = { 'USER_HEADER_SEARCH_PATHS' => ['${PODS_ROOT}/Headers/Public/WeexSDK/core/**'] }
w.header_mappings_dir = 'weex_core/Source'

s.frameworks = 'CoreMedia','MediaPlayer','AVFoundation','AVKit','JavaScriptCore', 'GLKit', 'OpenGLES', 'CoreText', 'QuartzCore', 'CoreGraphics'
s.libraries = "stdc++"
w.libraries = "stdc++"
end

end
5 changes: 5 additions & 0 deletions android/playground/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,11 @@ under the License.
<activity android:name="com.alibaba.weex.BenchmarkActivity"
android:screenOrientation="portrait"/>

<activity android:name=".SliceTestActivity"
android:exported="true"
android:screenOrientation="portrait">
</activity>

<service
android:name=".update.UpdateService"
android:exported="false" />
Expand Down
Loading

0 comments on commit 6059839

Please sign in to comment.