for eclipse plugins.
1. Added support to use eclipse plugins on 64-bit linux machines.
Created seperate folder under /libs in plugins for
32-bit and 64-bit libraries.
Updated the MANIFEST file to load the libraries
corresponding to the underlying architecture.
2. Specified the run-time path to help the loader to find the
dependent libraries of oc in resource/src/SConscript
for simulator to avoid the need to set the LD_LIBRARY_PATH
to run the plugins.
3. Moved the code to load the simulator libraries
from plugins to Java SDK.
Change-Id: Ia9b9e8542c4e82c18768dcc25c9ae727614ff7bf
Signed-off-by: G S Senthil Kumar <senthil.gs@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/7631
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
if target_os == 'tizen':
oclib_env.AppendUnique(CPPDEFINES = ['__TIZEN__'])
+if target_os in ['linux'] and env.get('SIMULATOR', False):
+ oclib_env.Append( RPATH = env.Literal('\\$$ORIGIN'))
+
######################################################################
# Source files and Targets
######################################################################
org.eclipse.core.runtime
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
-Bundle-NativeCode: libs/libSimulatorManager.so
+Bundle-NativeCode: libs/linux-x86/liboc_logger.so;
+ libs/linux-x86/liboctbstack.so;
+ libs/linux-x86/libSimulatorManager.so;
+ libs/linux-x86/liboc.so;
+ libs/linux-x86/libRamlParser.so;
+ osname=linux;
+ processor=x86,
+ libs/linux-x86_64/liboc_logger.so;
+ libs/linux-x86_64/liboctbstack.so;
+ libs/linux-x86_64/libSimulatorManager.so;
+ libs/linux-x86_64/liboc.so;
+ libs/linux-x86_64/libRamlParser.so;
+ osname=linux;
+ processor=x86-64
Bundle-ClassPath: libs/Simulator.jar,
.
Bundle-Vendor: Open Connectivity Foundation
private static ImageManager imageManager;
- static {
- System.loadLibrary("SimulatorManager");
- }
-
public Activator() {
}
org.eclipse.core.runtime
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
Bundle-ActivationPolicy: lazy
-Bundle-NativeCode: libs/libSimulatorManager.so
+Bundle-NativeCode: libs/linux-x86/liboc_logger.so;
+ libs/linux-x86/liboctbstack.so;
+ libs/linux-x86/libSimulatorManager.so;
+ libs/linux-x86/liboc.so;
+ libs/linux-x86/libRamlParser.so;
+ osname=linux;
+ processor=x86,
+ libs/linux-x86_64/liboc_logger.so;
+ libs/linux-x86_64/liboctbstack.so;
+ libs/linux-x86_64/libSimulatorManager.so;
+ libs/linux-x86_64/liboc.so;
+ libs/linux-x86_64/libRamlParser.so;
+ osname=linux;
+ processor=x86-64
Bundle-ClassPath: libs/Simulator.jar,
.
Bundle-Vendor: Open Connectivity Foundation
private static ImageManager imageManager;
- static {
- System.loadLibrary("SimulatorManager");
- }
-
public Activator() {
}
*/
public class SimulatorManager {
+ static {
+ System.loadLibrary("oc_logger");
+ System.loadLibrary("octbstack");
+ System.loadLibrary("oc");
+ System.loadLibrary("RamlParser");
+ System.loadLibrary("SimulatorManager");
+ }
+
/**
* API for creating a resource from a RAML configuration file.
*