Permalink
Show file tree
Hide file tree
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Showing
6 changed files
with
699 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -289,10 +289,21 @@ def frameworks_dependencies | ||
end | ||
deps << framework | ||
end | ||
deps.uniq.select { |dep| File.exist?(File.join(datadir, 'BridgeSupport', dep + '.bridgesupport')) } | ||
deps = deps.uniq.select { |dep| File.exist?(File.join(datadir, 'BridgeSupport', dep + '.bridgesupport')) } | ||
deps << 'UIAutomation' if spec_mode | ||
deps | ||
end | ||
end | ||
|
||
def frameworks_stubs_objects(platform) | ||
stubs = [] | ||
frameworks_dependencies.each do |framework| | ||
stubs_obj = File.join(datadir, platform, "#{framework}_stubs.o") | ||
stubs << stubs_obj if File.exist?(stubs_obj) | ||
end | ||
stubs | ||
end | ||
|
||
def bridgesupport_files | ||
@bridgesupport_files ||= begin | ||
bs_files = [] | ||
@@ -311,7 +322,21 @@ def bridgesupport_files | ||
end | ||
|
||
def spec_files | ||
Dir.glob(File.join(specs_dir, '**', '*.rb')) | ||
@spec_files ||= begin | ||
# Core library + core helpers. | ||
files = Dir.chdir(File.join(File.dirname(__FILE__), '..')) { (['spec.rb'] + Dir.glob('spec/helpers/*.rb')).map { |x| File.expand_path(x) } } | ||
# Project helpers. | ||
files += Dir.glob(File.join(specs_dir, 'helpers', '*.rb')) | ||
# Project specs. | ||
specs = Dir.glob(File.join(specs_dir, '*.rb')) | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
marcisme
Contributor
|
||
if files_filter = ENV['files'] | ||
# Filter specs we want to run. A filter can be either the basename of a spec file or its path. | ||
files_filter = files_filter.split(',') | ||
files_filter.map! { |x| File.exist?(x) ? File.expand_path(x) : x } | ||
specs.delete_if { |x| !files_filter.include?(File.expand_path(x)) and !files_filter.include?(File.basename(x, '.rb')) } | ||
end | ||
files + specs | ||
end | ||
end | ||
|
||
def motiondir | ||
@@ -389,7 +414,9 @@ def arch_flags(platform) | ||
end | ||
|
||
def common_flags(platform) | ||
"#{arch_flags(platform)} -isysroot \"#{sdk(platform)}\" -miphoneos-version-min=#{deployment_target} -F#{sdk(platform)}/System/Library/Frameworks" | ||
cflags = "#{arch_flags(platform)} -isysroot \"#{sdk(platform)}\" -miphoneos-version-min=#{deployment_target} -F#{sdk(platform)}/System/Library/Frameworks" | ||
cflags << " -F#{sdk(platform)}/Developer/Library/PrivateFrameworks" if spec_mode # For UIAutomation | ||
cflags | ||
end | ||
|
||
def cflags(platform, cplusplus) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Is there a reason you removed the "**" as I have specs in subdirectories that are no longer found.
Could we change line 331 back to
Thanks