From 98c7b09f964c2eb9e042d5ed4dcf9ffe10bc5b14 Mon Sep 17 00:00:00 2001 From: Erik Doernenburg Date: Wed, 15 Jul 2020 22:13:46 +0200 Subject: [PATCH] Fixed architecture check. Need to find a better solution one day; order shouldn't matter. --- Tools/build.rb | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Tools/build.rb b/Tools/build.rb index 137896ea..5513adb4 100755 --- a/Tools/build.rb +++ b/Tools/build.rb @@ -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")