mirror of
https://github.com/xpipe-io/xpipe.git
synced 2026-07-08 11:30:42 +00:00
Fixes
This commit is contained in:
+10
-4
@@ -101,6 +101,8 @@ application {
|
||||
}
|
||||
|
||||
run {
|
||||
dependsOn extensionJarDepList
|
||||
|
||||
systemProperty propertyName('useVirtualThreads'), 'false'
|
||||
systemProperty propertyName('mode'), 'gui'
|
||||
systemProperty propertyName('writeLogs'), "true"
|
||||
@@ -123,14 +125,18 @@ run {
|
||||
def exts = files(project.allExtensions.stream().map(p -> p.getTasksByName('jar', true)[0].outputs.files.singleFile).toList())
|
||||
classpath += exts
|
||||
|
||||
def cli = project(':cli').getTasksByName('jar', true)[0].outputs.files.singleFile
|
||||
classpath += files(cli)
|
||||
if (fullVersion) {
|
||||
def cli = project(':cli').getTasksByName('jar', true)[0].outputs.files.singleFile
|
||||
classpath += files(cli)
|
||||
|
||||
dependsOn(project(':cli').getTasksByName('jar', true)[0])
|
||||
dependsOn(project.allExtensions.stream().map(p -> p.getTasksByName('jar', true)[0]).toList())
|
||||
dependsOn(project(':cli').getTasksByName('jar', true)[0])
|
||||
dependsOn(project.allExtensions.stream().map(p -> p.getTasksByName('jar', true)[0]).toList())
|
||||
}
|
||||
}
|
||||
|
||||
tasks.register('runAttachedDebugger', JavaExec) {
|
||||
dependsOn extensionJarDepList
|
||||
|
||||
workingDir = rootDir
|
||||
classpath = run.classpath
|
||||
mainModule = groupName + '.app'
|
||||
|
||||
@@ -164,7 +164,7 @@ public class AppExtensionManager {
|
||||
}
|
||||
}
|
||||
|
||||
externalModules = FileSystems.newFileSystem(URI.create("jrt:/"), Map.of("java.home", localInstallation.getRuntimePath()));
|
||||
externalModules = FileSystems.newFileSystem(URI.create("jrt:/"), Map.of("java.home", localInstallation.getRuntimePath().toString()));
|
||||
}
|
||||
|
||||
var basePath = externalModules.getPath("modules", "io.xpipe.ext." + name);
|
||||
|
||||
@@ -168,8 +168,6 @@ public abstract class AppInstallation {
|
||||
|
||||
public abstract Path getDaemonExecutablePath();
|
||||
|
||||
public abstract Path getExtensionsPath();
|
||||
|
||||
public abstract Path getLogoPath();
|
||||
|
||||
public abstract Path getRuntimePath();
|
||||
@@ -201,11 +199,6 @@ public abstract class AppInstallation {
|
||||
return getBaseInstallationPath().resolve(AppNames.ofCurrent().getExecutableName() + ".exe");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Path getExtensionsPath() {
|
||||
return getBaseInstallationPath().resolve("extensions");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Path getLogoPath() {
|
||||
return getBaseInstallationPath().resolve("logo.ico");
|
||||
@@ -269,11 +262,6 @@ public abstract class AppInstallation {
|
||||
return getBaseInstallationPath().resolve("bin", AppNames.ofCurrent().getExecutableName());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Path getExtensionsPath() {
|
||||
return getBaseInstallationPath().resolve("extensions");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Path getLogoPath() {
|
||||
if (!AppProperties.get().isImage()) {
|
||||
@@ -340,11 +328,6 @@ public abstract class AppInstallation {
|
||||
.resolve("Contents", "MacOS", AppNames.ofCurrent().getExecutableName());
|
||||
}
|
||||
|
||||
@Override
|
||||
public Path getExtensionsPath() {
|
||||
return getBaseInstallationPath().resolve("Contents", "Resources", "extensions");
|
||||
}
|
||||
|
||||
@Override
|
||||
public Path getLogoPath() {
|
||||
if (!AppProperties.get().isImage()) {
|
||||
|
||||
Vendored
-17
@@ -112,21 +112,6 @@ tasks.named('jlink').get().dependsOn(rootProject.getTasksByName("jar", true))
|
||||
tasks.named('jlink').get().dependsOn(extLibrariesTasks)
|
||||
|
||||
def outputName = os.isMacOsX() ? "${jpackageExecutableName}.app/Contents/Resources" : jpackageExecutableName
|
||||
tasks.register('copyBundledExtensions', DefaultTask) {
|
||||
dependsOn extLibrariesTasks
|
||||
doLast {
|
||||
for (def extProject : extModules) {
|
||||
def dir = "${extProject.buildDir}/libs_ext"
|
||||
if (file(dir).exists()) {
|
||||
copy {
|
||||
from(dir)
|
||||
into "$distDir/jpackage/$outputName/extensions/${extProject.name}"
|
||||
include '*.jar'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
tasks.register('prepareMacOSResources', DefaultTask) {
|
||||
doLast {
|
||||
@@ -159,5 +144,3 @@ if (os.isMacOsX()) {
|
||||
jpackageImage.finalizedBy(finalizeMacOSResources)
|
||||
jpackageImage.dependsOn(prepareMacOSResources)
|
||||
}
|
||||
|
||||
tasks.jpackage.finalizedBy(copyBundledExtensions)
|
||||
|
||||
Reference in New Issue
Block a user