Skip to content

Commit

Permalink
temp. remove the internal openusd updater tool.
Browse files Browse the repository at this point in the history
* due to some swiftpm + swift 6 concurrency nonsense that only
  occurs with swiftpm, and the openusd updater is an internal
  tool for updating openusd source code which does not need
  to be in working order at the moment.

Signed-off-by: furby™ <devs@wabi.foundation>
  • Loading branch information
furby-tm committed Feb 16, 2025
1 parent 9e6c494 commit 5c035eb
Showing 1 changed file with 56 additions and 56 deletions.
112 changes: 56 additions & 56 deletions Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -247,19 +247,19 @@ let package = Package(
name: "UsdView",
targets: ["UsdView"]
),
.executable(
name: "OpenUSD",
targets: ["OpenUSD"]
),
// .executable(
// name: "OpenUSD",
// targets: ["OpenUSD"]
// ),
.executable(
name: "Examples",
targets: ["Examples"]
),
// -------- Swift Plugins -----
.plugin(
name: "OpenUSDPlugin",
targets: ["OpenUSDPlugin"]
),
// .plugin(
// name: "OpenUSDPlugin",
// targets: ["OpenUSDPlugin"]
// ),
.plugin(
name: "UsdGenSchemaPlugin",
targets: ["UsdGenSchemaPlugin"]
Expand Down Expand Up @@ -1736,55 +1736,55 @@ let package = Package(
]
),

.executableTarget(
name: "OpenUSD",
dependencies: [
.product(name: "Version", package: "Version"),
.product(name: "ArgumentParser", package: "swift-argument-parser"),
.product(name: "Logging", package: "swift-log"),
.product(name: "Rainbow", package: "Rainbow")
],
resources: [
// usd source files that need modifications to work with swift are maintained out of these
// directories, if a usd source file from upstream pixar is matching any of the respective
// target/filename(.h|.cpp) patterns within any of these resource directories, the contents
// of each of the matching upstream pixar files will have their contents replaced with each
// of the respective source code files found in any of these directories.
.copy("Resources/Work")
],
cxxSettings: [
.define("_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH", .when(platforms: [.windows])),
.define("_ALLOW_KEYWORD_MACROS", to: "1", .when(platforms: [.windows])),
.define("static_assert(_conditional, ...)", to: "", .when(platforms: [.windows])),
],
swiftSettings: [
.enableUpcomingFeature("BareSlashRegexLiterals"),
]
),
// .executableTarget(
// name: "OpenUSD",
// dependencies: [
// .product(name: "Version", package: "Version"),
// .product(name: "ArgumentParser", package: "swift-argument-parser"),
// .product(name: "Logging", package: "swift-log"),
// .product(name: "Rainbow", package: "Rainbow")
// ],
// resources: [
// // usd source files that need modifications to work with swift are maintained out of these
// // directories, if a usd source file from upstream pixar is matching any of the respective
// // target/filename(.h|.cpp) patterns within any of these resource directories, the contents
// // of each of the matching upstream pixar files will have their contents replaced with each
// // of the respective source code files found in any of these directories.
// .copy("Resources/Work")
// ],
// cxxSettings: [
// .define("_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH", .when(platforms: [.windows])),
// .define("_ALLOW_KEYWORD_MACROS", to: "1", .when(platforms: [.windows])),
// .define("static_assert(_conditional, ...)", to: "", .when(platforms: [.windows])),
// ],
// swiftSettings: [
// .enableUpcomingFeature("BareSlashRegexLiterals"),
// ]
// ),

.plugin(
name: "OpenUSDPlugin",
capability: .command(
intent: .custom(verb: "openusd", description: """
Update the version of USD in the current package,
this will fetch the latest version of USD from the
Pixar USD repository and update this packages source
code to the latest version.
"""),
permissions: [
.allowNetworkConnections(
scope: .all(),
reason: "Updating USD requires network access."
),
.writeToPackageDirectory(
reason: "Updating USD requires write access."
),
]
),
dependencies: [
.target(name: "OpenUSD")
]
),
// .plugin(
// name: "OpenUSDPlugin",
// capability: .command(
// intent: .custom(verb: "openusd", description: """
// Update the version of USD in the current package,
// this will fetch the latest version of USD from the
// Pixar USD repository and update this packages source
// code to the latest version.
// """),
// permissions: [
// .allowNetworkConnections(
// scope: .all(),
// reason: "Updating USD requires network access."
// ),
// .writeToPackageDirectory(
// reason: "Updating USD requires write access."
// ),
// ]
// ),
// dependencies: [
// .target(name: "OpenUSD")
// ]
// ),

.plugin(
name: "UsdGenSchemaPlugin",
Expand Down

0 comments on commit 5c035eb

Please sign in to comment.