[visualvm] 01/02: Add symlinks to the native libraries in the visualvm package instead of a patch

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository visualvm.

commit 2d4edfad7e7d63c5c1a3183cd4cacd726809a09c
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 6 11:52:57 2014 +0200

    Add symlinks to the native libraries in the visualvm package instead of a patch
---
 debian/patches/02-relocate-native-libraries.patch | 68 -----------------------
 debian/patches/series                             |  1 -
 debian/visualvm.links                             |  8 +++
 3 files changed, 8 insertions(+), 69 deletions(-)

diff --git a/debian/patches/02-relocate-native-libraries.patch b/debian/patches/02-relocate-native-libraries.patch
deleted file mode 100644
index cf6ccf3..0000000
--- a/debian/patches/02-relocate-native-libraries.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-Description: Load the native libraries from /usr/lib/jni
-Author: Emmanuel Bourg <ebourg at apache.org>
-Forwarded: not-needed
---- a/netbeans/lib.profiler.common/src/org/netbeans/lib/profiler/common/integration/IntegrationUtils.java
-+++ b/netbeans/lib.profiler.common/src/org/netbeans/lib/profiler/common/integration/IntegrationUtils.java
-@@ -310,7 +310,7 @@
-             return HTML_REMOTE_STRING + getDirectorySeparator(targetPlatform) + "lib"; //NOI18N
-         }
- 
--        return Profiler.getDefault().getLibsDir();
-+        return "/usr/lib/jni"; //NOI18N
-     }
- 
-     public static String getLineBreak(String targetPlatform) {
-@@ -385,9 +385,7 @@
- 
-     // Returns getLibsDir()/deployed/jdk<15>/<OS> appropriate for current / selected OS
-     public static String getNativeLibrariesPath(String targetPlatform, String targetJVM, boolean isRemote) {
--        return getLibsDir(targetPlatform, isRemote) + getDirectorySeparator(targetPlatform) + "deployed" //NOI18N
--               + getDirectorySeparator(targetPlatform) + getJavaPlatformNativeLibrariesDirectoryName(targetJVM)
--               + getDirectorySeparator(targetPlatform) + getOSPlatformNativeLibrariesDirectoryName(targetPlatform, isRemote);
-+        return getLibsDir(targetPlatform, isRemote);
-     }
- 
-     // Returns name of the environment variable for system path to Profiler native libraries appropriate for current / selected OS
-@@ -456,7 +454,7 @@
-         }
- 
-         return "-agentpath:" + "\"" + getNativeLibrariesPath(targetPlatform, targetJVM, isRemote)
--               + getDirectorySeparator(targetPlatform) + getProfilerAgentLibraryFile(targetPlatform) + "=" //NOI18N
-+               + getDirectorySeparator(targetPlatform) + getProfilerAgentLibraryFile(targetPlatform, targetJVM) + "=" //NOI18N
-                + getLibsDir(targetPlatform, isRemote) + "\"" + "," + portNumber; //NOI18N
-     }
- 
-@@ -491,7 +489,7 @@
-             args.append(" -XX:+UseLinuxPosixThreadCPUClocks "); // NOI18N
-         }
-         args.append("-agentpath:").append(getNativeLibrariesPath(targetPlatform, targetJVM, isRemote)). // NOI18N
--               append(getDirectorySeparator(targetPlatform)).append(getProfilerAgentLibraryFile(targetPlatform)).append("="). //NOI18N
-+               append(getDirectorySeparator(targetPlatform)).append(getProfilerAgentLibraryFile(targetPlatform, targetJVM)).append("="). //NOI18N
-                append(getLibsDir(targetPlatform, isRemote)).append(",").append(portNumber); //NOI18N
-         return args.toString();
-     }
-@@ -506,7 +504,7 @@
-         }
-         String natLibs = getNativeLibrariesPath(targetPlatform, targetJVM, isRemote).replace(" ", pathSpaceChar != null ? pathSpaceChar : " ");
-         String libsDir = getLibsDir(targetPlatform, isRemote).replace(" ", pathSpaceChar != null ? pathSpaceChar : " ");
--        String agentFile = getProfilerAgentLibraryFile(targetPlatform).replace(" ", pathSpaceChar != null ? pathSpaceChar : " ");
-+        String agentFile = getProfilerAgentLibraryFile(targetPlatform, targetJVM).replace(" ", pathSpaceChar != null ? pathSpaceChar : " ");
-         args.append("-agentpath:").append(natLibs). // NOI18N
-                append(getDirectorySeparator(targetPlatform)).append(agentFile).append("="). //NOI18N
-                append(libsDir).append(",").append(portNumber); //NOI18N
-@@ -514,13 +512,13 @@
-     }
- 
-     // Returns filename of profiler agent library
--    public static String getProfilerAgentLibraryFile(String targetPlatform) {
-+    public static String getProfilerAgentLibraryFile(String targetPlatform, String javaPlatform) {
-         if (isWindowsPlatform(targetPlatform)) {
-             return "profilerinterface.dll"; //NOI18N
-         } else if (targetPlatform.equals(PLATFORM_MAC_OS)) {
-             return "libprofilerinterface.jnilib"; //NOI18N
-         } else {
--            return "libprofilerinterface.so"; //NOI18N
-+            return "libprofilerinterface-" + getJavaPlatformNativeLibrariesDirectoryName(javaPlatform) + ".so"; //NOI18N
-         }
-     }
- 
diff --git a/debian/patches/series b/debian/patches/series
index dfd4239..a0d3d79 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 01-gcc-settings.patch
-02-relocate-native-libraries.patch
 03-launcher.patch
diff --git a/debian/visualvm.links b/debian/visualvm.links
index 2d8e1ff..a62f0cd 100644
--- a/debian/visualvm.links
+++ b/debian/visualvm.links
@@ -1,3 +1,11 @@
 etc/visualvm/visualvm.conf     usr/share/visualvm/etc/visualvm.conf
 etc/visualvm/visualvm.clusters usr/share/visualvm/etc/visualvm.clusters
 usr/share/netbeans/platform18  usr/share/visualvm/platform
+
+usr/lib/jni/libprofilerinterface-jdk15.so usr/share/visualvm/profiler/lib/deployed/jdk15/linux/libprofilerinterface.so
+usr/lib/jni/libprofilerinterface-jdk15.so usr/share/visualvm/profiler/lib/deployed/jdk15/linux-amd64/libprofilerinterface.so
+usr/lib/jni/libprofilerinterface-jdk15.so usr/share/visualvm/profiler/lib/deployed/jdk15/linux-arm/libprofilerinterface.so
+
+usr/lib/jni/libprofilerinterface-jdk16.so usr/share/visualvm/profiler/lib/deployed/jdk16/linux/libprofilerinterface.so
+usr/lib/jni/libprofilerinterface-jdk16.so usr/share/visualvm/profiler/lib/deployed/jdk16/linux-amd64/libprofilerinterface.so
+usr/lib/jni/libprofilerinterface-jdk16.so usr/share/visualvm/profiler/lib/deployed/jdk16/linux-arm/libprofilerinterface.so

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/visualvm.git