diff --git a/docker-resources/extraction_busybox.properties b/docker-resources/extraction_busybox.properties index 5bd088e..0b307f0 100644 --- a/docker-resources/extraction_busybox.properties +++ b/docker-resources/extraction_busybox.properties @@ -50,6 +50,7 @@ source_repo_url = https://git.busybox.net/busybox/ analysis.class = org.variantsync.vevos.extraction.kh.FullExtraction preparation.class.0 = net.ssehub.kernel_haven.busyboot.PrepareBusybox analysis.output.type = csv +analysis.busybox.normalize = true ###################################### # General Pipeline Parameters # @@ -74,7 +75,7 @@ code.provider.cache.read = false code.extractor.class = net.ssehub.kernel_haven.block_extractor.CodeBlockExtractor code.extractor.files = # CodeBlockExtractor parses header and code files separately -code.extractor.file_regex = .*\\.(c|h) +code.extractor.file_regex = .* code.extractor.threads = 10 code.extractor.invalid_condition = TRUE code.extractor.handle_linux_macros = true diff --git a/docker-resources/extraction_generic.properties b/docker-resources/extraction_generic.properties index 8d3986b..6f08501 100644 --- a/docker-resources/extraction_generic.properties +++ b/docker-resources/extraction_generic.properties @@ -66,7 +66,7 @@ code.provider.cache.read = false code.extractor.class = net.ssehub.kernel_haven.block_extractor.CodeBlockExtractor code.extractor.files = # CodeBlockExtractor parses header and code files separately -code.extractor.file_regex = .*\\.(c|h|cpp|hpp) +code.extractor.file_regex = .* code.extractor.threads = 10 code.extractor.invalid_condition = TRUE code.extractor.handle_linux_macros = true diff --git a/docker-resources/extraction_linux.properties b/docker-resources/extraction_linux.properties index da04a1c..74867aa 100644 --- a/docker-resources/extraction_linux.properties +++ b/docker-resources/extraction_linux.properties @@ -72,7 +72,7 @@ code.provider.cache.read = false code.extractor.class = net.ssehub.kernel_haven.block_extractor.CodeBlockExtractor code.extractor.files = # CodeBlockExtractor parses header and code files separately -code.extractor.file_regex = .*\\.(c|h) +code.extractor.file_regex = .* code.extractor.threads = 10 code.extractor.invalid_condition = TRUE code.extractor.handle_linux_macros = true diff --git a/local-maven-repo/net/ssehub/kernel_haven/busyboot/1.0.0/busyboot-1.0.0.jar b/local-maven-repo/net/ssehub/kernel_haven/busyboot/1.0.0/busyboot-1.0.0.jar index 087f133..d35f8b3 100644 Binary files a/local-maven-repo/net/ssehub/kernel_haven/busyboot/1.0.0/busyboot-1.0.0.jar and b/local-maven-repo/net/ssehub/kernel_haven/busyboot/1.0.0/busyboot-1.0.0.jar differ diff --git a/local-maven-repo/net/ssehub/kernel_haven/busyboot/1.0.0/busyboot-1.0.0.jar.md5 b/local-maven-repo/net/ssehub/kernel_haven/busyboot/1.0.0/busyboot-1.0.0.jar.md5 index 09feaba..276b6fe 100644 --- a/local-maven-repo/net/ssehub/kernel_haven/busyboot/1.0.0/busyboot-1.0.0.jar.md5 +++ b/local-maven-repo/net/ssehub/kernel_haven/busyboot/1.0.0/busyboot-1.0.0.jar.md5 @@ -1 +1 @@ -5e246061766c61575b9c25f85d5e0b88 \ No newline at end of file +516cf28a60331cb63787718378c9306e \ No newline at end of file diff --git a/local-maven-repo/net/ssehub/kernel_haven/busyboot/1.0.0/busyboot-1.0.0.jar.sha1 b/local-maven-repo/net/ssehub/kernel_haven/busyboot/1.0.0/busyboot-1.0.0.jar.sha1 index f4565d0..3e29e1f 100644 --- a/local-maven-repo/net/ssehub/kernel_haven/busyboot/1.0.0/busyboot-1.0.0.jar.sha1 +++ b/local-maven-repo/net/ssehub/kernel_haven/busyboot/1.0.0/busyboot-1.0.0.jar.sha1 @@ -1 +1 @@ -6308c171df8a65dfe178aa7527d8fb8f0654c474 \ No newline at end of file +c5d58d5035493e2f3b02a96d1468c8f4551ca341 \ No newline at end of file diff --git a/local-maven-repo/net/ssehub/kernel_haven/busyboot/maven-metadata.xml b/local-maven-repo/net/ssehub/kernel_haven/busyboot/maven-metadata.xml index 9291eb9..b08dc3a 100644 --- a/local-maven-repo/net/ssehub/kernel_haven/busyboot/maven-metadata.xml +++ b/local-maven-repo/net/ssehub/kernel_haven/busyboot/maven-metadata.xml @@ -7,6 +7,6 @@ 1.0.0 - 20210805174925 + 20220824135900 diff --git a/local-maven-repo/net/ssehub/kernel_haven/busyboot/maven-metadata.xml.md5 b/local-maven-repo/net/ssehub/kernel_haven/busyboot/maven-metadata.xml.md5 index 488f4ca..9f1f2b9 100644 --- a/local-maven-repo/net/ssehub/kernel_haven/busyboot/maven-metadata.xml.md5 +++ b/local-maven-repo/net/ssehub/kernel_haven/busyboot/maven-metadata.xml.md5 @@ -1 +1 @@ -1778eb40191f6d0501d96e812a36a2bc \ No newline at end of file +96a9033b1fa75e03101fee347e351cf8 \ No newline at end of file diff --git a/local-maven-repo/net/ssehub/kernel_haven/busyboot/maven-metadata.xml.sha1 b/local-maven-repo/net/ssehub/kernel_haven/busyboot/maven-metadata.xml.sha1 index 3f396e4..94d4352 100644 --- a/local-maven-repo/net/ssehub/kernel_haven/busyboot/maven-metadata.xml.sha1 +++ b/local-maven-repo/net/ssehub/kernel_haven/busyboot/maven-metadata.xml.sha1 @@ -1 +1 @@ -d28b21a3b9d1b96ae2780ac739daf92085e362f0 \ No newline at end of file +9cc6706458b56db1b5277f565c7e9edaa9cbdd25 \ No newline at end of file diff --git a/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/1.0.0/fe_analysis-1.0.0.jar b/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/1.0.0/fe_analysis-1.0.0.jar index 3ad61f1..587ee26 100644 Binary files a/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/1.0.0/fe_analysis-1.0.0.jar and b/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/1.0.0/fe_analysis-1.0.0.jar differ diff --git a/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/1.0.0/fe_analysis-1.0.0.jar.md5 b/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/1.0.0/fe_analysis-1.0.0.jar.md5 index d33b3f8..7057798 100644 --- a/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/1.0.0/fe_analysis-1.0.0.jar.md5 +++ b/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/1.0.0/fe_analysis-1.0.0.jar.md5 @@ -1 +1 @@ -e3be0360c24b79e60cf3aab64db2895e \ No newline at end of file +73f2f3a11a4672f498cb9888933ca4f8 \ No newline at end of file diff --git a/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/1.0.0/fe_analysis-1.0.0.jar.sha1 b/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/1.0.0/fe_analysis-1.0.0.jar.sha1 index 59cf2f8..6a04239 100644 --- a/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/1.0.0/fe_analysis-1.0.0.jar.sha1 +++ b/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/1.0.0/fe_analysis-1.0.0.jar.sha1 @@ -1 +1 @@ -18f5eb7b5ed29e0d5d7d3d2a4e2b1481eb6d4cd3 \ No newline at end of file +098eecf08901b0cf54a51093d129199fe243386a \ No newline at end of file diff --git a/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/maven-metadata.xml b/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/maven-metadata.xml index 7735ee3..8f2ae2e 100644 --- a/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/maven-metadata.xml +++ b/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/maven-metadata.xml @@ -7,6 +7,6 @@ 1.0.0 - 20220621115809 + 20220831155830 diff --git a/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/maven-metadata.xml.md5 b/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/maven-metadata.xml.md5 index d33c7cf..289916d 100644 --- a/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/maven-metadata.xml.md5 +++ b/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/maven-metadata.xml.md5 @@ -1 +1 @@ -069ff94616f362bcd0f97781276906af \ No newline at end of file +807fb70e0a9ede4e62dd91017ad5cdb9 \ No newline at end of file diff --git a/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/maven-metadata.xml.sha1 b/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/maven-metadata.xml.sha1 index 22b8b91..438397d 100644 --- a/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/maven-metadata.xml.sha1 +++ b/local-maven-repo/net/ssehub/kernel_haven/fe_analysis/maven-metadata.xml.sha1 @@ -1 +1 @@ -6cc1f5026e2e3d1a35fda96b52130fd6f376d9f3 \ No newline at end of file +50967fef0b170014d9b9853bd0da6289157173c0 \ No newline at end of file diff --git a/pom.xml b/pom.xml index 59580d9..b169e2d 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ org.variantsync.vevos.extraction Extraction - 1.0.1 + 1.1.0