MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anna Kozlova
2014-03-04 13:50:13 +01:00
parent f8f3d97b7b 4a4d94f80f
commit 5acf645318
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/bootstrap/src/com/intellij/idea/Main.java
+16 -2
View File
@@ -120,6 +120,19 @@ public class Main {
return args.length > 0 && Comparing.strEqual(args[0], "traverseUI");
}
private static void copyFile(String fileNameFrom, String fileNameTo) throws IOException {
File fileFrom = new File(fileNameFrom);
File fileTo = new File(fileNameTo);
try{
FileUtilRt.copy(fileFrom, fileTo);
}
finally{
if(!fileTo.exists()) {
throw new IOException("Cannot copy " + fileNameFrom + " to " + fileNameTo);
}
}
}
private static void installPatch() throws IOException {
String platform = System.getProperty(PLATFORM_PREFIX_PROPERTY, "idea");
String patchFileName = ("jetbrains.patch.jar." + platform).toLowerCase();
@@ -148,12 +161,13 @@ public class Main {
File launcher = new File(PathManager.getBinPath(), "VistaLauncher.exe");
args.add(Restarter.createTempExecutable(launcher).getPath());
}
String copyLog4j = tempDir + "/log4j.jar";
copyFile(PathManager.getLibPath() + "/log4j.jar", copyLog4j);
Collections.addAll(args,
System.getProperty("java.home") + "/bin/java",
"-Xmx500m",
"-classpath",
copyPatchFile.getPath() + File.pathSeparator + PathManager.getLibPath() + "/log4j.jar",
copyPatchFile.getPath() + File.pathSeparator + copyLog4j,
"-Djava.io.tmpdir=" + tempDir,
"-Didea.updater.log=" + PathManager.getLogPath(),
"com.intellij.updater.Runner",