Skip to content

Remove redundant EXECUTABLE_NAME overrides in PIF #7906

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 22, 2024
Merged

Remove redundant EXECUTABLE_NAME overrides in PIF #7906

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions Sources/XCBuildSupport/PIFBuilder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,6 @@ final class PackagePIFProjectBuilder: PIFProjectBuilder {
settings[.PRODUCT_NAME] = product.name
settings[.PRODUCT_MODULE_NAME] = mainTarget.c99name
settings[.PRODUCT_BUNDLE_IDENTIFIER] = product.name
settings[.EXECUTABLE_NAME] = product.name
settings[.CLANG_ENABLE_MODULES] = "YES"
settings[.DEFINES_MODULE] = "YES"

Expand Down Expand Up @@ -584,7 +583,6 @@ final class PackagePIFProjectBuilder: PIFProjectBuilder {
settings[.PRODUCT_NAME] = executableName
settings[.PRODUCT_MODULE_NAME] = product.name
settings[.PRODUCT_BUNDLE_IDENTIFIER] = product.name
settings[.EXECUTABLE_NAME] = executableName
settings[.CLANG_ENABLE_MODULES] = "YES"
settings[.DEFINES_MODULE] = "YES"
settings[.SKIP_INSTALL] = "NO"
Expand Down Expand Up @@ -630,7 +628,11 @@ final class PackagePIFProjectBuilder: PIFProjectBuilder {
settings[.PRODUCT_NAME] = "\(target.name).o"
settings[.PRODUCT_MODULE_NAME] = target.c99name
settings[.PRODUCT_BUNDLE_IDENTIFIER] = target.name

// EXECUTABLE_NAME is normally EXECUTABLE_PREFIX + PRODUCT_NAME + EXECUTABLE_SUFFIX
// So we need to override EXECUTABLE_NAME in this case to avoid doubling up the file extension because it is also part of the product name.
settings[.EXECUTABLE_NAME] = "\(target.name).o"

settings[.CLANG_ENABLE_MODULES] = "YES"
settings[.DEFINES_MODULE] = "YES"
settings[.MACH_O_TYPE] = "mh_object"
Expand Down
14 changes: 0 additions & 14 deletions Tests/XCBuildSupportTests/PIFBuilderTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -525,7 +525,6 @@ final class PIFBuilderTests: XCTestCase {
configuration.checkAllBuildSettings { settings in
XCTAssertEqual(settings[.CLANG_ENABLE_MODULES], "YES")
XCTAssertEqual(settings[.DEFINES_MODULE], "YES")
XCTAssertEqual(settings[.EXECUTABLE_NAME], "foo")
XCTAssertEqual(settings[.INSTALL_PATH], "/usr/local/bin")
XCTAssertEqual(
settings[.LD_RUNPATH_SEARCH_PATHS],
Expand All @@ -551,7 +550,6 @@ final class PIFBuilderTests: XCTestCase {
configuration.checkAllBuildSettings { settings in
XCTAssertEqual(settings[.CLANG_ENABLE_MODULES], "YES")
XCTAssertEqual(settings[.DEFINES_MODULE], "YES")
XCTAssertEqual(settings[.EXECUTABLE_NAME], "foo")
XCTAssertEqual(settings[.INSTALL_PATH], "/usr/local/bin")
XCTAssertEqual(
settings[.LD_RUNPATH_SEARCH_PATHS],
Expand Down Expand Up @@ -590,7 +588,6 @@ final class PIFBuilderTests: XCTestCase {
configuration.checkAllBuildSettings { settings in
XCTAssertEqual(settings[.CLANG_ENABLE_MODULES], "YES")
XCTAssertEqual(settings[.DEFINES_MODULE], "YES")
XCTAssertEqual(settings[.EXECUTABLE_NAME], "cfoo")
XCTAssertEqual(
settings[.HEADER_SEARCH_PATHS],
["$(inherited)", "/Foo/Sources/cfoo/include"]
Expand Down Expand Up @@ -619,7 +616,6 @@ final class PIFBuilderTests: XCTestCase {
configuration.checkAllBuildSettings { settings in
XCTAssertEqual(settings[.CLANG_ENABLE_MODULES], "YES")
XCTAssertEqual(settings[.DEFINES_MODULE], "YES")
XCTAssertEqual(settings[.EXECUTABLE_NAME], "cfoo")
XCTAssertEqual(
settings[.HEADER_SEARCH_PATHS],
["$(inherited)", "/Foo/Sources/cfoo/include"]
Expand Down Expand Up @@ -664,7 +660,6 @@ final class PIFBuilderTests: XCTestCase {
configuration.checkAllBuildSettings { settings in
XCTAssertEqual(settings[.CLANG_ENABLE_MODULES], "YES")
XCTAssertEqual(settings[.DEFINES_MODULE], "YES")
XCTAssertEqual(settings[.EXECUTABLE_NAME], "bar")
XCTAssertEqual(settings[.PACKAGE_RESOURCE_TARGET_KIND], "regular")
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "bar")
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "bar")
Expand All @@ -684,7 +679,6 @@ final class PIFBuilderTests: XCTestCase {
configuration.checkAllBuildSettings { settings in
XCTAssertEqual(settings[.CLANG_ENABLE_MODULES], "YES")
XCTAssertEqual(settings[.DEFINES_MODULE], "YES")
XCTAssertEqual(settings[.EXECUTABLE_NAME], "bar")
XCTAssertEqual(settings[.PACKAGE_RESOURCE_TARGET_KIND], "regular")
XCTAssertEqual(settings[.PRODUCT_BUNDLE_IDENTIFIER], "bar")
XCTAssertEqual(settings[.PRODUCT_MODULE_NAME], "bar")
Expand Down Expand Up @@ -718,7 +712,6 @@ final class PIFBuilderTests: XCTestCase {
XCTAssertEqual(settings[.CLANG_CXX_LANGUAGE_STANDARD], "c++14")
XCTAssertEqual(settings[.CLANG_ENABLE_MODULES], "YES")
XCTAssertEqual(settings[.DEFINES_MODULE], "YES")
XCTAssertEqual(settings[.EXECUTABLE_NAME], "cbar")
XCTAssertEqual(settings[.GCC_C_LANGUAGE_STANDARD], "c11")
XCTAssertEqual(
settings[.HEADER_SEARCH_PATHS],
Expand All @@ -743,7 +736,6 @@ final class PIFBuilderTests: XCTestCase {
XCTAssertEqual(settings[.CLANG_CXX_LANGUAGE_STANDARD], "c++14")
XCTAssertEqual(settings[.CLANG_ENABLE_MODULES], "YES")
XCTAssertEqual(settings[.DEFINES_MODULE], "YES")
XCTAssertEqual(settings[.EXECUTABLE_NAME], "cbar")
XCTAssertEqual(settings[.GCC_C_LANGUAGE_STANDARD], "c11")
XCTAssertEqual(
settings[.HEADER_SEARCH_PATHS],
Expand Down Expand Up @@ -874,7 +866,6 @@ final class PIFBuilderTests: XCTestCase {
configuration.checkAllBuildSettings { settings in
XCTAssertEqual(settings[.CLANG_ENABLE_MODULES], "YES")
XCTAssertEqual(settings[.DEFINES_MODULE], "YES")
XCTAssertEqual(settings[.EXECUTABLE_NAME], "FooTests")
XCTAssertEqual(settings[.GENERATE_INFOPLIST_FILE], "YES")
XCTAssertEqual(settings[.LD_RUNPATH_SEARCH_PATHS], [
"$(inherited)",
Expand Down Expand Up @@ -922,7 +913,6 @@ final class PIFBuilderTests: XCTestCase {
configuration.checkAllBuildSettings { settings in
XCTAssertEqual(settings[.CLANG_ENABLE_MODULES], "YES")
XCTAssertEqual(settings[.DEFINES_MODULE], "YES")
XCTAssertEqual(settings[.EXECUTABLE_NAME], "FooTests")
XCTAssertEqual(settings[.GENERATE_INFOPLIST_FILE], "YES")
XCTAssertEqual(settings[.LD_RUNPATH_SEARCH_PATHS], [
"$(inherited)",
Expand Down Expand Up @@ -981,7 +971,6 @@ final class PIFBuilderTests: XCTestCase {
configuration.checkAllBuildSettings { settings in
XCTAssertEqual(settings[.CLANG_ENABLE_MODULES], "YES")
XCTAssertEqual(settings[.DEFINES_MODULE], "YES")
XCTAssertEqual(settings[.EXECUTABLE_NAME], "CFooTests")
XCTAssertEqual(settings[.GENERATE_INFOPLIST_FILE], "YES")
XCTAssertEqual(settings[.HEADER_SEARCH_PATHS], [
"$(inherited)",
Expand Down Expand Up @@ -1032,7 +1021,6 @@ final class PIFBuilderTests: XCTestCase {
configuration.checkAllBuildSettings { settings in
XCTAssertEqual(settings[.CLANG_ENABLE_MODULES], "YES")
XCTAssertEqual(settings[.DEFINES_MODULE], "YES")
XCTAssertEqual(settings[.EXECUTABLE_NAME], "CFooTests")
XCTAssertEqual(settings[.GENERATE_INFOPLIST_FILE], "YES")
XCTAssertEqual(settings[.HEADER_SEARCH_PATHS], [
"$(inherited)",
Expand Down Expand Up @@ -1249,7 +1237,6 @@ final class PIFBuilderTests: XCTestCase {
XCTAssertEqual(settings[.CLANG_ENABLE_MODULES], "YES")
XCTAssertEqual(settings[.CURRENT_PROJECT_VERSION], "1")
XCTAssertEqual(settings[.DEFINES_MODULE], "YES")
XCTAssertEqual(settings[.EXECUTABLE_NAME], "BarLib")
XCTAssertEqual(settings[.GENERATE_INFOPLIST_FILE], "YES")
XCTAssertEqual(settings[.INSTALL_PATH], "/usr/local/lib")
XCTAssertEqual(settings[.MARKETING_VERSION], "1.0")
Expand All @@ -1275,7 +1262,6 @@ final class PIFBuilderTests: XCTestCase {
XCTAssertEqual(settings[.CLANG_ENABLE_MODULES], "YES")
XCTAssertEqual(settings[.CURRENT_PROJECT_VERSION], "1")
XCTAssertEqual(settings[.DEFINES_MODULE], "YES")
XCTAssertEqual(settings[.EXECUTABLE_NAME], "BarLib")
XCTAssertEqual(settings[.GENERATE_INFOPLIST_FILE], "YES")
XCTAssertEqual(settings[.INSTALL_PATH], "/usr/local/lib")
XCTAssertEqual(settings[.MARKETING_VERSION], "1.0")
Expand Down