change location of resource container directory
authorMinji Park <minjii.park@samsung.com>
Wed, 30 Sep 2015 07:45:24 +0000 (16:45 +0900)
committerMadan Lanka <lanka.madan@samsung.com>
Wed, 30 Sep 2015 13:34:36 +0000 (13:34 +0000)
- relocate the directory of resource container out of resource-encapsulation directory
- change sconscript for changed directory location

Change-Id: I912149cb7f3fe6b640b07108570c2fe9dd78fd1d
Signed-off-by: Minji Park <minjii.park@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/3301
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
93 files changed:
service/SConscript
service/resource-container/SConscript [moved from service/resource-encapsulation/src/resourceContainer/SConscript with 50% similarity]
service/resource-container/bundle-api/include/BundleActivator.h [moved from service/resource-encapsulation/src/resourceContainer/bundle-api/include/BundleActivator.h with 100% similarity]
service/resource-container/bundle-api/include/BundleResource.h [moved from service/resource-encapsulation/src/resourceContainer/bundle-api/include/BundleResource.h with 100% similarity]
service/resource-container/bundle-api/include/NotificationReceiver.h [moved from service/resource-encapsulation/src/resourceContainer/bundle-api/include/NotificationReceiver.h with 100% similarity]
service/resource-container/bundle-api/include/ProtocolBridgeConnector.h [moved from service/resource-encapsulation/src/resourceContainer/bundle-api/include/ProtocolBridgeConnector.h with 100% similarity]
service/resource-container/bundle-api/include/ProtocolBridgeResource.h [moved from service/resource-encapsulation/src/resourceContainer/bundle-api/include/ProtocolBridgeResource.h with 100% similarity]
service/resource-container/bundle-api/include/ResourceContainerBundleAPI.h [moved from service/resource-encapsulation/src/resourceContainer/bundle-api/include/ResourceContainerBundleAPI.h with 100% similarity]
service/resource-container/bundle-api/include/SoftSensorResource.h [moved from service/resource-encapsulation/src/resourceContainer/bundle-api/include/SoftSensorResource.h with 100% similarity]
service/resource-container/bundle-java-api/pom.xml [moved from service/resource-encapsulation/src/resourceContainer/bundle-java-api/pom.xml with 100% similarity]
service/resource-container/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java [moved from service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BaseActivator.java with 100% similarity]
service/resource-container/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java [moved from service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleActivator.java with 100% similarity]
service/resource-container/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java [moved from service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/BundleResource.java with 100% similarity]
service/resource-container/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java [moved from service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ProtocolBridgeConnector.java with 100% similarity]
service/resource-container/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java [moved from service/resource-encapsulation/src/resourceContainer/bundle-java-api/src/main/java/org/iotivity/resourcecontainer/bundle/api/ResourceConfig.java with 100% similarity]
service/resource-container/examples/BMISensorBundle/include/BMISensor.h [moved from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/include/BMISensor.h with 100% similarity]
service/resource-container/examples/BMISensorBundle/include/BMISensorBundleActivator.h [moved from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/include/BMISensorBundleActivator.h with 100% similarity]
service/resource-container/examples/BMISensorBundle/include/BMISensorResource.h [moved from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/include/BMISensorResource.h with 100% similarity]
service/resource-container/examples/BMISensorBundle/include/SysTimer.h [moved from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/include/SysTimer.h with 100% similarity]
service/resource-container/examples/BMISensorBundle/src/BMISensor.cpp [moved from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/BMISensor.cpp with 100% similarity]
service/resource-container/examples/BMISensorBundle/src/BMISensorBundleActivator.cpp [moved from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/BMISensorBundleActivator.cpp with 100% similarity]
service/resource-container/examples/BMISensorBundle/src/BMISensorResource.cpp [moved from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/BMISensorResource.cpp with 100% similarity]
service/resource-container/examples/BMISensorBundle/src/SysTimer.cpp [moved from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/SysTimer.cpp with 100% similarity]
service/resource-container/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/SConscript [moved from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/SConscript with 100% similarity]
service/resource-container/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/include/HeightSensorApp.h [moved from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/include/HeightSensorApp.h with 100% similarity]
service/resource-container/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/src/HeightSensorApp.cpp [moved from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/HeightSensorApp/src/HeightSensorApp.cpp with 100% similarity]
service/resource-container/examples/BMISensorBundle/src/inputSensors/SConscript [moved from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/SConscript with 100% similarity]
service/resource-container/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/SConscript [moved from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/SConscript with 100% similarity]
service/resource-container/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/include/WeightSensorApp.h [moved from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/include/WeightSensorApp.h with 100% similarity]
service/resource-container/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/src/WeightSensorApp.cpp [moved from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/inputSensors/WeightSensorApp/src/WeightSensorApp.cpp with 100% similarity]
service/resource-container/examples/ContainerSample.cpp [moved from service/resource-encapsulation/src/resourceContainer/examples/ContainerSample.cpp with 98% similarity]
service/resource-container/examples/ContainerSampleClient.cpp [moved from service/resource-encapsulation/src/resourceContainer/examples/ContainerSampleClient.cpp with 100% similarity]
service/resource-container/examples/DiscomfortIndexSensorBundle/include/DISensorBundleActivator.h [moved from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/include/DISensorBundleActivator.h with 100% similarity]
service/resource-container/examples/DiscomfortIndexSensorBundle/include/DiscomfortIndexSensor.h [moved from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/include/DiscomfortIndexSensor.h with 100% similarity]
service/resource-container/examples/DiscomfortIndexSensorBundle/include/DiscomfortIndexSensorResource.h [moved from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/include/DiscomfortIndexSensorResource.h with 100% similarity]
service/resource-container/examples/DiscomfortIndexSensorBundle/include/SysTimer.h [moved from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/include/SysTimer.h with 100% similarity]
service/resource-container/examples/DiscomfortIndexSensorBundle/src/DISensorBundleActivator.cpp [moved from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/DISensorBundleActivator.cpp with 100% similarity]
service/resource-container/examples/DiscomfortIndexSensorBundle/src/DiscomfortIndexSensor.cpp [moved from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/DiscomfortIndexSensor.cpp with 100% similarity]
service/resource-container/examples/DiscomfortIndexSensorBundle/src/DiscomfortIndexSensorResource.cpp [moved from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/DiscomfortIndexSensorResource.cpp with 100% similarity]
service/resource-container/examples/DiscomfortIndexSensorBundle/src/SysTimer.cpp [moved from service/resource-encapsulation/src/resourceContainer/examples/BMISensorBundle/src/SysTimer.cpp with 100% similarity]
service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/SConscript [moved from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/SConscript with 100% similarity]
service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/SConscript [moved from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/SConscript with 100% similarity]
service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/include/ThingResourceServer.h [moved from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/include/ThingResourceServer.h with 100% similarity]
service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/src/ThingResourceServer.cpp [moved from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp/src/ThingResourceServer.cpp with 100% similarity]
service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/SConscript [moved from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/SConscript with 100% similarity]
service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/include/ThingResourceServer1.h [moved from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/include/ThingResourceServer1.h with 100% similarity]
service/resource-container/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/src/ThingResourceServer1.cpp [moved from service/resource-encapsulation/src/resourceContainer/examples/DiscomfortIndexSensorBundle/src/inputSensors/THSensorApp1/src/ThingResourceServer1.cpp with 100% similarity]
service/resource-container/examples/HueJavaSampleBundle/hue/pom.xml [moved from service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/pom.xml with 100% similarity]
service/resource-container/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java [moved from service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueBundleActivator.java with 100% similarity]
service/resource-container/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java [moved from service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueConnector.java with 100% similarity]
service/resource-container/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java [moved from service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/src/main/java/org/iotivity/bundle/hue/HueLightResource.java with 100% similarity]
service/resource-container/examples/HueSampleBundle/include/HueConnector.h [moved from service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/include/HueConnector.h with 100% similarity]
service/resource-container/examples/HueSampleBundle/include/HueLight.h [moved from service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/include/HueLight.h with 100% similarity]
service/resource-container/examples/HueSampleBundle/include/HueSampleBundleActivator.h [moved from service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/include/HueSampleBundleActivator.h with 100% similarity]
service/resource-container/examples/HueSampleBundle/src/HueConnector.cpp [moved from service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueConnector.cpp with 100% similarity]
service/resource-container/examples/HueSampleBundle/src/HueLight.cpp [moved from service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueLight.cpp with 100% similarity]
service/resource-container/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp [moved from service/resource-encapsulation/src/resourceContainer/examples/HueSampleBundle/src/HueSampleBundleActivator.cpp with 100% similarity]
service/resource-container/examples/ResourceContainerConfig.xml [moved from service/resource-encapsulation/src/resourceContainer/examples/ResourceContainerConfig.xml with 95% similarity]
service/resource-container/include/RCSBundleInfo.h [moved from service/resource-encapsulation/include/RCSBundleInfo.h with 100% similarity]
service/resource-container/include/RCSResourceContainer.h [moved from service/resource-encapsulation/include/RCSResourceContainer.h with 100% similarity]
service/resource-container/src/BaseActivator.cpp [moved from service/resource-encapsulation/src/resourceContainer/src/BaseActivator.cpp with 100% similarity]
service/resource-container/src/BundleActivator.cpp [moved from service/resource-encapsulation/src/resourceContainer/src/BundleActivator.cpp with 100% similarity]
service/resource-container/src/BundleInfoInternal.cpp [moved from service/resource-encapsulation/src/resourceContainer/src/BundleInfoInternal.cpp with 100% similarity]
service/resource-container/src/BundleInfoInternal.h [moved from service/resource-encapsulation/src/resourceContainer/include/BundleInfoInternal.h with 100% similarity]
service/resource-container/src/BundleResource.cpp [moved from service/resource-encapsulation/src/resourceContainer/src/BundleResource.cpp with 100% similarity]
service/resource-container/src/Configuration.cpp [moved from service/resource-encapsulation/src/resourceContainer/src/Configuration.cpp with 100% similarity]
service/resource-container/src/Configuration.h [moved from service/resource-encapsulation/src/resourceContainer/include/Configuration.h with 100% similarity]
service/resource-container/src/DiscoverResourceUnit.cpp [moved from service/resource-encapsulation/src/resourceContainer/src/DiscoverResourceUnit.cpp with 100% similarity]
service/resource-container/src/DiscoverResourceUnit.h [moved from service/resource-encapsulation/src/resourceContainer/include/DiscoverResourceUnit.h with 100% similarity]
service/resource-container/src/InternalTypes.h [moved from service/resource-encapsulation/src/resourceContainer/include/InternalTypes.h with 100% similarity]
service/resource-container/src/JavaBundleResource.cpp [moved from service/resource-encapsulation/src/resourceContainer/src/JavaBundleResource.cpp with 100% similarity]
service/resource-container/src/JavaBundleResource.h [moved from service/resource-encapsulation/src/resourceContainer/include/JavaBundleResource.h with 100% similarity]
service/resource-container/src/ProtocolBridgeConnector.cpp [moved from service/resource-encapsulation/src/resourceContainer/src/ProtocolBridgeConnector.cpp with 100% similarity]
service/resource-container/src/ProtocolBridgeResource.cpp [moved from service/resource-encapsulation/src/resourceContainer/src/ProtocolBridgeResource.cpp with 100% similarity]
service/resource-container/src/RCSBundleInfo.cpp [moved from service/resource-encapsulation/src/resourceContainer/src/RCSBundleInfo.cpp with 100% similarity]
service/resource-container/src/RCSResourceContainer.cpp [moved from service/resource-encapsulation/src/resourceContainer/src/RCSResourceContainer.cpp with 100% similarity]
service/resource-container/src/RemoteResourceUnit.cpp [moved from service/resource-encapsulation/src/resourceContainer/src/RemoteResourceUnit.cpp with 100% similarity]
service/resource-container/src/RemoteResourceUnit.h [moved from service/resource-encapsulation/src/resourceContainer/include/RemoteResourceUnit.h with 100% similarity]
service/resource-container/src/ResourceContainerBundleAPI.cpp [moved from service/resource-encapsulation/src/resourceContainer/src/ResourceContainerBundleAPI.cpp with 100% similarity]
service/resource-container/src/ResourceContainerImpl.cpp [moved from service/resource-encapsulation/src/resourceContainer/src/ResourceContainerImpl.cpp with 99% similarity]
service/resource-container/src/ResourceContainerImpl.h [moved from service/resource-encapsulation/src/resourceContainer/include/ResourceContainerImpl.h with 100% similarity]
service/resource-container/src/SoftSensorResource.cpp [moved from service/resource-encapsulation/src/resourceContainer/src/SoftSensorResource.cpp with 100% similarity]
service/resource-container/src/org_iotivity_resourcecontainer_bundle_api_BaseActivator.h [moved from service/resource-encapsulation/src/resourceContainer/include/org_iotivity_resourcecontainer_bundle_api_BaseActivator.h with 100% similarity]
service/resource-container/unittests/ResourceContainerInvalidConfig.xml [moved from service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerInvalidConfig.xml with 100% similarity]
service/resource-container/unittests/ResourceContainerTest.cpp [moved from service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTest.cpp with 100% similarity]
service/resource-container/unittests/ResourceContainerTestConfig.xml [moved from service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestConfig.xml with 100% similarity]
service/resource-container/unittests/ResourceContainerTestSimulator.h [moved from service/resource-encapsulation/src/resourceContainer/unittests/ResourceContainerTestSimulator.h with 100% similarity]
service/resource-container/unittests/SConscript [moved from service/resource-encapsulation/src/resourceContainer/unittests/SConscript with 66% similarity]
service/resource-container/unittests/TestBundle/include/TestBundleActivator.h [moved from service/resource-encapsulation/src/resourceContainer/unittests/TestBundle/include/TestBundleActivator.h with 100% similarity]
service/resource-container/unittests/TestBundle/src/TestBundleActivator.cpp [moved from service/resource-encapsulation/src/resourceContainer/unittests/TestBundle/src/TestBundleActivator.cpp with 100% similarity]
service/resource-container/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar [moved from service/resource-encapsulation/src/resourceContainer/unittests/TestBundleJava/hue-0.1-jar-with-dependencies.jar with 100% similarity]
service/resource-encapsulation/SConscript
tools/tizen/iotivity.spec

index 54c4acd..f5a4993 100644 (file)
@@ -36,6 +36,10 @@ if target_os not in ['arduino','darwin']:
     # Build resource-encapsulation project
     SConscript('resource-encapsulation/SConscript')
 
+    # Build resource-container project
+    if target_os not in ['android', 'tizen']:
+        SConscript('resource-container/SConscript')
+
     # Build simulator module
     if target_os in ['linux'] and env.get('SIMULATOR', False):
         SConscript('simulator/SConscript')
@@ -46,128 +46,131 @@ target_os = env.get('TARGET_OS')
 ######################################################################
 
 if int(containerJavaSupport):
-       try:
-               print 'Java Home: ', os.environ['JAVA_HOME']
-               print 'Java Lib: ', os.environ['JAVA_LIB']
-               resource_container_env.Append(CPPDEFINES={'JAVA_SUPPORT':1})
-       except KeyError:
-               print '''
-       *********************************** Error *************************************
-       * Building resource container without Java support. JAVA_HOME or JAVA_LIB are not set properly
-       * Please configure JAVA_HOME to point to your Java 7 JDK and
-       * JAVA_LIB to your folder containing libjvm
-       * Example: export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-i386
-       *          export JAVA_LIB=/usr/lib/jvm/java-7-openjdk-i386/jre/lib/i386/server
-       *******************************************************************************
-               '''
-               resource_container_env.Append(CPPDEFINES={'JAVA_SUPPORT':0})
+    try:
+        print 'Java Home: ', os.environ['JAVA_HOME']
+        print 'Java Lib: ', os.environ['JAVA_LIB']
+        resource_container_env.Append(CPPDEFINES={'JAVA_SUPPORT':1})
+    except KeyError:
+        print '''
+    *********************************** Error *************************************
+    * Building resource container without Java support. JAVA_HOME or JAVA_LIB are not set properly
+    * Please configure JAVA_HOME to point to your Java 7 JDK and
+    * JAVA_LIB to your folder containing libjvm
+    * Example: export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-i386
+    *          export JAVA_LIB=/usr/lib/jvm/java-7-openjdk-i386/jre/lib/i386/server
+    *******************************************************************************
+        '''
+        resource_container_env.Append(CPPDEFINES={'JAVA_SUPPORT':0})
 
 
 resource_container_env.AppendUnique(
-       CPPPATH = [
-               env.get('SRC_DIR')+'/extlibs',
-               '../../include',
-               'include',
-               'bundle-api/include',
-               'src'
-       ])
+    CPPPATH = [
+        env.get('SRC_DIR')+'/extlibs',
+        '../resource-encapsulation/include',
+        'include',
+        'bundle-api/include',
+        'src'
+    ])
 
 if int(containerJavaSupport):
-       try:
-               resource_container_env.AppendUnique(
-               CPPPATH = [
-                       os.environ['JAVA_HOME']+'/include',
-                       os.environ['JAVA_HOME']+'/include/linux'
-               ])
-       except KeyError:
-               print ''
+    try:
+        resource_container_env.AppendUnique(
+        CPPPATH = [
+            os.environ['JAVA_HOME']+'/include',
+            os.environ['JAVA_HOME']+'/include/linux'
+        ])
+    except KeyError:
+        print ''
 
 
 if target_os not in ['windows', 'winrt']:
-       resource_container_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall'])
-       if target_os != 'android':
-               resource_container_env.AppendUnique(CXXFLAGS = ['-pthread'])
+    resource_container_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall'])
+    if target_os != 'android':
+        resource_container_env.AppendUnique(CXXFLAGS = ['-pthread'])
 
 if target_os not in ['darwin', 'ios', 'windows', 'winrt']:
-       resource_container_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined'])
+    resource_container_env.AppendUnique(LINKFLAGS = ['-Wl,--no-undefined'])
 
 if target_os == 'android':
-       resource_container_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
-       resource_container_env.PrependUnique(LIBS = ['gnustl_shared', 'log'])
+    resource_container_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
+    resource_container_env.PrependUnique(LIBS = ['gnustl_shared', 'log'])
 
 try:
-       resource_container_env.AppendUnique(LIBPATH = [os.environ['JAVA_LIB']])
+    resource_container_env.AppendUnique(LIBPATH = [os.environ['JAVA_LIB']])
 except KeyError:
-       print ''
+    print ''
 
 
 resource_container_env.PrependUnique(LIBS = ['rcs_client', 'rcs_server', 'rcs_common', 'oc','octbstack', 'oc_logger', 'connectivity_abstraction'])
 resource_container_env.AppendUnique(LIBS = ['dl', 'boost_system', 'boost_date_time', 'boost_thread'])
 
 if int(containerJavaSupport):
-       try:
-               print 'Java Lib: ', os.environ['JAVA_LIB']
-               resource_container_env.AppendUnique(LIBS = ['jvm'])
-       except KeyError:
-               print ''
+    try:
+        print 'Java Lib: ', os.environ['JAVA_LIB']
+        resource_container_env.AppendUnique(LIBS = ['jvm'])
+    except KeyError:
+        print ''
 
 ######################################################################
 # Source files and Targets
 ######################################################################
 res_container_src = ['src/BaseActivator.cpp','src/BundleActivator.cpp','src/RCSBundleInfo.cpp',
-       'src/BundleInfoInternal.cpp', 'src/BundleResource.cpp', 'src/Configuration.cpp', 'src/JavaBundleResource.cpp', 'src/ProtocolBridgeResource.cpp',
-       'src/ProtocolBridgeConnector.cpp', 'src/RCSResourceContainer.cpp', 'src/ResourceContainerBundleAPI.cpp', 'src/ResourceContainerImpl.cpp',
-       'src/SoftSensorResource.cpp', 'src/DiscoverResourceUnit.cpp', 'src/RemoteResourceUnit.cpp',
-       ]
+    'src/BundleInfoInternal.cpp', 'src/BundleResource.cpp', 'src/Configuration.cpp', 'src/JavaBundleResource.cpp', 'src/ProtocolBridgeResource.cpp',
+    'src/ProtocolBridgeConnector.cpp', 'src/RCSResourceContainer.cpp', 'src/ResourceContainerBundleAPI.cpp', 'src/ResourceContainerImpl.cpp',
+    'src/SoftSensorResource.cpp', 'src/DiscoverResourceUnit.cpp', 'src/RemoteResourceUnit.cpp',
+    ]
 
 res_container_static = resource_container_env.StaticLibrary('rcs_container', res_container_src)
 res_container_shared = resource_container_env.SharedLibrary('rcs_container', res_container_src)
 
 resource_container_env.InstallTarget([res_container_static,res_container_shared], 'libResContainer')
 
+resource_container_env.UserInstallTargetHeader('include/RCSBundleInfo.h', 'service/resource-container', 'RCSBundleInfo.h')
+resource_container_env.UserInstallTargetHeader('include/RCSResourceContainer.h', 'service/resource-container', 'RCSResourceContainer.h')
+
 ######################################################################
 # build discomfort index sensor sample bundle
 ######################################################################
 if target_os in ['linux', 'tizen', 'android']:
-       DI_sensor_bundle_env = resource_container_env.Clone()
-       DI_sensor_bundle_env.AppendUnique(CCFLAGS = ['-fPIC'])
+    DI_sensor_bundle_env = resource_container_env.Clone()
+    DI_sensor_bundle_env.AppendUnique(CCFLAGS = ['-fPIC'])
 
-       DI_SENSOR_BUNDLE_DIR = 'examples/DiscomfortIndexSensorBundle/'
-       DI_sensor_bundle_env.AppendUnique(CPPPATH = [ DI_SENSOR_BUNDLE_DIR + 'include' ])
+    DI_SENSOR_BUNDLE_DIR = 'examples/DiscomfortIndexSensorBundle/'
+    DI_sensor_bundle_env.AppendUnique(CPPPATH = [ DI_SENSOR_BUNDLE_DIR + 'include' ])
 
-       DI_sensor_bundle_env.PrependUnique(LIBS = ['rcs_container'])
+    DI_sensor_bundle_env.PrependUnique(LIBS = ['rcs_container'])
 
-       DI_sensor_bundle_src = [ Glob(DI_SENSOR_BUNDLE_DIR + 'src/*.cpp')]
+    DI_sensor_bundle_src = [ Glob(DI_SENSOR_BUNDLE_DIR + 'src/*.cpp')]
 
-       DISensorBundle = DI_sensor_bundle_env.SharedLibrary('DISensorBundle', DI_sensor_bundle_src)
-       DI_sensor_bundle_env.InstallTarget(DISensorBundle, 'libDISensorBundle')
+    DISensorBundle = DI_sensor_bundle_env.SharedLibrary('DISensorBundle', DI_sensor_bundle_src)
+    DI_sensor_bundle_env.InstallTarget(DISensorBundle, 'libDISensorBundle')
 
-       if target_os == 'linux' :
-               SConscript(DI_SENSOR_BUNDLE_DIR + 'src/inputSensors/SConscript')
-               Command("THSensorApp", DI_SENSOR_BUNDLE_DIR + "src/inputSensors/THSensorApp/THSensorApp", Copy("$TARGET", "$SOURCE"))
-               Command("THSensorApp1", DI_SENSOR_BUNDLE_DIR + "src/inputSensors/THSensorApp1/THSensorApp1", Copy("$TARGET", "$SOURCE"))
+    if target_os == 'linux' :
+        SConscript(DI_SENSOR_BUNDLE_DIR + 'src/inputSensors/SConscript')
+        Command("THSensorApp", DI_SENSOR_BUNDLE_DIR + "src/inputSensors/THSensorApp/THSensorApp", Copy("$TARGET", "$SOURCE"))
+        Command("THSensorApp1", DI_SENSOR_BUNDLE_DIR + "src/inputSensors/THSensorApp1/THSensorApp1", Copy("$TARGET", "$SOURCE"))
 
 ######################################################################
 # build BMI sensor sample bundle
 ######################################################################
 if target_os in ['linux', 'tizen', 'android']:
-       BMI_sensor_bundle_env = resource_container_env.Clone()
-       BMI_sensor_bundle_env.AppendUnique(CCFLAGS = ['-fPIC'])
+    BMI_sensor_bundle_env = resource_container_env.Clone()
+    BMI_sensor_bundle_env.AppendUnique(CCFLAGS = ['-fPIC'])
 
-       BMI_SENSOR_BUNDLE_DIR = 'examples/BMISensorBundle/'
-       BMI_sensor_bundle_env.AppendUnique(CPPPATH = [ BMI_SENSOR_BUNDLE_DIR + 'include' ])
+    BMI_SENSOR_BUNDLE_DIR = 'examples/BMISensorBundle/'
+    BMI_sensor_bundle_env.AppendUnique(CPPPATH = [ BMI_SENSOR_BUNDLE_DIR + 'include' ])
 
-       BMI_sensor_bundle_env.PrependUnique(LIBS = ['rcs_container'])
+    BMI_sensor_bundle_env.PrependUnique(LIBS = ['rcs_container'])
 
-       BMI_sensor_bundle_src = [ Glob(BMI_SENSOR_BUNDLE_DIR + 'src/*.cpp')]
+    BMI_sensor_bundle_src = [ Glob(BMI_SENSOR_BUNDLE_DIR + 'src/*.cpp')]
 
-       BMISensorBundle = BMI_sensor_bundle_env.SharedLibrary('BMISensorBundle', BMI_sensor_bundle_src)
-       BMI_sensor_bundle_env.InstallTarget(BMISensorBundle, 'libBMISensorBundle')
+    BMISensorBundle = BMI_sensor_bundle_env.SharedLibrary('BMISensorBundle', BMI_sensor_bundle_src)
+    BMI_sensor_bundle_env.InstallTarget(BMISensorBundle, 'libBMISensorBundle')
 
-       if target_os == 'linux' :
-               SConscript(BMI_SENSOR_BUNDLE_DIR + 'src/inputSensors/SConscript')
-               Command("HeightSensorApp", BMI_SENSOR_BUNDLE_DIR + "src/inputSensors/HeightSensorApp/HeightSensorApp", Copy("$TARGET", "$SOURCE"))
-               Command("WeightSensorApp", BMI_SENSOR_BUNDLE_DIR + "src/inputSensors/WeightSensorApp/WeightSensorApp", Copy("$TARGET", "$SOURCE"))
+    if target_os == 'linux' :
+        SConscript(BMI_SENSOR_BUNDLE_DIR + 'src/inputSensors/SConscript')
+        Command("HeightSensorApp", BMI_SENSOR_BUNDLE_DIR + "src/inputSensors/HeightSensorApp/HeightSensorApp", Copy("$TARGET", "$SOURCE"))
+        Command("WeightSensorApp", BMI_SENSOR_BUNDLE_DIR + "src/inputSensors/WeightSensorApp/WeightSensorApp", Copy("$TARGET", "$SOURCE"))
 
 ######################################################################
 # build hue sample bundle
@@ -175,39 +178,39 @@ if target_os in ['linux', 'tizen', 'android']:
 
 conf2 = Configure(lib_env)
 if not conf2.CheckLib('curl'):
-       print '''X
+    print '''X
 *********************************** Error *************************************
 * Cannot build hue sample. Please install libcurl.
 * Example (Ubuntu):
-*      sudo apt-get install libcurl4-openssl-dev
-*      sudo ldconfig
+*   sudo apt-get install libcurl4-openssl-dev
+*   sudo ldconfig
 * Hint: check with pkg-config --libs libcurl and clear scons cache.
 * Skipping hue sample build.
 *******************************************************************************
-       '''
+    '''
 else:
-       hue_resource_bundle_env = resource_container_env.Clone()
-       hue_resource_bundle_env.AppendUnique(CCFLAGS = ['-fPIC'])
+    hue_resource_bundle_env = resource_container_env.Clone()
+    hue_resource_bundle_env.AppendUnique(CCFLAGS = ['-fPIC'])
 
-       HUE_RESOURCE_BUNDLE_DIR = 'examples/HueSampleBundle/'
-       hue_resource_bundle_env.AppendUnique(CPPPATH = [
-                       HUE_RESOURCE_BUNDLE_DIR + 'include',
-                       'include/'
-                       ])
+    HUE_RESOURCE_BUNDLE_DIR = 'examples/HueSampleBundle/'
+    hue_resource_bundle_env.AppendUnique(CPPPATH = [
+            HUE_RESOURCE_BUNDLE_DIR + 'include',
+            'include/'
+            ])
 
-       hue_resource_bundle_env.PrependUnique(LIBS = ['curl', 'rcs_container'])
+    hue_resource_bundle_env.PrependUnique(LIBS = ['curl', 'rcs_container'])
 
-       hue_resource_bundle_src = [ Glob(HUE_RESOURCE_BUNDLE_DIR + 'src/*.cpp')]
+    hue_resource_bundle_src = [ Glob(HUE_RESOURCE_BUNDLE_DIR + 'src/*.cpp')]
 
-       HueBundle = hue_resource_bundle_env.SharedLibrary('HueBundle', hue_resource_bundle_src)
-       hue_resource_bundle_env.InstallTarget(HueBundle, 'libHueBundle')
+    HueBundle = hue_resource_bundle_env.SharedLibrary('HueBundle', hue_resource_bundle_src)
+    hue_resource_bundle_env.InstallTarget(HueBundle, 'libHueBundle')
 lib_env = conf2.Finish()
 
 ######################################################################
 # build resource container unit tests
 ######################################################################
 if target_os == 'linux':
-       SConscript('unittests/SConscript')
+    SConscript('unittests/SConscript')
 
 ######################################################################
 # Build Container Sample
@@ -235,6 +238,4 @@ containersample_env.AppendUnique(LIBS = ['rcs_container'])
 containersampleclient_src =  ['examples/ContainerSampleClient.cpp']
 containersampleclientapp = containersample_env.Program('ContainerSampleClient',containersampleclient_src)
 Alias("containersampleclient", containersampleclientapp)
-env.AppendTarget('containersampleclient')
-
-
+env.AppendTarget('containersampleclient')
\ No newline at end of file
@@ -150,7 +150,7 @@ int main()
     bundleParams["libraryPath"] = ".";
     std::string activator = "org.iotivity.bundle.hue.HueBundleActivator";
     container->addBundle("oic.bundle.hueJavaSample2", "/hueJava",
-                 "../../../../../../../../service/resource-encapsulation/src/resourceContainer/" \
+                 "../../../../../../service/resource-container/" \
                  "examples/HueJavaSampleBundle/hue/target/hue-0.1-jar-with-dependencies.jar",
                  activator,
                  bundleParams);
             </resourceInfo>       
         </resources>
     </bundle>
-
+    
+    <!--
     <bundle>
         <id>oic.bundle.hueJavaSample</id>       
-        <path>../../../../../../../../service/resource-encapsulation/src/resourceContainer/examples/HueJavaSampleBundle/hue/target/hue-0.1-jar-with-dependencies.jar</path>
+        <path>../../../../../../service/resource-container/examples/HueJavaSampleBundle/hue/target/hue-0.1-jar-with-dependencies.jar</path>
         <libraryPath>.</libraryPath>
         <uri>/hueJava</uri>
         <activator>org.iotivity.bundle.hue.HueBundleActivator</activator>
             </resourceInfo>       
         </resources>
     </bundle>
-
+    -->
+    
 </container>
\ No newline at end of file
@@ -486,7 +486,7 @@ namespace OIC
                 bundleInfo->setActivatorName(activator);
                 if (params.find("libraryPath") != params.end())
                 {
-                    string activatorName = params["activator"]; // modify activator for Java bundle
+                    string activatorName = activator; // modify activator for Java bundle
                     std::replace(activatorName.begin(), activatorName.end(), '.', '/');
                     ((BundleInfoInternal *) bundleInfo)->setActivatorName(activatorName);
                     ((BundleInfoInternal *)bundleInfo)->setLibraryPath(params[BUNDLE_LIBRARY_PATH]);
@@ -37,13 +37,13 @@ def filtered_glob(env, pattern, omit=[],
 env.AddMethod(filtered_glob, "FilteredGlob");
 
 if env.get('RELEASE'):
-       env.AppendUnique(CCFLAGS = ['-Os'])
-       env.AppendUnique(CPPDEFINES = ['NDEBUG'])
+    env.AppendUnique(CCFLAGS = ['-Os'])
+    env.AppendUnique(CPPDEFINES = ['NDEBUG'])
 else:
-       env.AppendUnique(CCFLAGS = ['-g'])
+    env.AppendUnique(CCFLAGS = ['-g'])
 
 if env.get('LOGGING'):
-       env.AppendUnique(CPPDEFINES = ['TB_LOG'])
+    env.AppendUnique(CPPDEFINES = ['TB_LOG'])
 
 
 
@@ -55,21 +55,21 @@ SConscript(env.get('SRC_DIR') + '/service/third_party_libs.scons', 'lib_env')
 container_gtest_env = lib_env.Clone()
 
 if int(containerJavaSupport):
-       try:
-               print 'Java Home: ', os.environ['JAVA_HOME']
-               print 'Java Lib: ', os.environ['JAVA_LIB']
-               container_gtest_env.Append(CPPDEFINES={'JAVA_SUPPORT_TEST':1})
-       except KeyError:
-               print '''
-       *********************************** Error *************************************
-       * Building resource container without Java support. JAVA_HOME or JAVA_LIB are not set properly
-       * Please configure JAVA_HOME to point to your Java 7 JDK and
-       * JAVA_LIB to your folder containing libjvm
-       * Example: export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-i386
-       *          export JAVA_LIB=/usr/lib/jvm/java-7-openjdk-i386/jre/lib/i386/server/
-       *******************************************************************************
-               '''
-               container_gtest_env.Append(CPPDEFINES={'JAVA_SUPPORT_TEST':0})
+    try:
+        print 'Java Home: ', os.environ['JAVA_HOME']
+        print 'Java Lib: ', os.environ['JAVA_LIB']
+        container_gtest_env.Append(CPPDEFINES={'JAVA_SUPPORT_TEST':1})
+    except KeyError:
+        print '''
+    *********************************** Error *************************************
+    * Building resource container without Java support. JAVA_HOME or JAVA_LIB are not set properly
+    * Please configure JAVA_HOME to point to your Java 7 JDK and
+    * JAVA_LIB to your folder containing libjvm
+    * Example: export JAVA_HOME=/usr/lib/jvm/java-7-openjdk-i386
+    *          export JAVA_LIB=/usr/lib/jvm/java-7-openjdk-i386/jre/lib/i386/server/
+    *******************************************************************************
+        '''
+        container_gtest_env.Append(CPPDEFINES={'JAVA_SUPPORT_TEST':0})
 
 
 target_os = env.get('TARGET_OS')
@@ -87,30 +87,30 @@ gtest = File(gtest_dir + '/lib/.libs/libgtest.a')
 gtest_main = File(gtest_dir + '/lib/.libs/libgtest_main.a')
 
 container_gtest_env.AppendUnique(
-       CPPPATH = [
-               env.get('SRC_DIR')+'/extlibs',
-               '../include',
-               '../../../include',
-               '../include/internal',
-               '../../common/utils/include',
-               '../bundle-api/include'
-       ])
+    CPPPATH = [
+        env.get('SRC_DIR')+'/extlibs',
+        '../include',
+        '../../resource-encapsulation/include',
+        '../../resource-encapsulation/src/common/utils/include',
+        '../bundle-api/include',
+        '../src'
+    ])
 
 if int(containerJavaSupport):
-       try:
-               container_gtest_env.AppendUnique(
-               CPPPATH = [
-                       os.environ['JAVA_HOME']+'/include',
-                       os.environ['JAVA_HOME']+'/include/linux'
-               ])
-       except KeyError:
-               print ''
+    try:
+        container_gtest_env.AppendUnique(
+        CPPPATH = [
+            os.environ['JAVA_HOME']+'/include',
+            os.environ['JAVA_HOME']+'/include/linux'
+        ])
+    except KeyError:
+        print ''
 
 if target_os not in ['windows', 'winrt']:
-       container_gtest_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall'])
-       if target_os != 'android':
-               container_gtest_env.AppendUnique(CXXFLAGS = ['-pthread'])
-               container_gtest_env.AppendUnique(LIBS = ['pthread'])
+    container_gtest_env.AppendUnique(CXXFLAGS = ['-std=c++0x', '-Wall'])
+    if target_os != 'android':
+        container_gtest_env.AppendUnique(CXXFLAGS = ['-pthread'])
+        container_gtest_env.AppendUnique(LIBS = ['pthread'])
 
 if target_os == 'android':
     container_gtest_env.AppendUnique(CXXFLAGS = ['-frtti', '-fexceptions'])
@@ -120,10 +120,10 @@ container_gtest_env.PrependUnique(CPPPATH = [env.get('SRC_DIR')+'/extlibs/hippom
                              gtest_dir + '/include'])
 
 if int(containerJavaSupport):
-       try:
-               container_gtest_env.AppendUnique(LIBPATH = [os.environ['JAVA_LIB']])
-       except KeyError:
-               print ''
+    try:
+        container_gtest_env.AppendUnique(LIBPATH = [os.environ['JAVA_LIB']])
+    except KeyError:
+        print ''
 
 container_gtest_env.AppendUnique(CCFLAGS = ['-Wnoexcept'])
 
@@ -132,11 +132,11 @@ container_gtest_env.PrependUnique(LIBS = ['rcs_container', 'rcs_client', 'rcs_se
 container_gtest_env.AppendUnique(LIBS = ['dl'])
 
 if int(containerJavaSupport):
-       try:
-               print 'Java Lib: ', os.environ['JAVA_LIB']
-               container_gtest_env.AppendUnique(LIBS = ['jvm'])
-       except KeyError:
-               print ''
+    try:
+        print 'Java Lib: ', os.environ['JAVA_LIB']
+        container_gtest_env.AppendUnique(LIBS = ['jvm'])
+    except KeyError:
+        print ''
 
 ######################################################################
 # build test bundle
@@ -149,9 +149,8 @@ if target_os not in ['darwin', 'ios', 'windows', 'winrt']:
 
 TEST_BUNDLE_DIR = 'TestBundle/'
 test_bundle_env.AppendUnique(CPPPATH = [
-               TEST_BUNDLE_DIR + 'include',
-               '../include/'
-               ])
+        TEST_BUNDLE_DIR + 'include'
+        ])
 
 test_bundle_src = [ Glob(TEST_BUNDLE_DIR + 'src/*.cpp'), Glob('src/*.cpp')]
 
@@ -177,9 +176,9 @@ Command("./TestBundleJava/hue-0.1-jar-with-dependencies.jar","./TestBundleJava/h
 Ignore("./TestBundleJava/hue-0.1-jar-with-dependencies.jar", "./TestBundleJava/hue-0.1-jar-with-dependencies.jar")
 
 if env.get('TEST') == '1':
-       target_os = env.get('TARGET_OS')
-       if target_os == 'linux':
-               from tools.scons.RunTest import *
-               run_test(container_gtest_env,
-                       '',
-                       'service/resource-encapsulation/src/resourceContainer/unittests/container_test')
\ No newline at end of file
+    target_os = env.get('TARGET_OS')
+    if target_os == 'linux':
+        from tools.scons.RunTest import *
+        run_test(container_gtest_env,
+            '',
+            'service/resource-container/unittests/container_test')
\ No newline at end of file
index 4a21ac5..b600739 100644 (file)
@@ -26,7 +26,6 @@ Import('env')
 
 SConscript('src/common/SConscript')
 SConscript('src/serverBuilder/SConscript')
-SConscript('src/resourceContainer/SConscript')
 
 ######################################################################
 #building Resource client, resourceBroker and resourceCache
@@ -90,7 +89,7 @@ client_src = [
         RESOURCECLIENT_DIR + 'RCSDiscoveryManager.cpp',
         RESOURCECLIENT_DIR + 'RCSDiscoveryManagerImpl.cpp',
         RESOURCECLIENT_DIR + 'RCSRemoteResourceObject.cpp'
-               ]
+        ]
 ResourceClientsdk_static = resourceClient_env.StaticLibrary('rcs_client', client_src)
 ResourceClientsdk_shared = resourceClient_env.SharedLibrary('rcs_client', client_src)
 
@@ -101,10 +100,8 @@ resourceClient_env.UserInstallTargetHeader('include/RCSDiscoveryManager.h', 'ser
 resourceClient_env.UserInstallTargetHeader('include/RCSRemoteResourceObject.h', 'service/resource-encapsulation', 'RCSRemoteResourceObject.h')
 resourceClient_env.UserInstallTargetHeader('include/RCSResourceAttributes.h', 'service/resource-encapsulation', 'RCSResourceAttributes.h')
 resourceClient_env.UserInstallTargetHeader('include/RCSResourceObject.h', 'service/resource-encapsulation', 'RCSResourceObject.h')
-resourceClient_env.UserInstallTargetHeader('include/RCSBundleInfo.h', 'service/resource-encapsulation', 'RCSBundleInfo.h')
 resourceClient_env.UserInstallTargetHeader('include/RCSException.h', 'service/resource-encapsulation', 'RCSException.h')
 resourceClient_env.UserInstallTargetHeader('include/RCSRequest.h', 'service/resource-encapsulation', 'RCSRequest.h')
-resourceClient_env.UserInstallTargetHeader('include/RCSResourceContainer.h', 'service/resource-encapsulation', 'RCSResourceContainer.h')
 resourceClient_env.UserInstallTargetHeader('include/RCSResponse.h', 'service/resource-encapsulation', 'RCSResponse.h')
 
 ######################################################################
@@ -122,4 +119,4 @@ if target_os == 'linux':
     SConscript('src/resourceBroker/unittest/SConscript')
 
 if target_os == 'android':
-       SConscript('android/SConscript')
+    SConscript('android/SConscript')
\ No newline at end of file
index c8df3ec..9b12b56 100755 (executable)
@@ -149,14 +149,14 @@ cp service/things-manager/sdk/inc/*.h %{buildroot}%{_includedir}
 %files service
 %manifest %{name}.manifest
 %defattr(-,root,root,-)
-%{_libdir}/libBMISensorBundle.so
-%{_libdir}/libDISensorBundle.so
+#%{_libdir}/libBMISensorBundle.so
+#%{_libdir}/libDISensorBundle.so
 %{_libdir}/libresource_hosting.so
 %{_libdir}/libTGMSDKLibrary.so
-%{_libdir}/libHueBundle.so
+#%{_libdir}/libHueBundle.so
 %{_libdir}/librcs_client.so
 %{_libdir}/librcs_common.so
-%{_libdir}/librcs_container.so
+#%{_libdir}/librcs_container.so
 %{_libdir}/librcs_server.so
 
 %files test