AfflictionNetworks/getdown
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #206 from sergiorussia/feature/java_local_dir

Browse Source 
enable custom java local dir instead of hardcoded "java_vm"
This commit is contained in:
Michael Bayne
2019-05-03 13:34:32 -07:00
committed by GitHub
parent 901682d5f7 f7a5092116
commit 18d449166c
3 changed files with 37 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
launcher/src/main/java/com/threerings/getdown/launcher/Getdown.java
+5 -5
View File
@@ -507,13 +507,13 @@ public abstract class Getdown extends Thread
vmjar.install(true);
// these only run on non-Windows platforms, so we use Unix file separators
String localJavaDir = LaunchUtil.LOCAL_JAVA_DIR + "/";
FileUtil.makeExecutable(_app.getLocalPath(localJavaDir + "bin/java"));
FileUtil.makeExecutable(_app.getLocalPath(localJavaDir + "lib/jspawnhelper"));
FileUtil.makeExecutable(_app.getLocalPath(localJavaDir + "lib/amd64/jspawnhelper"));
File javaLocalDir = _app.getJavaLocalDir();
FileUtil.makeExecutable(new File(javaLocalDir, "bin/java"));
FileUtil.makeExecutable(new File(javaLocalDir, "lib/jspawnhelper"));
FileUtil.makeExecutable(new File(javaLocalDir, "lib/amd64/jspawnhelper"));
// lastly regenerate the .jsa dump file that helps Java to start up faster
String vmpath = LaunchUtil.getJVMPath(_app.getLocalPath(""));
String vmpath = LaunchUtil.getJVMBinaryPath(javaLocalDir, false);
try {
log.info("Regenerating classes.jsa for " + vmpath + "...");
Runtime.getRuntime().exec(vmpath + " -Xshare:dump");