Fixed local build issues

ribafish · Sep 2, 2024 · ed548b3 · ed548b3
1 parent b5819c8
commit ed548b3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 0 deletions.
diff --git a/build.gradle b/build.gradle
@@ -104,6 +104,7 @@ project.assembleTargetPlatform.doLast {
                     '-p2.ws', Constants.ws,
                     '-p2.arch', Constants.arch,
                     '-roaming',
+                    '-vm', System.getProperty('java.home') + '/bin/java',
                     '-nosplash')
         }
 

diff --git a/buildSrc/src/main/groovy/eclipsebuild/BuildDefinitionPlugin.groovy b/buildSrc/src/main/groovy/eclipsebuild/BuildDefinitionPlugin.groovy
@@ -398,6 +398,7 @@ class BuildDefinitionPlugin implements Plugin<Project> {
                     '-roaming',
                     '-nosplash',
                     '-consoleLog',
+                    '-vm', System.getProperty('java.home') + '/bin/java',
                     '-vmargs', '-Declipse.p2.mirror=false')
 
             ignoreExitValue = true
@@ -423,6 +424,7 @@ class BuildDefinitionPlugin implements Plugin<Project> {
                     '-roaming',
                     '-nosplash',
                     '-consoleLog',
+                    '-vm', System.getProperty('java.home') + '/bin/java',
                     '-vmargs', '-Declipse.p2.mirror=false')
         }
     }

diff --git a/buildSrc/src/main/groovy/eclipsebuild/TestBundlePlugin.groovy b/buildSrc/src/main/groovy/eclipsebuild/TestBundlePlugin.groovy
@@ -221,6 +221,7 @@ class TestBundlePlugin implements Plugin<Project> {
                         "-bundles", p.tasks.jar.outputs.files.singleFile.path,
                         "-publishArtifacts",
                         "-nosplash",
+                        '-vm', System.getProperty('java.home') + '/bin/java',
                         "-consoleLog")
             }
         }
@@ -235,6 +236,7 @@ class TestBundlePlugin implements Plugin<Project> {
                     "-bundles", project.jar.outputs.files.singleFile.path,
                     "-publishArtifacts",
                     "-nosplash",
+                    '-vm', System.getProperty('java.home') + '/bin/java',
                     "-consoleLog")
         }
     }
@@ -255,6 +257,7 @@ class TestBundlePlugin implements Plugin<Project> {
                         '-p2.arch', Constants.arch,
                         '-roaming',
                         '-nosplash',
+                        '-vm', System.getProperty('java.home') + '/bin/java',
                         '-consoleLog')
             }
         }
@@ -272,6 +275,7 @@ class TestBundlePlugin implements Plugin<Project> {
                     '-p2.ws', Constants.ws,
                     '-p2.arch', Constants.arch,
                     '-roaming',
+                    '-vm', System.getProperty('java.home') + '/bin/java',
                     '-nosplash')
         }
     }

diff --git a/buildSrc/src/main/groovy/eclipsebuild/UpdateSitePlugin.groovy b/buildSrc/src/main/groovy/eclipsebuild/UpdateSitePlugin.groovy
@@ -338,6 +338,7 @@ class UpdateSitePlugin implements Plugin<Project> {
                     '-publishArtifacts',
                     '-reusePack200Files',
                     '-configs', 'ANY',
+                    '-vm', System.getProperty('java.home') + '/bin/java',
                     '-consoleLog')
         }
 
@@ -350,6 +351,7 @@ class UpdateSitePlugin implements Plugin<Project> {
                     '-metadataRepository', repositoryDir.toURI().toURL(),
                     '-categoryDefinition',  project.updateSite.siteDescriptor.toURI().toURL(),
                     '-compress',
+                    '-vm', System.getProperty('java.home') + '/bin/java',
                     '-consoleLog')
         }
 

diff --git a/buildSrc/src/main/groovy/eclipsebuild/jar/CreateP2RepositoryTask.groovy b/buildSrc/src/main/groovy/eclipsebuild/jar/CreateP2RepositoryTask.groovy
@@ -25,6 +25,7 @@ class CreateP2RepositoryTask extends DefaultTask {
                 '-artifactRepository', targetRepositoryDir.toURI().toURL(),
                 '-source', bundleSourceDir,
                 '-publishArtifacts',
+                '-vm', System.getProperty('java.home') + '/bin/java',
                 '-configs', 'ANY')
         }
     }