🌲 Update

muukii · Oct 21, 2022 · 2997421 · 2997421
1 parent 1708113
commit 2997421
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/.swiftpm/xcode/xcshareddata/xcschemes/grain.xcscheme b/.swiftpm/xcode/xcshareddata/xcschemes/grain.xcscheme
@@ -78,7 +78,7 @@
       </BuildableProductRunnable>
       <CommandLineArguments>
          <CommandLineArgument
-            argument = "./Sources/Fixture.swift"
+            argument = "./Sources/Fixture.swift --verbose"
             isEnabled = "YES">
          </CommandLineArgument>
       </CommandLineArguments>

diff --git a/Sources/Grain/CLI.swift b/Sources/Grain/CLI.swift
@@ -42,6 +42,7 @@ struct CLI: AsyncParsableCommand {
     }
 
     @Argument var targetFilePath: String
+    @Flag var verbose = false
 
     mutating func run() async throws {
 
@@ -124,6 +125,7 @@ runtimeFrameworksPath: \(runtimeFrameworksPath)
         "-Xfrontend", "-disable-implicit-string-processing-module-import",
         "-I", applicationPath.pathString,
       ]
+      cmd += ["-swift-version", "5"]
 
       try await withTemporaryDirectory { workingPath in
 
@@ -134,6 +136,8 @@ runtimeFrameworksPath: \(runtimeFrameworksPath)
 
           cmd += ["-o", compiledFile.pathString]
 
+          Log.debug("Make executable binary\n\(cmd.joined(separator: "\\\n"))")
+
           // compile
           let result = try await TSCBasic.Process.popen(
             arguments: cmd,

diff --git a/install.sh b/install.sh
@@ -11,7 +11,5 @@ fi
 
 swift build $SWIFT_BUILD_FLAGS 
 mkdir -p ${PREFIX}/bin/grain-build
-cp -f ${BUILD_DIR}/grain ${PREFIX}/bin/grain-build/
-cp -f ${BUILD_DIR}/libSwiftToolsSupport.dylib ${PREFIX}/bin/grain-build/
-cp -f ${BUILD_DIR}/libGrainDescriptor.dylib ${PREFIX}/bin/grain-build/
+cp -r -f ${BUILD_DIR}/ ${PREFIX}/bin/grain-build/
 ln -f -s ${PREFIX}/bin/grain-build/grain ${PREFIX}/bin/grain