Skip to content

Build project fix for windows #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 23, 2024
Merged

Build project fix for windows #20

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
233cac9
Updated project build to use maven/gradle command based on OS name
sinha108 May 22, 2024
f0bc1a4
Merge branch 'IBM:main' into main
sinha108 May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions src/main/java/com/ibm/northstar/utils/BuildProject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ public class BuildProject {

private static final String LIB_DEPS_DOWNLOAD_DIR = "_libdeps";

private static final String MAVEN_CMD = System.getProperty("os.name").contains("win") ? "mvn.cmd" : "mvn";
private static final String GRADLE_CMD = System.getProperty("os.name").contains("win") ? "gradlew.bat" : "gradlew";

private static boolean buildWithTool(String[] buildCommand) {
Log.info("Building the project using " + buildCommand[0] + ".");
ProcessBuilder processBuilder = new ProcessBuilder(buildCommand);
Expand All @@ -41,7 +44,7 @@ private static boolean buildWithTool(String[] buildCommand) {
* @return true if Maven is installed, false otherwise.
*/
private static boolean isMavenInstalled() {
ProcessBuilder processBuilder = new ProcessBuilder("mvn", "--version");
ProcessBuilder processBuilder = new ProcessBuilder(MAVEN_CMD, "--version");
try {
Process process = processBuilder.start();
BufferedReader reader = new BufferedReader(new InputStreamReader(process.getInputStream()));
Expand Down Expand Up @@ -70,7 +73,7 @@ private static boolean mavenBuild(String projectPath) {
return false;
}
String[] mavenCommand = {
"mvn", "clean", "package", "-f", projectPath + "/pom.xml", "-B", "-V", "-e", "-Drat.skip",
MAVEN_CMD, "clean", "package", "-f", projectPath + "/pom.xml", "-B", "-V", "-e", "-Drat.skip",
"-Dfindbugs.skip", "-Dcheckstyle.skip", "-Dpmd.skip=true", "-Dspotbugs.skip", "-Denforcer.skip",
"-Dmaven.javadoc.skip", "-DskipTests", "-Dmaven.test.skip.exec", "-Dlicense.skip=true",
"-Drat.skip=true", "-Dspotless.check.skip=true" };
Expand All @@ -80,7 +83,7 @@ private static boolean mavenBuild(String projectPath) {

public static boolean gradleBuild(String projectPath) {
// Adjust Gradle command as needed
String gradleWrapper = projectPath + "/gradlew";
String gradleWrapper = projectPath + File.separator + GRADLE_CMD;
String[] gradleCommand = { gradleWrapper, "clean", "compileJava", "-p", projectPath };
return buildWithTool(gradleCommand);
}
Expand All @@ -100,7 +103,7 @@ private static boolean buildProject(String projectPath, String build) {
}
else {
// Update command with a project path
build = build.replace("mvn", "mvn -f " + projectPath);
build = build.replace(MAVEN_CMD, MAVEN_CMD + " -f " + projectPath);
Log.info("Using custom build command: " + build);
String[] customBuildCommand = build.split(" ");
return buildWithTool(customBuildCommand);
Expand Down Expand Up @@ -139,7 +142,7 @@ public static boolean downloadLibraryDependencies(String projectPath) {
if (pomFile.exists()) {
Log.info("Found pom.xml in the project directory. Using Maven to download dependencies.");
String[] mavenCommand = {
"mvn", "--no-transfer-progress", "-f",
MAVEN_CMD, "--no-transfer-progress", "-f",
Paths.get(projectPath, "pom.xml").toString(),
"dependency:copy-dependencies",
"-DoutputDirectory=" + libDownloadPath.toString()
Expand Down