Implemented extraction of features (aka. variables) without a feature model

AlexanderSchultheiss · AlexanderSchultheiss · commit 658500571471 · 2022-06-21T14:06:18.000+02:00
diff --git a/docker-resources/extraction_generic.properties b/docker-resources/extraction_generic.properties
@@ -69,7 +69,7 @@ code.extractor.files =
 code.extractor.file_regex = .*\\.(c|h|cpp|hpp)
 code.extractor.threads = 10
 code.extractor.invalid_condition = TRUE
-code.extractor.handle_linux_macros = false
+code.extractor.handle_linux_macros = true
 code.extractor.fuzzy_parsing = true
 
 
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
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
@@ -1 +1 @@
-79bf55b20138ddaffb38f5609dad71e2
+e3be0360c24b79e60cf3aab64db2895e
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
@@ -1 +1 @@
-dcb2dceb271dc7ec176710453a5e051196ab7819
+18f5eb7b5ed29e0d5d7d3d2a4e2b1481eb6d4cd3
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
@@ -7,6 +7,6 @@
     <versions>
       <version>1.0.0</version>
     </versions>
-    <lastUpdated>20220621071653</lastUpdated>
+    <lastUpdated>20220621115809</lastUpdated>
   </versioning>
 </metadata>
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
@@ -1 +1 @@
-bf8162594dc7dd66c312b06bb639eaa7
+069ff94616f362bcd0f97781276906af
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
@@ -1 +1 @@
-50829c7e60af4ced338a928ef78a413b75cf7b11
+6cc1f5026e2e3d1a35fda96b52130fd6f376d9f3
diff --git a/src/main/java/org/variantsync/vevos/extraction/AnalysisTask.java b/src/main/java/org/variantsync/vevos/extraction/AnalysisTask.java
@@ -201,9 +201,7 @@ private void moveResultsToDirectory(File workDir, Path pathToTargetDir, RevCommi
         
         LOGGER.logStatus("Moving VARIABLES file to common output directory.");
         if(moveVariablesFile(outputDir, data_collection_dir)) {
-            if (fullExtraction) {
-                LOGGER.logWarning("Moving VARIABLES failed. It is likely that no information about the features in the feature model was extracted.");
-            }
+            LOGGER.logError("Moving VARIABLES failed. It is likely that no information about the existing features was extracted.");
         }
         
         // Move the cache of the extractors to the collected output directory
@@ -336,7 +334,7 @@ private static boolean moveFilterCount(File outputDir, File targetDir) {
     }
 
     private static boolean moveVariablesFile(File outputDir, File targetDir) {
-        return moveOutputFile(outputDir, targetDir, "VARIABLES.txt", "VARIABLES.txt", true);
+        return moveOutputFile(outputDir, targetDir, "VARIABLES.txt", "VARIABLES.txt", false);
     }
 
     private void createBlocker(File dir) {

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-79bf55b20138ddaffb38f5609dad71e2`
	`1`	`+e3be0360c24b79e60cf3aab64db2895e`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-dcb2dceb271dc7ec176710453a5e051196ab7819`
	`1`	`+18f5eb7b5ed29e0d5d7d3d2a4e2b1481eb6d4cd3`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-bf8162594dc7dd66c312b06bb639eaa7`
	`1`	`+069ff94616f362bcd0f97781276906af`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-50829c7e60af4ced338a928ef78a413b75cf7b11`
	`1`	`+6cc1f5026e2e3d1a35fda96b52130fd6f376d9f3`
Original file line number	Diff line number	Diff line change
`@@ -201,9 +201,7 @@ private void moveResultsToDirectory(File workDir, Path pathToTargetDir, RevCommi`
`201`	`201`
`202`	`202`	`LOGGER.logStatus("Moving VARIABLES file to common output directory.");`
`203`	`203`	`if(moveVariablesFile(outputDir, data_collection_dir)) {`
`204`		`- if (fullExtraction) {`
`205`		`- LOGGER.logWarning("Moving VARIABLES failed. It is likely that no information about the features in the feature model was extracted.");`
`206`		`- }`
	`204`	`+ LOGGER.logError("Moving VARIABLES failed. It is likely that no information about the existing features was extracted.");`
`207`	`205`	`}`
`208`	`206`
`209`	`207`	`// Move the cache of the extractors to the collected output directory`
`@@ -336,7 +334,7 @@ private static boolean moveFilterCount(File outputDir, File targetDir) {`
`336`	`334`	`}`
`337`	`335`
`338`	`336`	`private static boolean moveVariablesFile(File outputDir, File targetDir) {`
`339`		`- return moveOutputFile(outputDir, targetDir, "VARIABLES.txt", "VARIABLES.txt", true);`
	`337`	`+ return moveOutputFile(outputDir, targetDir, "VARIABLES.txt", "VARIABLES.txt", false);`
`340`	`338`	`}`
`341`	`339`
`342`	`340`	`private void createBlocker(File dir) {`