Commit 8c1c2cda authored by Timon Stampfli's avatar Timon Stampfli

Merge branch 'wip-johannes' into 'master'

fix typos and make settings more convenient

See merge request !1
parents 457b55d3 a59e9d9f
Pipeline #4917 passed with stages
in 55 seconds
......@@ -51,7 +51,7 @@ func printRunManualInput(binaryPath string) {
colorInfo.Printf("' with your input :\n")
}
func printRunSampleInfo(binaryPath, sampleName string) {
colorInfo.Printf("Running Sample'")
colorInfo.Printf("Running sample '")
colorInfoIdent.Printf("%v", sampleName)
colorInfo.Printf("' on program '")
colorInfoIdent.Printf("%v", binaryPath)
......@@ -63,9 +63,9 @@ func printSampleVerdict(binaryPath, sampleName, programOutput, expectedOutput, p
colorError.Printf("Sample '")
colorErrorIdent.Printf("%v", sampleName)
colorError.Printf("': Output differs\n")
colorInfo.Printf("Expected Output:\n")
colorInfo.Printf("Expected output:\n")
colorProgramOutput.Printf("%v", expectedOutput)
colorInfo.Printf("\nYour Program's output:\n")
colorInfo.Printf("\nYour program's output:\n")
colorExpectedOutput.Printf("%v\n", programOutput)
} else {
colorCorrect.Printf("Sample '")
......
......@@ -54,17 +54,18 @@ export class Runner {
isDefault: true
}
};
let headerAsFlag = (path: string) => path === '' ? [] : ["-I", path];
// Todo: allow customizable flags
let execute = new vscode.ShellExecution(
compilerPath,
[
soitaskFiles.solutionWorkspacePath!,
...getCompilationFlags(this.store),
"-I",
getCppHeaderPath(this.store),
"-I",
getSoiHeaderPath(this.store),
"-o" + taskname
...headerAsFlag(getCppHeaderPath(this.store)),
...headerAsFlag(getSoiHeaderPath(this.store)),
"-o", taskname
],
{
cwd: workspace
......
......@@ -4,10 +4,10 @@ export function soiWorkspaceTemplate_0_8_0(): string {
"templateVersion":"0.8.0"
},
"settings": {
"compilerPath": "/insert/path/to/compiler",
"debuggerPath": "/insert/path/to/debugger",
"cppHeaderPath": "/insert/path/to/cppheaders",
"soiHeaderPath": "/insert/path/to/soiheaders",
"compilerPath": "/usr/bin/c++",
"debuggerPath": "/usr/bin/gdb",
"cppHeaderPath": "",
"soiHeaderPath": "",
"flags": "-Wall -Wextra -std=c++17 -g3 -ggdb3 -fsanitize=address,undefined -D_GLIBCXX_DEBUG",
"useBundledSoiHeaders": true
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment