Lanmikeman/Launcher
1
1
Fork 0
mirror of https://github.com/GravitLauncher/Launcher synced 2024-12-23 09:01:08 +03:00
Code Issues Projects Releases Packages Wiki Activity

[FIX] Радон готов.

Browse source
This commit is contained in:
zaxar163 2019-03-15 17:32:01 +03:00
parent e94908d08f
commit f739cff28c
No known key found for this signature in database
GPG key ID: E3B309DD3852DE06
3 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
LaunchServer/build.gradle
View file

@ -14,6 +14,7 @@
targetCompatibility = '1.8' targetCompatibility = '1.8'
configurations { configurations {
compileOnlyA
bundleOnly bundleOnly
bundle bundle
hikari hikari
@ -69,6 +70,8 @@ bundle project(':Radon')
launch4jCJ('net.sf.launch4j:launch4j:3.12:workdir-linux') { launch4jCJ('net.sf.launch4j:launch4j:3.12:workdir-linux') {
exclude group: '*' exclude group: '*'
} }
compileOnlyA 'com.google.guava:guava:26.0-jre'
} }
task hikari(type: Copy) { task hikari(type: Copy) {
@ -112,6 +115,11 @@ task dumpLibs(type: Copy) {
from configurations.bundleOnly from configurations.bundleOnly
} }
task dumpCompileOnlyLibs(type: Copy) {
into "$buildDir/libs/launcher-libraries-compile"
from configurations.compileOnlyA
}
task bundle(type: Zip) { task bundle(type: Zip) {
dependsOn parent.childProjects.Launcher.tasks.build, tasks.dumpLibs, tasks.jar dependsOn parent.childProjects.Launcher.tasks.build, tasks.dumpLibs, tasks.jar
archiveName 'LaunchServer.zip' archiveName 'LaunchServer.zip'

10
LaunchServer/src/main/java/ru/gravit/launchserver/LaunchServer.java
View file

@ -277,7 +277,8 @@ public static void main(String... args) throws Throwable {
// Start LaunchServer // Start LaunchServer
long startTime = System.currentTimeMillis(); long startTime = System.currentTimeMillis();
try { try {
LaunchServer launchserver = new LaunchServer(IOHelper.WORKING_DIR, args); @SuppressWarnings("resource")
LaunchServer launchserver = new LaunchServer(IOHelper.WORKING_DIR, args);
if(args.length == 0) launchserver.run(); if(args.length == 0) launchserver.run();
else { //Обработка команды else { //Обработка команды
launchserver.commandHandler.eval(args,false); launchserver.commandHandler.eval(args,false);
@ -296,6 +297,8 @@ public static void main(String... args) throws Throwable {
public final Path launcherLibraries; public final Path launcherLibraries;
public final Path launcherLibrariesCompile;
public final List<String> args; public final List<String> args;
public final Path configFile; public final Path configFile;
@ -366,10 +369,7 @@ public LaunchServer(Path dir, String[] args) throws IOException, InvalidKeySpecE
this.dir = dir; this.dir = dir;
taskPool = new Timer("Timered task worker thread", true); taskPool = new Timer("Timered task worker thread", true);
launcherLibraries = dir.resolve("launcher-libraries"); launcherLibraries = dir.resolve("launcher-libraries");
if (!Files.isDirectory(launcherLibraries)) { launcherLibrariesCompile = dir.resolve("launcher-libraries-compile");
Files.deleteIfExists(launcherLibraries);
Files.createDirectory(launcherLibraries);
}
this.args = Arrays.asList(args); this.args = Arrays.asList(args);
configFile = dir.resolve("LaunchServer.conf"); configFile = dir.resolve("LaunchServer.conf");
publicKeyFile = dir.resolve("public.key"); publicKeyFile = dir.resolve("public.key");

2
Radon

@ -1 +1 @@
Subproject commit 8b323623f885ea4959e8b5f0e00dc4ca1b5285d6 Subproject commit 9ad5210d821a5fcc072dae9f8e24ef37c8544757