1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
|
We don't need to install any JNA binaries, since they're already installed.
--- a/libs.jna/nbproject/project.properties
+++ b/libs.jna/nbproject/project.properties
@@ -43,15 +43,15 @@
javac.source=1.6
release.external/jna-3.4.0.jar=modules/ext/jna-3.4.0.jar
# Do not forget to rename native libs being extracted from the JAR when upgrading the JNA library, and patch org.netbeans.libs.jna.Installer as well.
-release.external/jna-3.4.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-340.jnilib
-release.external/jna-3.4.0.jar!/com/sun/jna/linux-amd64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-340.so
-release.external/jna-3.4.0.jar!/com/sun/jna/linux-i386/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-340.so
-release.external/jna-3.4.0.jar!/com/sun/jna/win32-amd64/jnidispatch.dll=modules/lib/amd64/jnidispatch-340.dll
-release.external/jna-3.4.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-340.dll
-jnlp.verify.excludes=\
- modules/lib/amd64/jnidispatch-340.dll,\
- modules/lib/amd64/linux/libjnidispatch-340.so,\
- modules/lib/i386/linux/libjnidispatch-340.so,\
- modules/lib/x86/jnidispatch-340.dll,\
- modules/lib/libjnidispatch-340.jnilib
+#release.external/jna-3.4.0.jar!/com/sun/jna/darwin/libjnidispatch.jnilib=modules/lib/libjnidispatch-340.jnilib
+#release.external/jna-3.4.0.jar!/com/sun/jna/linux-amd64/libjnidispatch.so=modules/lib/amd64/linux/libjnidispatch-340.so
+#release.external/jna-3.4.0.jar!/com/sun/jna/linux-i386/libjnidispatch.so=modules/lib/i386/linux/libjnidispatch-340.so
+#release.external/jna-3.4.0.jar!/com/sun/jna/win32-amd64/jnidispatch.dll=modules/lib/amd64/jnidispatch-340.dll
+#release.external/jna-3.4.0.jar!/com/sun/jna/win32-x86/jnidispatch.dll=modules/lib/x86/jnidispatch-340.dll
+#jnlp.verify.excludes=\
+# modules/lib/amd64/jnidispatch-340.dll,\
+# modules/lib/amd64/linux/libjnidispatch-340.so,\
+# modules/lib/i386/linux/libjnidispatch-340.so,\
+# modules/lib/x86/jnidispatch-340.dll,\
+# modules/lib/libjnidispatch-340.jnilib
sigtest.gen.fail.on.error=false
--- a/libs.jna/src/org/netbeans/libs/jna/Installer.java
+++ b/libs.jna/src/org/netbeans/libs/jna/Installer.java
@@ -50,6 +50,6 @@
public void validate() {
super.validate();
//#211655
- System.setProperty( "jna.boot.library.name", "jnidispatch-340" ); //NOI18N
+ System.setProperty( "jna.boot.library.name", "jnidispatch" ); //NOI18N
}
}
|
