Allow different commands to be run when building

Author: vknabel

CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## 2.4.0
+* Bumped internal dependencies to be more reliable on newer vscode versions
+* New setting `sde.swiftBuildingParams` allows run other commands than `swift build` #24 jinmingjian/sde#32
+
+### Building Params
+It is now possible to run different commands when building swift code.
+* `"sde.swiftBuildingParams": ["build"]`: default setting
+* `"sde.swiftBuildingParams": ["build", "--build-path", ".vscode-build"]`: build in different directory, see #24
+* `"sde.swiftBuildingParams": ["build", "--build-tests"]`: compile tests, but do not run them
+* `"sde.swiftBuildingParams": ["test"]`: runs unit tests jinmingjian/sde#32
+
 ## 2.3.2
 * Code format did fail #19
 * Code format always indented by 4 spaces. Now configurable.

package.json

@@ -99,6 +99,14 @@
           "default": true,
           "description": "Indicates wether SDE shall build the project on save."
         },
+        "sde.swiftBuildingParams": {
+          "type": "array",
+          "description": "The params that shall be passed to the swift command.",
+          "default": ["build"],
+          "items": {
+            "type": "string"
+          }
+        },
         "swift.diagnosis.max_num_problems": {
           "type": "number",
           "default": 100,
@@ -145,9 +153,9 @@
     "postinstall": "node ./node_modules/vscode/bin/install"
   },
   "devDependencies": {
-    "@types/bunyan": "latest",
+    "@types/bunyan": "^1.8.4",
     "@types/js-yaml": "^3.11.1",
-    "@types/node": "latest",
+    "@types/node": "^10.1.2",
     "@types/xml-js": "^1.0.0",
     "js-yaml": "^3.11.0",
     "mocha": "^2.3.3",

src/SwiftTools.ts

@@ -16,12 +16,11 @@ import {
 
 let stdout: string, stderr: string, error: Error;
 ///managed build now only support to invoke on save
-//ignore options
-export function buildPackage(swiftBinPath: string, pkgPath: string, options: string) {
+export function buildPackage(swiftBinPath: string, pkgPath: string, params: string[]) {
     stdout = null
     stderr = null
     error = null
-    const sb = cp.spawn(swiftBinPath, ["build"], { cwd: pkgPath });
+    const sb = cp.spawn(swiftBinPath, params, { cwd: pkgPath });
     sb.stdout.on('data', (data) => {
         stdout += data
         dumpInConsole("" + data)
@@ -59,7 +58,7 @@ function dumpDiagnostics() {
     let diags: Array<string[]> = []
     const lines = stdout.split("\n")
 
-    function isDiagStartLine(line: string) {//FIXME 
+    function isDiagStartLine(line: string) {//FIXME
         const sa = line.split(":")
         if (sa.length > 4) {
             const sev = sa[3].trim();

src/clientMain.ts

@@ -19,6 +19,7 @@ const LENGTH_PKG_FILE_NAME: number = "Package.swift".length
 const PUBLISHER_NAME = "jinmingjian.sde"
 
 let swiftBinPath: string | null = null
+let swiftBuildParams: string[] = ['build']
 let swiftPackageManifestPath: string | null = null
 let skProtocolProcess: string | null = null
 let skProtocolProcessAsShellCmd: string | null = null
@@ -90,7 +91,8 @@ export function activate(context: ExtensionContext) {
 			tools.buildPackage(
 				swiftBinPath,
 				workspace.rootPath,
-				null)
+				swiftBuildParams
+			)
 		}
 	}
 	//commands
@@ -195,6 +197,7 @@ export function dumpInConsole(msg: string) {
 
 function checkToolsAvailability() {
 	swiftBinPath = <string>workspace.getConfiguration().get('swift.path.swift_driver_bin')
+	swiftBuildParams = <string[]>workspace.getConfiguration().get('sde.swiftBuildingParams') || ['build']
 	const sourcekitePath = <string>workspace.getConfiguration().get('swift.path.sourcekite')
 	const sourcekitePathEnableShCmd = <string>workspace.getConfiguration().get('swift.path.sourcekiteDockerMode')
 	const shellPath = <string>workspace.getConfiguration().get('swift.path.shell')