1 |
commit: 774340875eb0e929b0db193cd4e84887e52339d8 |
2 |
Author: zongyu <zzy2529420793 <AT> gmail <DOT> com> |
3 |
AuthorDate: Mon Aug 3 08:38:58 2020 +0000 |
4 |
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Aug 3 10:56:22 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/java-ebuilder.git/commit/?id=77434087 |
7 |
|
8 |
make MavenEbuilder not print unnecessary lines |
9 |
|
10 |
Signed-off-by: zongyu <zzy2529420793 <AT> gmail.com> |
11 |
|
12 |
.../gentoo/java/ebuilder/maven/MavenEbuilder.java | 24 ++++++++-------------- |
13 |
1 file changed, 8 insertions(+), 16 deletions(-) |
14 |
|
15 |
diff --git a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java |
16 |
index 1fde760..857d6c1 100644 |
17 |
--- a/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java |
18 |
+++ b/src/main/java/org/gentoo/java/ebuilder/maven/MavenEbuilder.java |
19 |
@@ -450,10 +450,8 @@ public class MavenEbuilder { |
20 |
mavenProjects, "runtime"); |
21 |
final boolean hasCDepend = !commonDependencies.isEmpty(); |
22 |
|
23 |
- writer.println(); |
24 |
- |
25 |
if (hasCDepend) { |
26 |
- writer.println("# Common dependencies"); |
27 |
+ writer.println("\n# Common dependencies"); |
28 |
|
29 |
mavenProjects.stream(). |
30 |
filter((mavenProject) |
31 |
@@ -474,11 +472,9 @@ public class MavenEbuilder { |
32 |
writer.println('"'); |
33 |
} |
34 |
|
35 |
- writer.println(); |
36 |
- |
37 |
if (!compileDependencies.isEmpty() |
38 |
|| !testDependencies.isEmpty()) { |
39 |
- writer.println("# Compile dependencies"); |
40 |
+ writer.println("\n# Compile dependencies"); |
41 |
|
42 |
mavenProjects.stream(). |
43 |
filter((mavenProject) |
44 |
@@ -543,10 +539,8 @@ public class MavenEbuilder { |
45 |
|
46 |
writer.println('"'); |
47 |
|
48 |
- writer.println(); |
49 |
- |
50 |
if (!runtimeDependencies.isEmpty()) { |
51 |
- writer.println("# Runtime dependencies"); |
52 |
+ writer.println("\n# Runtime dependencies"); |
53 |
|
54 |
mavenProjects.stream(). |
55 |
filter((mavenProject) |
56 |
@@ -558,7 +552,7 @@ public class MavenEbuilder { |
57 |
}); |
58 |
} |
59 |
|
60 |
- writer.print("RDEPEND=\"\n\t>=virtual/jre-"); |
61 |
+ writer.print("\nRDEPEND=\"\n\t>=virtual/jre-"); |
62 |
writer.print(getMinTargetVersion( |
63 |
mavenProjects, config.getForceMinJavaVersion())); |
64 |
writer.println(":*"); |
65 |
@@ -575,8 +569,6 @@ public class MavenEbuilder { |
66 |
}); |
67 |
} |
68 |
|
69 |
- |
70 |
- |
71 |
writer.println('"'); |
72 |
} |
73 |
|
74 |
@@ -680,14 +672,14 @@ public class MavenEbuilder { |
75 |
// Global: |
76 |
// JAVA_GENTOO_CLASSPATH |
77 |
// JAVA_CLASSPATH_EXTRA |
78 |
- // JAVA_GENTOO_TEST_CLASSPATH |
79 |
+ // JAVA_TEST_GENTOO_CLASSPATH |
80 |
// JAVA_ENCODING (unless it differs in projects) |
81 |
// Compile (jars, doc): |
82 |
// JAVA_SRC_DIR |
83 |
// JAVA_RESOURCE_DIRS |
84 |
// JAVA_ENCODING (in case project encodings are different) |
85 |
// Test: |
86 |
- // JAVA_TESTING_FRAMEWORK |
87 |
+ // JAVA_TESTING_FRAMEWORKS |
88 |
// JAVA_TEST_SRC_DIR |
89 |
// JAVA_TEST_RESOURCE_DIRS |
90 |
// Install (jars, doc, sources): |
91 |
@@ -855,7 +847,7 @@ public class MavenEbuilder { |
92 |
firstTestVar = false; |
93 |
} |
94 |
|
95 |
- writer.print("JAVA_TESTING_FRAMEWORK=\""); |
96 |
+ writer.print("JAVA_TESTING_FRAMEWORKS=\""); |
97 |
writer.print(testingFramework); |
98 |
writer.println('"'); |
99 |
} |
100 |
@@ -866,7 +858,7 @@ public class MavenEbuilder { |
101 |
firstTestVar = false; |
102 |
} |
103 |
|
104 |
- writer.print("JAVA_GENTOO_TEST_CLASSPATH=\""); |
105 |
+ writer.print("JAVA_TEST_GENTOO_CLASSPATH=\""); |
106 |
writer.print(createClassPath(mavenProject.getTestDependencies())); |
107 |
writer.println('"'); |
108 |
} |