[gentoo-commits] proj/java-ebuilder:master commit in: src/main/java/org/gentoo/java/ebuilder/maven/

[Miroslav Šulc]

commit:     7f0292efdc6698bd28dc6137660c6145cd357690
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Nov  3 10:11:14 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Nov  3 10:11:14 2019 +0000
URL:        https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=7f0292ef

fixed and reformatted ebuild variables

Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../gentoo/java/ebuilder/maven/MavenEbuilder.java  | 96 ++++++++++++----------
 1 file changed, 52 insertions(+), 44 deletions(-)

diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
index 1be72cb..5953815 100644
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java
@@ -618,6 +618,12 @@ public class MavenEbuilder {
             final MavenProject mavenProject, final PrintWriter writer) {
         writer.println();
 
+        if (!"UTF-8".equals(mavenProject.getSourceEncoding())) {
+            writer.print("JAVA_ENCODING=\"");
+            writer.print(mavenProject.getSourceEncoding());
+            writer.println("\"\n");
+        }
+
         if (!mavenProject.getCommonDependencies().isEmpty()
                 || !mavenProject.getRuntimeDependencies().isEmpty()) {
             final List<MavenDependency> dependencies
@@ -638,78 +644,80 @@ public class MavenEbuilder {
             writer.println('"');
         }
 
-        if (!mavenProject.getTestDependencies().isEmpty()) {
-            writer.print("JAVA_GENTOO_TEST_CLASSPATH=\"");
-            writer.print(createClassPath(mavenProject.getTestDependencies()));
+        writer.print("JAVA_SRC_DIR=\"");
+        writer.print(replaceWithVars(config.getWorkdir().relativize(
+                mavenProject.getSourceDirectory()).toString(), config));
+        writer.println('"');
+
+        if (mavenProject.getMainClass() != null) {
+            writer.print("JAVA_MAIN_CLASS=\"");
+            writer.print(mavenProject.getMainClass());
             writer.println('"');
         }
 
+        if (mavenProject.hasResources()) {
+            writer.println("JAVA_RESOURCE_DIRS=(");
+
+            mavenProject.getResourceDirectories().forEach((directory) -> {
+                writer.print("\t\"");
+                writer.print(replaceWithVars(
+                        config.getWorkdir().relativize(directory).toString(),
+                        config));
+                writer.println('"');
+            });
+
+            writer.println(')');
+        }
+
         final String testingFramework = determineTestingFramework(mavenProject);
+        boolean firstTestVar = true;
 
         if (testingFramework != null) {
+            if (firstTestVar) {
+                writer.println();
+                firstTestVar = false;
+            }
+
             writer.print("JAVA_TESTING_FRAMEWORK=\"");
             writer.print(testingFramework);
             writer.println('"');
         }
 
-        if (mavenProject.hasResources()) {
-            writer.print("JAVA_RESOURCE_DIRS=\"");
-
-            boolean first = true;
-
-            for (final Path resources : mavenProject.getResourceDirectories()) {
-                if (first) {
-                    first = false;
-                } else {
-                    writer.print(':');
-                }
-
-                writer.print(replaceWithVars(
-                        config.getWorkdir().relativize(resources).toString(),
-                        config));
+        if (!mavenProject.getTestDependencies().isEmpty()) {
+            if (firstTestVar) {
+                writer.println();
+                firstTestVar = false;
             }
 
+            writer.print("JAVA_GENTOO_TEST_CLASSPATH=\"");
+            writer.print(createClassPath(mavenProject.getTestDependencies()));
             writer.println('"');
         }
 
         if (mavenProject.hasTests()) {
+            if (firstTestVar) {
+                writer.println();
+            }
+
             writer.print("JAVA_TEST_SRC_DIR=\"");
             writer.print(replaceWithVars(config.getWorkdir().relativize(
                     mavenProject.getTestSourceDirectory()).toString(), config));
             writer.println('"');
 
             if (mavenProject.hasTestResources()) {
-                writer.print("JAVA_TEST_RESOURCE_DIRS=\"");
-
-                boolean first = true;
-
-                for (final Path resources : mavenProject.
-                        getTestResourceDirectories()) {
-                    if (first) {
-                        first = false;
-                    } else {
-                        writer.print(':');
-                    }
+                writer.println("JAVA_TEST_RESOURCE_DIRS=(");
 
+                mavenProject.getTestResourceDirectories().
+                        forEach((directory) -> {
+                    writer.print("\t\"");
                     writer.print(replaceWithVars(config.getWorkdir().
-                            relativize(resources).toString(), config));
-                }
+                            relativize(directory).toString(), config));
+                    writer.println('"');
+                });
 
-                writer.println('"');
+                writer.println(')');
             }
         }
-
-        if (!"UTF-8".equals(mavenProject.getSourceEncoding())) {
-            writer.print("JAVA_ENCODING=\"");
-            writer.print(mavenProject.getSourceEncoding());
-            writer.println('"');
-        }
-
-        if (mavenProject.getMainClass() != null) {
-            writer.print("JAVA_MAIN_CLASS=\"");
-            writer.print(mavenProject.getMainClass());
-            writer.println('"');
-        }
     }
 
     /**