otherjre.cxx (36f55ffc) otherjre.cxx (9fbe0120)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 61 unchanged lines hidden (view full) ---

70#elif UNX
71#ifdef MACOSX
72 "/../../../../../Frameworks/JavaVM.framework/JavaVM" //as of 1.6.0_22
73#else
74 "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", // for Blackdown PPC
75 "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64
76 "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so", // for Blackdown PPC
77 "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so", // for Java of BEA Systems
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 61 unchanged lines hidden (view full) ---

70#elif UNX
71#ifdef MACOSX
72 "/../../../../../Frameworks/JavaVM.framework/JavaVM" //as of 1.6.0_22
73#else
74 "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", // for Blackdown PPC
75 "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", // for Blackdown AMD64
76 "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so", // for Blackdown PPC
77 "/lib/" JFW_PLUGIN_ARCH "/jrockit/libjvm.so", // for Java of BEA Systems
78 "/lib/server/libjvm.so", // > 1.8
78 "/bin/classic/libjvm.so", // fallback for older for IBM Java
79 "/jre/bin/classic/libjvm.so" // fallback for older for IBM Java
80#endif
81#endif
82
83 };
84 *size = sizeof(ar) / sizeof (char*);
85 return ar;

--- 11 unchanged lines hidden (view full) ---

97 "/jre/bin",
98 "/bin/classic",
99 "/jre/bin/classic",
100 "/lib/" JFW_PLUGIN_ARCH "/client",
101 "/lib/" JFW_PLUGIN_ARCH "/server",
102 "/lib/" JFW_PLUGIN_ARCH "/classic",
103 "/lib/" JFW_PLUGIN_ARCH "/jrockit",
104 "/lib/" JFW_PLUGIN_ARCH "/native_threads",
79 "/bin/classic/libjvm.so", // fallback for older for IBM Java
80 "/jre/bin/classic/libjvm.so" // fallback for older for IBM Java
81#endif
82#endif
83
84 };
85 *size = sizeof(ar) / sizeof (char*);
86 return ar;

--- 11 unchanged lines hidden (view full) ---

98 "/jre/bin",
99 "/bin/classic",
100 "/jre/bin/classic",
101 "/lib/" JFW_PLUGIN_ARCH "/client",
102 "/lib/" JFW_PLUGIN_ARCH "/server",
103 "/lib/" JFW_PLUGIN_ARCH "/classic",
104 "/lib/" JFW_PLUGIN_ARCH "/jrockit",
105 "/lib/" JFW_PLUGIN_ARCH "/native_threads",
105 "/lib/" JFW_PLUGIN_ARCH
106 "/lib/" JFW_PLUGIN_ARCH,
107 "/lib" // > 1.8
106#endif
107 };
108
109 *size = sizeof(ar) / sizeof (char*);
110 return ar;
111#else
112 size = 0;
113 return NULL;

--- 13 unchanged lines hidden --- 		108#endif
109 };
110
111 *size = sizeof(ar) / sizeof (char*);
112 return ar;
113#else
114 size = 0;
115 return NULL;

--- 13 unchanged lines hidden ---