Skip to content

Commit 8eaa42c

Browse files
authored
Merge pull request #189 from subhash-arabhi/gradle-tests
Gradle build and clean tests
2 parents 3dfa21d + c0dd7fb commit 8eaa42c

File tree

15 files changed

+1658
-760
lines changed

15 files changed

+1658
-760
lines changed

patches/7271.diff

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,18 @@
11
diff --git a/nbbuild/misc/prepare-bundles/src/main/java/org/netbeans/prepare/bundles/PrepareBundles.java b/nbbuild/misc/prepare-bundles/src/main/java/org/netbeans/prepare/bundles/PrepareBundles.java
2-
index 5349a20e091a..d24c6f5ec98a 100644
2+
index 5349a20e09..952709d10b 100644
33
--- a/nbbuild/misc/prepare-bundles/src/main/java/org/netbeans/prepare/bundles/PrepareBundles.java
44
+++ b/nbbuild/misc/prepare-bundles/src/main/java/org/netbeans/prepare/bundles/PrepareBundles.java
5-
@@ -107,18 +107,16 @@ public static void main(String... args) throws IOException, InterruptedException
5+
@@ -58,7 +58,8 @@ public class PrepareBundles {
6+
Pattern.compile("license", Pattern.CASE_INSENSITIVE),
7+
Pattern.compile("LICENSE.txt", Pattern.CASE_INSENSITIVE),
8+
Pattern.compile("LICENSE-MIT.txt", Pattern.CASE_INSENSITIVE),
9+
- Pattern.compile("LICENSE.md", Pattern.CASE_INSENSITIVE)
10+
+ Pattern.compile("LICENSE.md", Pattern.CASE_INSENSITIVE),
11+
+ Pattern.compile("LICENSE.markdown", Pattern.CASE_INSENSITIVE)
12+
);
13+
private static final String nl = "\n";
14+
15+
@@ -107,18 +108,18 @@ public class PrepareBundles {
616
if ("@types".equals(module.getFileName().toString())) continue;
717
if ("@esbuild".equals(module.getFileName().toString())) continue;
818
if ("@microsoft".equals(module.getFileName().toString())) continue;
@@ -13,6 +23,8 @@ index 5349a20e091a..d24c6f5ec98a 100644
1323
- }
1424
- }
1525
- continue;
26+
+ if ("eastasianwidth".equals(module.getFileName().toString())) continue;
27+
+ if ("isarray".equals(module.getFileName().toString())) continue;
1628
+ Path packageJson = module.resolve("package.json");
1729
+ if (Files.isReadable(packageJson)) {
1830
+ checkModule(module, sb, tokens2Projects, project2License, bundlesDir, targetDir, externalDir, binariesList);

0 commit comments

Comments
 (0)