From 3cd5ec2aed3a9d549dee8ddf5a7ff21a913ec4c7 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Fri, 24 Apr 2020 16:44:17 +0300 Subject: [build] Make the output directory consistent Instead of placing binaries and libraries scattered inside the build directory. --- CMakeLists.txt | 4 ++++ .../ios/BenchmarkApp_iphoneos13.2-arm64e-release.xctestrun | 6 +++--- benchmark/ios/codesigning/codesign_all.sh | 12 ++++++------ circle.yml | 4 ++-- .../ios/RenderTestApp_iphoneos13.2-arm64e-release.xctestrun | 6 +++--- render-test/ios/codesigning/codesign_all.sh | 12 ++++++------ test/ios/UnitTestsApp_iphoneos13.2-arm64e-release.xctestrun | 6 +++--- test/ios/codesigning/codesign_all.sh | 12 ++++++------ 8 files changed, 33 insertions(+), 29 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6232c7df1a..8043a61511 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,10 @@ option(MBGL_WITH_RTTI "Compile with runtime type information" OFF) option(MBGL_WITH_OPENGL "Build with OpenGL renderer" ON) option(MBGL_WITH_WERROR "Make all compilation warnings errors" ON) +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) + add_library( mbgl-compiler-options INTERFACE ) diff --git a/benchmark/ios/BenchmarkApp_iphoneos13.2-arm64e-release.xctestrun b/benchmark/ios/BenchmarkApp_iphoneos13.2-arm64e-release.xctestrun index 6c6d73f3bf..b6a4786a3d 100644 --- a/benchmark/ios/BenchmarkApp_iphoneos13.2-arm64e-release.xctestrun +++ b/benchmark/ios/BenchmarkApp_iphoneos13.2-arm64e-release.xctestrun @@ -15,8 +15,8 @@ DependentProductPaths - __TESTROOT__/Release-iphoneos/BenchmarkApp.app - __TESTROOT__/Release-iphoneos/BenchmarkApp.app/PlugIns/BenchmarkAppTests.xctest + __TESTROOT__/Release/BenchmarkApp.app + __TESTROOT__/Release/BenchmarkApp.app/PlugIns/BenchmarkAppTests.xctest EnvironmentVariables @@ -38,7 +38,7 @@ TestHostBundleIdentifier com.mapbox.BenchmarkApp TestHostPath - __TESTROOT__/Release-iphoneos/BenchmarkApp.app + __TESTROOT__/Release/BenchmarkApp.app TestLanguage TestRegion diff --git a/benchmark/ios/codesigning/codesign_all.sh b/benchmark/ios/codesigning/codesign_all.sh index 4c15587951..51c8ca85e2 100755 --- a/benchmark/ios/codesigning/codesign_all.sh +++ b/benchmark/ios/codesigning/codesign_all.sh @@ -3,9 +3,9 @@ identity=$(/usr/bin/env xcrun security find-identity -v -p codesigning) var=${identity#*1)\ } CODE_SIGN_IDENTITY=${var%\ \"Apple\ Development*} -codesign --force --sign $CODE_SIGN_IDENTITY --entitlements codesigning/BenchmarkApp.app.xcent --timestamp=none ./Release-iphoneos/BenchmarkApp.app -codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release-iphoneos/BenchmarkApp.app/Frameworks/libXCTestSwiftSupport.dylib -codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release-iphoneos/BenchmarkApp.app/Frameworks/libXCTestBundleInject.dylib -codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release-iphoneos/BenchmarkApp.app/Frameworks/XCTAutomationSupport.framework -codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release-iphoneos/BenchmarkApp.app/Frameworks/XCTest.framework -codesign --force --sign $CODE_SIGN_IDENTITY --deep --entitlements codesigning/BenchmarkAppTests.xctest.xcent --timestamp=none ./Release-iphoneos/BenchmarkApp.app/PlugIns/BenchmarkAppTests.xctest +codesign --force --sign $CODE_SIGN_IDENTITY --entitlements codesigning/BenchmarkApp.app.xcent --timestamp=none ./Release/BenchmarkApp.app +codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release/BenchmarkApp.app/Frameworks/libXCTestSwiftSupport.dylib +codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release/BenchmarkApp.app/Frameworks/libXCTestBundleInject.dylib +codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release/BenchmarkApp.app/Frameworks/XCTAutomationSupport.framework +codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release/BenchmarkApp.app/Frameworks/XCTest.framework +codesign --force --sign $CODE_SIGN_IDENTITY --deep --entitlements codesigning/BenchmarkAppTests.xctest.xcent --timestamp=none ./Release/BenchmarkApp.app/PlugIns/BenchmarkAppTests.xctest diff --git a/circle.yml b/circle.yml index af2022222c..e49c5fe4e8 100644 --- a/circle.yml +++ b/circle.yml @@ -418,7 +418,7 @@ commands: cd build ./codesigning/generate-entitlements.swift ./codesigning/codesign_all.sh - codesign -dv --verbose=4 Release-iphoneos/*.app # for debugging that app is signed or not + codesign -dv --verbose=4 Release/*.app # for debugging that app is signed or not run-ios-test-app: parameters: directory: @@ -432,7 +432,7 @@ commands: # arrange files in a way Firebase expects it, and package them in a zip file cp << parameters.directory >>/*_iphoneos13.2-arm64e-release.xctestrun build cd build - zip testapp.zip -r Release-iphoneos/*.app --quiet + zip testapp.zip -r Release/*.app --quiet zip testapp.zip *_iphoneos13.2-arm64e-release.xctestrun gcloud firebase test ios models list gcloud firebase test ios run \ diff --git a/render-test/ios/RenderTestApp_iphoneos13.2-arm64e-release.xctestrun b/render-test/ios/RenderTestApp_iphoneos13.2-arm64e-release.xctestrun index 20ce81e9c4..3326283e21 100644 --- a/render-test/ios/RenderTestApp_iphoneos13.2-arm64e-release.xctestrun +++ b/render-test/ios/RenderTestApp_iphoneos13.2-arm64e-release.xctestrun @@ -15,8 +15,8 @@ DependentProductPaths - __TESTROOT__/Release-iphoneos/RenderTestApp.app - __TESTROOT__/Release-iphoneos/RenderTestApp.app/PlugIns/RenderTestAppTests.xctest + __TESTROOT__/Release/RenderTestApp.app + __TESTROOT__/Release/RenderTestApp.app/PlugIns/RenderTestAppTests.xctest EnvironmentVariables @@ -38,7 +38,7 @@ TestHostBundleIdentifier com.mapbox.RenderTestApp TestHostPath - __TESTROOT__/Release-iphoneos/RenderTestApp.app + __TESTROOT__/Release/RenderTestApp.app TestLanguage TestRegion diff --git a/render-test/ios/codesigning/codesign_all.sh b/render-test/ios/codesigning/codesign_all.sh index 59e0c31541..f5bee1d4f9 100755 --- a/render-test/ios/codesigning/codesign_all.sh +++ b/render-test/ios/codesigning/codesign_all.sh @@ -3,9 +3,9 @@ identity=$(/usr/bin/env xcrun security find-identity -v -p codesigning) var=${identity#*1)\ } CODE_SIGN_IDENTITY=${var%\ \"Apple\ Development*} -codesign --force --sign $CODE_SIGN_IDENTITY --entitlements codesigning/RenderTestApp.app.xcent --timestamp=none ./Release-iphoneos/RenderTestApp.app -codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release-iphoneos/RenderTestApp.app/Frameworks/libXCTestSwiftSupport.dylib -codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release-iphoneos/RenderTestApp.app/Frameworks/libXCTestBundleInject.dylib -codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release-iphoneos/RenderTestApp.app/Frameworks/XCTAutomationSupport.framework -codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release-iphoneos/RenderTestApp.app/Frameworks/XCTest.framework -codesign --force --sign $CODE_SIGN_IDENTITY --deep --entitlements codesigning/RenderTestAppTests.xctest.xcent --timestamp=none ./Release-iphoneos/RenderTestApp.app/PlugIns/RenderTestAppTests.xctest +codesign --force --sign $CODE_SIGN_IDENTITY --entitlements codesigning/RenderTestApp.app.xcent --timestamp=none ./Release/RenderTestApp.app +codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release/RenderTestApp.app/Frameworks/libXCTestSwiftSupport.dylib +codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release/RenderTestApp.app/Frameworks/libXCTestBundleInject.dylib +codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release/RenderTestApp.app/Frameworks/XCTAutomationSupport.framework +codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release/RenderTestApp.app/Frameworks/XCTest.framework +codesign --force --sign $CODE_SIGN_IDENTITY --deep --entitlements codesigning/RenderTestAppTests.xctest.xcent --timestamp=none ./Release/RenderTestApp.app/PlugIns/RenderTestAppTests.xctest diff --git a/test/ios/UnitTestsApp_iphoneos13.2-arm64e-release.xctestrun b/test/ios/UnitTestsApp_iphoneos13.2-arm64e-release.xctestrun index 02038a4417..be389bf154 100644 --- a/test/ios/UnitTestsApp_iphoneos13.2-arm64e-release.xctestrun +++ b/test/ios/UnitTestsApp_iphoneos13.2-arm64e-release.xctestrun @@ -15,8 +15,8 @@ DependentProductPaths - __TESTROOT__/Release-iphoneos/UnitTestsApp.app - __TESTROOT__/Release-iphoneos/UnitTestsApp.app/PlugIns/UnitTestsAppTests.xctest + __TESTROOT__/Release/UnitTestsApp.app + __TESTROOT__/Release/UnitTestsApp.app/PlugIns/UnitTestsAppTests.xctest EnvironmentVariables @@ -38,7 +38,7 @@ TestHostBundleIdentifier com.mapbox.UnitTestsApp TestHostPath - __TESTROOT__/Release-iphoneos/UnitTestsApp.app + __TESTROOT__/Release/UnitTestsApp.app TestLanguage TestRegion diff --git a/test/ios/codesigning/codesign_all.sh b/test/ios/codesigning/codesign_all.sh index f5ac198d63..ff1654ab0a 100755 --- a/test/ios/codesigning/codesign_all.sh +++ b/test/ios/codesigning/codesign_all.sh @@ -3,9 +3,9 @@ identity=$(/usr/bin/env xcrun security find-identity -v -p codesigning) var=${identity#*1)\ } CODE_SIGN_IDENTITY=${var%\ \"Apple\ Development*} -codesign --force --sign $CODE_SIGN_IDENTITY --entitlements codesigning/UnitTestsApp.app.xcent --timestamp=none ./Release-iphoneos/UnitTestsApp.app -codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release-iphoneos/UnitTestsApp.app/Frameworks/libXCTestSwiftSupport.dylib -codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release-iphoneos/UnitTestsApp.app/Frameworks/libXCTestBundleInject.dylib -codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release-iphoneos/UnitTestsApp.app/Frameworks/XCTAutomationSupport.framework -codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release-iphoneos/UnitTestsApp.app/Frameworks/XCTest.framework -codesign --force --sign $CODE_SIGN_IDENTITY --deep --entitlements codesigning/UnitTestsAppTests.xctest.xcent --timestamp=none ./Release-iphoneos/UnitTestsApp.app/PlugIns/UnitTestsAppTests.xctest +codesign --force --sign $CODE_SIGN_IDENTITY --entitlements codesigning/UnitTestsApp.app.xcent --timestamp=none ./Release/UnitTestsApp.app +codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release/UnitTestsApp.app/Frameworks/libXCTestSwiftSupport.dylib +codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release/UnitTestsApp.app/Frameworks/libXCTestBundleInject.dylib +codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release/UnitTestsApp.app/Frameworks/XCTAutomationSupport.framework +codesign --force --sign $CODE_SIGN_IDENTITY --deep --preserve-metadata=identifier,entitlements,flags --timestamp=none ./Release/UnitTestsApp.app/Frameworks/XCTest.framework +codesign --force --sign $CODE_SIGN_IDENTITY --deep --entitlements codesigning/UnitTestsAppTests.xctest.xcent --timestamp=none ./Release/UnitTestsApp.app/PlugIns/UnitTestsAppTests.xctest -- cgit v1.2.1