Spring/spring-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix maven build on Windows

Browse Source
This commit is contained in:
Alex Boyko
2016-10-24 12:56:32 -04:00
parent 46e2334b0c
commit ea6079bea2
2 changed files with 156 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vscode-extensions/commons/commons-maven/src/test/java/org/springframework/ide/vscode/commons/maven/DependencyTreeTest.java
View File

@@ -10,7 +10,7 @@ package org.springframework.ide.vscode.commons.maven;
* Contributors: * Contributors:
* Pivotal, Inc. - initial API and implementation * Pivotal, Inc. - initial API and implementation
*******************************************************************************/ *******************************************************************************/
import static org.junit.Assert.*; import static org.junit.Assert.assertEquals;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
@@ -43,8 +43,11 @@ public class DependencyTreeTest {
*/ */
private static void buildProject(Path testProjectPath) throws Exception { private static void buildProject(Path testProjectPath) throws Exception {
if (!Files.exists(testProjectPath.resolve("classpath.txt"))) { if (!Files.exists(testProjectPath.resolve("classpath.txt"))) {
testProjectPath.resolve("mvnw").toFile().setExecutable(true); Path mvnwPath = System.getProperty("os.name").toLowerCase().startsWith("win")
ExternalProcess process = new ExternalProcess(testProjectPath.toFile(), new ExternalCommand("./mvnw", "clean", "package"), true); ? testProjectPath.resolve("mvnw.cmd") : testProjectPath.resolve("mvnw");
mvnwPath.toFile().setExecutable(true);
ExternalProcess process = new ExternalProcess(testProjectPath.toFile(),
new ExternalCommand(mvnwPath.toAbsolutePath().toString(), "clean", "package"), true);
if (process.getExitValue() != 0) { if (process.getExitValue() != 0) {
throw new RuntimeException("Failed to build test project"); throw new RuntimeException("Failed to build test project");
} }

9
vscode-extensions/commons/language-server-test-harness/src/main/java/org/springframework/ide/vscode/languageserver/testharness/TestProjectHarness.java
View File

@@ -60,11 +60,14 @@ public class TestProjectHarness {
public Cache<String, IJavaProject> cache = CacheBuilder.newBuilder().build(); public Cache<String, IJavaProject> cache = CacheBuilder.newBuilder().build();
public IJavaProject mavenProject(String name) throws Exception { public IJavaProject mavenProject(String name) throws Exception {
Path testProjectPath = Paths.get(TestProjectHarness.class.getResource("/"+name).toURI()); Path testProjectPath = Paths.get(TestProjectHarness.class.getResource("/" + name).toURI());
assertTrue(Files.exists(testProjectPath)); assertTrue(Files.exists(testProjectPath));
if (!Files.exists(testProjectPath.resolve("classpath.txt"))) { if (!Files.exists(testProjectPath.resolve("classpath.txt"))) {
testProjectPath.resolve("mvnw").toFile().setExecutable(true); Path mvnwPath = System.getProperty("os.name").toLowerCase().startsWith("win")
ExternalProcess process = new ExternalProcess(testProjectPath.toFile(), new ExternalCommand("./mvnw", "clean", "package"), true); ? testProjectPath.resolve("mvnw.cmd") : testProjectPath.resolve("mvnw");
mvnwPath.toFile().setExecutable(true);
ExternalProcess process = new ExternalProcess(testProjectPath.toFile(),
new ExternalCommand(mvnwPath.toAbsolutePath().toString(), "clean", "package"), true);
if (process.getExitValue() != 0) { if (process.getExitValue() != 0) {
throw new RuntimeException("Failed to build test project"); throw new RuntimeException("Failed to build test project");
} }