Skip to content

Commit

Permalink
Fixed architecture check.
Browse files Browse the repository at this point in the history
Need to find a better solution one day; order shouldn't matter.
  • Loading branch information
erikdoe committed Jul 15, 2020
1 parent a5dc96c commit 98c7b09
Showing 1 changed file with 3 additions and 4 deletions.
7 changes: 3 additions & 4 deletions Tools/build.rb
Original file line number Diff line number Diff line change
Expand Up @@ -117,15 +117,14 @@ def sanityCheck
@worker.run("lipo -info #{osxproductdir}/OCMock.framework/OCMock") { |lipo| archs = /re: (.*)/.match(lipo.readline)[1].strip() }
puts "^^ wrong architecture for macOS framework; found: #{archs}\n\n" unless archs == "x86_64"
@worker.run("lipo -info #{ioslibproductdir}/libOCMock.a") { |lipo| archs = /re: (.*)/.match(lipo.readline)[1].strip() }
puts "^^ wrong architectures for iOS framework; found: #{archs}\n\n" unless archs == "armv7 i386 x86_64 arm64"
puts "^^ wrong architectures for iOS library; found: #{archs}\n\n" unless archs == "armv7 i386 x86_64 arm64"
@worker.run("lipo -info #{iosproductdir}/OCMock.framework/OCMock") { |lipo| archs = /re: (.*)/.match(lipo.readline)[1].strip() }
puts "^^ wrong architectures for iOS library; found: #{archs}\n\n" unless archs == "i386 x86_64 armv7 arm64"
puts "^^ wrong architectures for iOS framework; found: #{archs}\n\n" unless archs == "x86_64 i386 armv7 arm64"
@worker.run("lipo -info #{tvosproductdir}/OCMock.framework/OCMock") { |lipo| archs = /re: (.*)/.match(lipo.readline)[1].strip() }
puts "^^ wrong architectures for tvOS framework; found: #{archs}\n\n" unless archs == "x86_64 arm64"
@worker.run("lipo -info #{watchosproductdir}/OCMock.framework/OCMock") { |lipo| archs = /re: (.*)/.match(lipo.readline)[1].strip() }
puts "^^ wrong architectures for watchOS framework; found: #{archs}\n\n" unless archs == "i386 x86_64 armv7k arm64_32"
puts "^^ wrong architectures for watchOS framework; found: #{archs}\n\n" unless archs == "x86_64 i386 armv7k arm64_32"


@worker.run("codesign -dvv #{osxproductdir}/OCMock.framework")
@worker.run("codesign -dvv #{iosproductdir}/OCMock.framework")
@worker.run("codesign -dvv #{tvosproductdir}/OCMock.framework")
Expand Down

0 comments on commit 98c7b09

Please sign in to comment.