Skip to content

Commit 7d89028

Browse files
authored
Merge pull request github#14106 from github/alexdenisov/rename-xcode-autobuilder
Swift: rename autobuilder. NFC
2 parents a58c9e9 + c1da2df commit 7d89028

File tree

30 files changed

+26
-25
lines changed

30 files changed

+26
-25
lines changed

swift/BUILD.bazel

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
load("@rules_pkg//:mappings.bzl", "pkg_attributes", "pkg_filegroup", "pkg_files", "strip_prefix")
1+
load("@rules_pkg//:mappings.bzl", "pkg_filegroup", "pkg_files", "strip_prefix")
22
load("@rules_pkg//:install.bzl", "pkg_install")
33
load("//:defs.bzl", "codeql_platform")
44
load("//misc/bazel:pkg_runfiles.bzl", "pkg_runfiles")
@@ -57,8 +57,8 @@ pkg_filegroup(
5757
)
5858

5959
pkg_runfiles(
60-
name = "xcode-autobuilder",
61-
srcs = ["//swift/xcode-autobuilder"],
60+
name = "swift-autobuilder",
61+
srcs = ["//swift/swift-autobuilder"],
6262
prefix = "tools/" + codeql_platform,
6363
)
6464

@@ -93,7 +93,7 @@ pkg_filegroup(
9393
],
9494
}) + select({
9595
"@platforms//os:macos": [
96-
":xcode-autobuilder",
96+
":swift-autobuilder",
9797
],
9898
"//conditions:default": [
9999
":diagnostics",
@@ -130,7 +130,7 @@ generate_cmake(
130130
"//swift/logging/tests/assertion-diagnostics:assert-false",
131131
] + select({
132132
"@platforms//os:linux": ["//swift/tools/diagnostics:autobuilder-incompatible-os"],
133-
"@platforms//os:macos": ["//swift/xcode-autobuilder"],
133+
"@platforms//os:macos": ["//swift/swift-autobuilder"],
134134
}),
135135
visibility = ["//visibility:public"],
136136
)

swift/xcode-autobuilder/BUILD.bazel renamed to swift/swift-autobuilder/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
load("//swift:rules.bzl", "swift_cc_binary")
22

33
swift_cc_binary(
4-
name = "xcode-autobuilder",
4+
name = "swift-autobuilder",
55
srcs = glob([
66
"*.cpp",
77
"*.h",

swift/xcode-autobuilder/XcodeBuildRunner.cpp renamed to swift/swift-autobuilder/BuildRunner.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
#include "swift/xcode-autobuilder/XcodeBuildRunner.h"
1+
#include "swift/swift-autobuilder/BuildRunner.h"
22

33
#include <vector>
44
#include <iostream>
55
#include <spawn.h>
66
#include "absl/strings/str_join.h"
77

88
#include "swift/logging/SwiftLogging.h"
9-
#include "swift/xcode-autobuilder/CustomizingBuildLink.h"
9+
#include "swift/swift-autobuilder/CustomizingBuildLink.h"
1010

1111
constexpr codeql::SwiftDiagnostic buildCommandFailed{
1212
.id = "build-command-failed",

swift/xcode-autobuilder/XcodeBuildRunner.h renamed to swift/swift-autobuilder/BuildRunner.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

3-
#include "swift/xcode-autobuilder/XcodeTarget.h"
4-
#include "swift/xcode-autobuilder/XcodeProjectParser.h"
3+
#include "swift/swift-autobuilder/XcodeTarget.h"
4+
#include "swift/swift-autobuilder/ProjectParser.h"
55
#include <filesystem>
66

77
void installDependencies(const ProjectStructure& target, bool dryRun);

swift/xcode-autobuilder/CFHelpers.cpp renamed to swift/swift-autobuilder/CFHelpers.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "swift/xcode-autobuilder/CFHelpers.h"
1+
#include "swift/swift-autobuilder/CFHelpers.h"
22

33
#include <iostream>
44

swift/xcode-autobuilder/XcodeProjectParser.cpp renamed to swift/swift-autobuilder/ProjectParser.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include "swift/xcode-autobuilder/XcodeProjectParser.h"
1+
#include "swift/swift-autobuilder/ProjectParser.h"
22

33
#include <array>
44
#include <iostream>
@@ -8,8 +8,8 @@
88
#include <fstream>
99
#include <CoreFoundation/CoreFoundation.h>
1010

11-
#include "swift/xcode-autobuilder/XcodeWorkspaceParser.h"
12-
#include "swift/xcode-autobuilder/CFHelpers.h"
11+
#include "swift/swift-autobuilder/XcodeWorkspaceParser.h"
12+
#include "swift/swift-autobuilder/CFHelpers.h"
1313

1414
namespace fs = std::filesystem;
1515

swift/xcode-autobuilder/XcodeProjectParser.h renamed to swift/swift-autobuilder/ProjectParser.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#pragma once
22

3-
#include "swift/xcode-autobuilder/XcodeTarget.h"
3+
#include "swift/swift-autobuilder/XcodeTarget.h"
44
#include <vector>
55
#include <string>
66
#include <filesystem>

0 commit comments

Comments
 (0)