File tree 3 files changed +3
-21
lines changed 3 files changed +3
-21
lines changed Original file line number Diff line number Diff line change 5
5
"package" : " swift-argument-parser" ,
6
6
"repositoryURL" : " https://github.com/apple/swift-argument-parser.git" ,
7
7
"state" : {
8
- <<<<<<< HEAD
9
8
"branch" : null ,
10
9
"revision" : " 15351c1cd009eba0b6e438bfef55ea9847a8dc4a" ,
11
10
"version" : " 0.3.0"
12
- =======
13
- <<<<<<< HEAD
14
- "branch" : " master" ,
15
- "revision" : " 15351c1cd009eba0b6e438bfef55ea9847a8dc4a" ,
16
- "version" : null
17
- =======
18
- "branch" : null ,
19
- "revision" : " 223d62adc52d51669ae2ee19bdb8b7d9fd6fcd9c" ,
20
- "version" : " 0.0.6"
21
- >>>>>>> Add swift-argument-parser to the cmake build
22
- >>>>>>> Add swift-argument-parser to the cmake build
23
11
}
24
12
},
25
13
{
Original file line number Diff line number Diff line change @@ -74,19 +74,13 @@ if ProcessInfo.processInfo.environment["SWIFT_DRIVER_LLBUILD_FWK"] == nil {
74
74
if ProcessInfo . processInfo. environment [ " SWIFTCI_USE_LOCAL_DEPS " ] == nil {
75
75
package . dependencies += [
76
76
. package ( url: " https://github.com/apple/swift-tools-support-core.git " , . branch( " master " ) ) ,
77
- <<<<<<< HEAD
78
77
. package ( url: " https://github.com/jpsim/Yams.git " , . upToNextMinor( from: " 4.0.0 " ) ) ,
79
78
. package ( url: " https://github.com/apple/swift-argument-parser.git " , . exact( " 0.3.0 " ) )
80
- =======
81
- . package ( url: " https://github.com/jpsim/Yams.git " , . branch( " master " ) ) ,
82
- . package ( url: " https://github.com/apple/swift-argument-parser.git " , . exact( " 0.0.6 " ) )
83
- >>>>>>> Add swift- argument- parser to the cmake build
84
79
]
85
80
} else {
86
81
package . dependencies += [
87
82
. package ( path: " ../swiftpm/swift-tools-support-core " ) ,
88
83
. package ( path: " ../yams " ) ,
89
- . package ( path: " ../llbuild " ) ,
90
84
. package ( path: " ../swift-argument-parser " ) ,
91
85
]
92
86
}
Original file line number Diff line number Diff line change @@ -16,18 +16,18 @@ extension DriverKind: ExpressibleByArgument {}
16
16
17
17
struct SwiftHelp : ParsableCommand {
18
18
@ArgumentParser . Option ( name: . customLong( " tool " , withSingleDash: true ) ,
19
- default: . interactive,
20
19
help: " The tool to list options of " )
21
- var tool : DriverKind
20
+ var tool : DriverKind = . interactive
22
21
23
22
@Flag ( name: . customLong( " show-hidden " , withSingleDash: true ) ,
24
23
help: " List hidden (unsupported) options " )
25
- var showHidden : Bool
24
+ var showHidden : Bool = false
26
25
27
26
func run( ) throws {
28
27
let driverOptionTable = OptionTable ( )
29
28
driverOptionTable. printHelp ( driverKind: tool, includeHidden: showHidden)
30
29
}
31
30
}
32
31
32
+ // SwiftPM executables don't support @main.
33
33
SwiftHelp . main ( )
You can’t perform that action at this time.
0 commit comments