Skip to content

Commit 08f304a

Browse files
Achal1607subhash-arabhisid-srini
authored
Merge testing branch into main (#283)
* Added tests for gradle build and clean * Removed unnecessary logs * Fixed linting issues * Updated package-lock * Updted patch to get/skip few licenses for newly added libraries * XML file formatting test added (#243) * Updated build scripts so that extension can be built on windows * Merge conflicts resolved --------- Co-authored-by: Subhash Arabhi <[email protected]> Co-authored-by: Siddharth Srinivasan <[email protected]>
1 parent 4b22162 commit 08f304a

File tree

16 files changed

+1734
-714
lines changed

16 files changed

+1734
-714
lines changed

build.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
patches/7654.diff
5252
patches/7670.diff
5353
patches/7699.diff
54+
patches/7709.diff
5455
patches/7722.diff
5556
patches/7724.diff
5657
patches/7733.diff
@@ -220,7 +221,7 @@
220221
<copy file="vscode/package.json" todir="${build.dir}/bundles/package" />
221222
<copy file="vscode/package-lock.json" todir="${build.dir}/bundles/package" />
222223

223-
<exec executable="mvn" failonerror="true" dir="${nb_all}/nbbuild/misc/prepare-bundles">
224+
<exec executable="mvn${cmd.suffix}" failonerror="true" dir="${nb_all}/nbbuild/misc/prepare-bundles">
224225
<arg value="package" />
225226
<arg value="exec:java" />
226227
<arg value="-Dexec.mainClass=org.netbeans.prepare.bundles.PrepareBundles" />

patches/7709.diff

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
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 d24c6f5ec9..f2b040204e 100644
3+
--- a/nbbuild/misc/prepare-bundles/src/main/java/org/netbeans/prepare/bundles/PrepareBundles.java
4+
+++ b/nbbuild/misc/prepare-bundles/src/main/java/org/netbeans/prepare/bundles/PrepareBundles.java
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+
@@ -69,7 +70,12 @@ public class PrepareBundles {
16+
17+
Path targetDir = Paths.get(args[0]);
18+
Path packagesDir = targetDir.resolve("package");
19+
- new ProcessBuilder("npm", "install").directory(packagesDir.toFile()).inheritIO().start().waitFor();
20+
+ String os = System.getProperty("os.name").toLowerCase();
21+
+ if (os.contains("windows")) {
22+
+ new ProcessBuilder("npm.cmd", "install").directory(packagesDir.toFile()).inheritIO().start().waitFor();
23+
+ } else{
24+
+ new ProcessBuilder("npm", "install").directory(packagesDir.toFile()).inheritIO().start().waitFor();
25+
+ }
26+
Path bundlesDir = targetDir.resolve("bundles");
27+
Files.createDirectories(bundlesDir);
28+
try (DirectoryStream<Path> ds = Files.newDirectoryStream(bundlesDir)) {
29+
@@ -107,6 +113,8 @@ public class PrepareBundles {
30+
if ("@types".equals(module.getFileName().toString())) continue;
31+
if ("@esbuild".equals(module.getFileName().toString())) continue;
32+
if ("@microsoft".equals(module.getFileName().toString())) continue;
33+
+ if ("eastasianwidth".equals(module.getFileName().toString())) continue;
34+
+ if ("isarray".equals(module.getFileName().toString())) continue;
35+
Path packageJson = module.resolve("package.json");
36+
if (Files.isReadable(packageJson)) {
37+
checkModule(module, sb, tokens2Projects, project2License, bundlesDir, targetDir, externalDir, binariesList);

0 commit comments

Comments
 (0)