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

platform: JNA updated to 4.1.0 (jna-utils -> jna-platform)

Browse Source
This commit is contained in:
Roman Shevchenko
2015-09-21 19:57:31 +03:00
parent a6507bc8e9
commit a9822c6c8a
4 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/gant.xml
+1 -1
View File
@@ -41,7 +41,7 @@
<include name="guava*.jar"/>
<include name="picocontainer.jar"/>
<include name="jna.jar"/>
<include name="jna-utils.jar"/>
<include name="jna-platform.jar"/>
<include name="oromatcher.jar"/>
<include name="snappy-in-java-*.jar"/>
<include name="cli-parser-*.jar"/>
lib/required_for_dist.txt
+1 -1
View File
@@ -30,8 +30,8 @@ jgoodies-common-1.2.1.jar
jgoodies-forms.jar
jgoodies-looks-2.4.2.jar
jh.jar
jna-utils.jar
jna.jar
jna-platform.jar
jsch-0.1.52.jar
jsch.agentproxy.connector-factory.jar
jsch.agentproxy.core.jar
platform/bootstrap/src/com/intellij/idea/Main.java
+3 -3
View File
@@ -197,7 +197,7 @@ public class Main {
// always delete previous patch copy
File patchCopy = new File(tempDir, patchFileName + "_copy");
File log4jCopy = new File(tempDir, "log4j.jar." + platform + "_copy");
File jnaUtilsCopy = new File(tempDir, "jna-utils.jar." + platform + "_copy");
File jnaUtilsCopy = new File(tempDir, "jna-platform.jar." + platform + "_copy");
File jnaCopy = new File(tempDir, "jna.jar." + platform + "_copy");
if (!FileUtilRt.delete(patchCopy) || !FileUtilRt.delete(log4jCopy) || !FileUtilRt.delete(jnaUtilsCopy) || !FileUtilRt.delete(jnaCopy)) {
throw new IOException("Cannot delete temporary files in " + tempDir);
@@ -209,8 +209,8 @@ public class Main {
File log4j = new File(PathManager.getLibPath(), "log4j.jar");
if (!log4j.exists()) throw new IOException("Log4J is missing: " + log4j);
File jnaUtils = new File(PathManager.getLibPath(), "jna-utils.jar");
if (!jnaUtils.exists()) throw new IOException("jna-utils.jar is missing: " + jnaUtils);
File jnaUtils = new File(PathManager.getLibPath(), "jna-platform.jar");
if (!jnaUtils.exists()) throw new IOException("jna-platform.jar is missing: " + jnaUtils);
File jna = new File(PathManager.getLibPath(), "jna.jar");
if (!jna.exists()) throw new IOException("jna is missing: " + jna);
platform/util/src/com/intellij/openapi/application/PathManager.java
+1 -1
View File
@@ -439,7 +439,7 @@ public class PathManager {
THashSet.class, // trove4j
PicoContainer.class, // PicoContainer
TypeMapper.class, // JNA
FileUtils.class, // JNA (jna-utils)
FileUtils.class, // JNA (jna-platform)
PatternMatcher.class, // OROMatcher
Snappy.class // Snappy
};