Upgrade ScanCode to the latest development version

This includes a massive refactoring with lots of performance improvements. For details see aboutcode-org/scancode-toolkit#885
oss-review-toolkit · Feb 16, 2018 · 4519ccf · 4519ccf
1 parent 258e956
commit 4519ccf
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 6 deletions.
diff --git a/scanner/src/funTest/assets/scanners/scancode-toolkit b/scanner/src/funTest/assets/scanners/scancode-toolkit
diff --git a/scanner/src/main/kotlin/scanners/ScanCode.kt b/scanner/src/main/kotlin/scanners/ScanCode.kt
@@ -37,8 +37,14 @@ object ScanCode : Scanner() {
     private const val OUTPUT_FORMAT = "json-pp"
     private const val TIMEOUT = 300
 
-    private val DEFAULT_OPTIONS = listOf("--copyright", "--license", "--info", "--diag", "--only-findings",
-            "--strip-root")
+    private val DEFAULT_OPTIONS = listOf(
+            "--copyright",
+            "--license",
+            "--license-text",
+            "--info",
+            "--only-findings",
+            "--strip-root"
+    )
 
     private val TIMEOUT_REGEX = Pattern.compile(
             "ERROR: Processing interrupted: timeout after (?<timeout>\\d+) seconds. \\(File: .+\\)")
@@ -60,17 +66,23 @@ object ScanCode : Scanner() {
     override fun scanPath(path: File, resultsFile: File): Result {
         val options = DEFAULT_OPTIONS.toMutableList()
         if (log.isEnabledFor(Level.DEBUG)) {
+            options.add("--license-diag")
             options.add("--verbose")
         }
 
+        val outputFormatOption = if (OUTPUT_FORMAT.startsWith("json")) {
+            "--$OUTPUT_FORMAT"
+        } else {
+            "--output-$OUTPUT_FORMAT"
+        }
+
         val process = ProcessCapture(
                 scannerPath.absolutePath,
                 *options.toTypedArray(),
                 "--timeout", TIMEOUT.toString(),
-                "-n", Math.max(1, Runtime.getRuntime().availableProcessors() - 1).toString(),
-                "-f", OUTPUT_FORMAT,
+                "--processes", Math.max(1, Runtime.getRuntime().availableProcessors() - 1).toString(),
                 path.absolutePath,
-                resultsFile.absolutePath
+                outputFormatOption, resultsFile.absolutePath
         )
 
         if (process.stderr().isNotBlank()) {