some more changes for solaris

matthiasg · matthiasg · commit 5b5bfb7076da · 2014-09-06T13:41:58.000+02:00
diff --git a/binding.gyp b/binding.gyp
@@ -41,7 +41,7 @@
       }],
       ['OS=="solaris" and target_arch=="x64"', {
         'javalibdir%': "<!(h=\"`node findJavaHome.js`\" sh -c 'if [ -d \"$h/jre/lib/amd64/classic\" ]; then echo $h/jre/lib/amd64/classic; else echo $h/jre/lib/amd64/server; fi')"
-      }]
+      }],
     ]
   },
   'targets': [
@@ -89,8 +89,8 @@
               '<(javahome)/include/solaris',
             ],
             'libraries': [
-              '-L<(javalibdir)',
-              '-Wl,-rpath,<(javalibdir)',
+               '-L<(javahome)/jre/lib/<(arch)/server/',
+              '-Wl,-rpath,<(javahome)/jre/lib/<(arch)/server/',
               '-ljvm'
             ]
           }
diff --git a/postInstall.js b/postInstall.js
@@ -1,19 +1,22 @@
 var glob = require('glob');
 var fs = require('fs');
 var path = require('path');
+var os = require('os');
 
 require('find-java-home')(function(err, home){
   var dll;
   var dylib;
-  var so;
+  var so,soFiles;
   var binary;
 
   if(home){
     dll = glob.sync('**/jvm.dll', {cwd: home})[0];
-    so = glob.sync('**/libjvm.so', {cwd: home})[0];
+    soFiles = glob.sync('**/libjvm.so', {cwd: home});
     dylib = glob.sync('**/libjvm.dylib', {cwd: home})[0];
     binary = dll || dylib || so;
 
+    so = getCorrectSoForPlatform(soFiles);
+
     fs.writeFileSync(
       path.resolve(__dirname, './build/jvm_dll_path.json'),
       binary
@@ -25,3 +28,26 @@ require('find-java-home')(function(err, home){
     );
   }
 });
+
+function getCorrectSoForPlatform(soFiles){
+  
+  var architectureFolderNames = {
+    'ia32': 'i386',
+    'x64': 'amd64'
+  };
+
+  if(os.platform() != 'sunos')
+    return soFiles[0];
+
+  var requiredFolderName = architectureFolderNames[os.arch()];
+
+  for (var i = 0; i < soFiles.length; i++) {
+    var so = soFiles[i];
+
+    if(so.indexOf('server'))
+      if(so.indexOf(requiredFolderName))
+        return so;
+  }
+
+  return so[0];
+}

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`}],`
`42`	`42`	`['OS=="solaris" and target_arch=="x64"', {`
`43`	`43`	'javalibdir%': "<!(h=\"`node findJavaHome.js`\" sh -c 'if [ -d \"$h/jre/lib/amd64/classic\" ]; then echo $h/jre/lib/amd64/classic; else echo $h/jre/lib/amd64/server; fi')"
`44`		`- }]`
	`44`	`+ }],`
`45`	`45`	`]`
`46`	`46`	`},`
`47`	`47`	`'targets': [`
`@@ -89,8 +89,8 @@`
`89`	`89`	`'<(javahome)/include/solaris',`
`90`	`90`	`],`
`91`	`91`	`'libraries': [`
`92`		`- '-L<(javalibdir)',`
`93`		`- '-Wl,-rpath,<(javalibdir)',`
	`92`	`+ '-L<(javahome)/jre/lib/<(arch)/server/',`
	`93`	`+ '-Wl,-rpath,<(javahome)/jre/lib/<(arch)/server/',`
`94`	`94`	`'-ljvm'`
`95`	`95`	`]`
`96`	`96`	`}`