Commit f39f2b5d authored by Kishen Maloor's avatar Kishen Maloor

Renamed ...-Constrained to ...-Lite in sources

Change-Id: Iae97996f8582a11e25a3385a11069f7435b735fa
Signed-off-by: Kishen Maloor's avatarKishen Maloor <kishen.maloor@intel.com>
parent 7c9de6b9
...@@ -16,18 +16,12 @@ port/linux/client_multithread_linux ...@@ -16,18 +16,12 @@ port/linux/client_multithread_linux
port/linux/cloud_linux port/linux/cloud_linux
port/linux/cloud_tests port/linux/cloud_tests
port/linux/cloud_linux_creds/ port/linux/cloud_linux_creds/
port/linux/libiotivity-constrained-client.* port/linux/libiotivity-lite-client.*
port/linux/libiotivity-constrained-server.* port/linux/libiotivity-lite-server.*
port/linux/libiotivity-constrained-client-server.* port/linux/libiotivity-lite-client-server.*
port/linux/iotivity-constrained-cloud.pc port/linux/iotivity-lite-server.pc
port/linux/iotivity-constrained-cloud.a port/linux/iotivity-lite-client.pc
port/linux/iotivity-constrained-cloud.so port/linux/iotivity-lite-client-server.pc
port/linux/iotivity-constrained-rd-client.pc
port/linux/iotivity-constrained-rd-client.a
port/linux/iotivity-constrained-rd-client.so
port/linux/iotivity-constrained-server.pc
port/linux/iotivity-constrained-client.pc
port/linux/iotivity-constrained-client-server.pc
port/linux/tests/* port/linux/tests/*
port/linux/obj/ port/linux/obj/
port/linux/onboarding_tool_creds/ port/linux/onboarding_tool_creds/
......
...@@ -150,7 +150,7 @@ Setup source tree ...@@ -150,7 +150,7 @@ Setup source tree
Grab source and dependencies using: Grab source and dependencies using:
``git clone --recursive https://github.com/iotivity/iotivity-constrained.git`` ``git clone --recursive https://github.com/iotivity/iotivity-lite.git``
Building sample applications on Linux Building sample applications on Linux
------------------------------------- -------------------------------------
......
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
****************************************************************************/ ****************************************************************************/
/** /**
@brief Resource Directory API of IoTivity-constrained for client. @brief Resource Directory API of IoTivity-Lite for RD clients.
@file @file
*/ */
......
...@@ -15,12 +15,12 @@ ...@@ -15,12 +15,12 @@
*/ */
/** /**
@brief Main API of IoTivity-constrained for client and server. @brief Main API of IoTivity-Lite for client and server.
@file @file
*/ */
/** /**
\mainpage IoTivity-constrained API \mainpage IoTivity-Lite API
The file \link oc_api.h\endlink is the main entry for all The file \link oc_api.h\endlink is the main entry for all
server and client related OCF functions. server and client related OCF functions.
......
...@@ -187,8 +187,8 @@ ifeq ($(TCP),1) ...@@ -187,8 +187,8 @@ ifeq ($(TCP),1)
CFLAGS += -DOC_TCP CFLAGS += -DOC_TCP
endif endif
CONSTRAINED_LIBS = libiotivity-constrained-server.a libiotivity-constrained-client.a \ CONSTRAINED_LIBS = libiotivity-lite-server.a libiotivity-lite-client.a \
libiotivity-constrained-client-server.a libiotivity-lite-client-server.a
all: $(CONSTRAINED_LIBS) $(SAMPLES) all: $(CONSTRAINED_LIBS) $(SAMPLES)
...@@ -216,68 +216,68 @@ ${OBJDIR}/cloud/%.o: %.c ...@@ -216,68 +216,68 @@ ${OBJDIR}/cloud/%.o: %.c
@mkdir -p ${@D} @mkdir -p ${@D}
${CC} -c -o $@ $< ${CFLAGS} ${CFLAGS_CLOUD} ${CC} -c -o $@ $< ${CFLAGS} ${CFLAGS_CLOUD}
libiotivity-constrained-server.a: $(OBJ_COMMON) $(OBJ_SERVER) libiotivity-lite-server.a: $(OBJ_COMMON) $(OBJ_SERVER)
$(AR) -rcs $@ $(OBJ_COMMON) $(OBJ_SERVER) $(AR) -rcs $@ $(OBJ_COMMON) $(OBJ_SERVER)
libiotivity-constrained-client.a: $(OBJ_COMMON) $(OBJ_CLIENT) libiotivity-lite-client.a: $(OBJ_COMMON) $(OBJ_CLIENT)
$(AR) -rcs $@ $(OBJ_COMMON) $(OBJ_CLIENT) $(AR) -rcs $@ $(OBJ_COMMON) $(OBJ_CLIENT)
libiotivity-constrained-client-server.a: $(OBJ_COMMON) $(OBJ_CLIENT_SERVER) $(OBJ_CLOUD) libiotivity-lite-client-server.a: $(OBJ_COMMON) $(OBJ_CLIENT_SERVER) $(OBJ_CLOUD)
$(AR) -rcs $@ $(OBJ_COMMON) $(OBJ_CLIENT_SERVER) $(OBJ_CLOUD) $(AR) -rcs $@ $(OBJ_COMMON) $(OBJ_CLIENT_SERVER) $(OBJ_CLOUD)
server: libiotivity-constrained-server.a server: libiotivity-lite-server.a
${CC} -o $@ ../../apps/server_linux.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS} ${CC} -o $@ ../../apps/server_linux.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
client: libiotivity-constrained-client.a client: libiotivity-lite-client.a
${CC} -o $@ ../../apps/client_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS} ${CC} -o $@ ../../apps/client_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
smart_lock: libiotivity-constrained-client.a smart_lock: libiotivity-lite-client.a
${CC} -o $@ ../../apps/smart_lock_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS} ${CC} -o $@ ../../apps/smart_lock_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
temp_sensor: libiotivity-constrained-client.a temp_sensor: libiotivity-lite-client.a
${CC} -o $@ ../../apps/temp_sensor_client_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS} ${CC} -o $@ ../../apps/temp_sensor_client_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
simpleserver: libiotivity-constrained-server.a simpleserver: libiotivity-lite-server.a
${CC} -o $@ ../../apps/simpleserver.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS} ${CC} -o $@ ../../apps/simpleserver.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
simpleclient: libiotivity-constrained-client.a simpleclient: libiotivity-lite-client.a
${CC} -o $@ ../../apps/simpleclient.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS} ${CC} -o $@ ../../apps/simpleclient.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
client_collections_linux: libiotivity-constrained-client.a client_collections_linux: libiotivity-lite-client.a
${CC} -o $@ ../../apps/client_collections_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS} ${CC} -o $@ ../../apps/client_collections_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
server_collections_linux: libiotivity-constrained-server.a server_collections_linux: libiotivity-lite-server.a
${CC} -o $@ ../../apps/server_collections_linux.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS} ${CC} -o $@ ../../apps/server_collections_linux.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
client_block_linux: libiotivity-constrained-client.a client_block_linux: libiotivity-lite-client.a
${CC} -o $@ ../../apps/client_block_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS} ${CC} -o $@ ../../apps/client_block_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
server_block_linux: libiotivity-constrained-server.a server_block_linux: libiotivity-lite-server.a
${CC} -o $@ ../../apps/server_block_linux.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS} ${CC} -o $@ ../../apps/server_block_linux.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
smart_home_server_linux: libiotivity-constrained-server.a smart_home_server_linux: libiotivity-lite-server.a
${CC} -o $@ ../../apps/smart_home_server_linux.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS} ${CC} -o $@ ../../apps/smart_home_server_linux.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
multi_device_server: libiotivity-constrained-server.a multi_device_server: libiotivity-lite-server.a
${CC} -o $@ ../../apps/multi_device_server_linux.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS} ${CC} -o $@ ../../apps/multi_device_server_linux.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
multi_device_client: libiotivity-constrained-client.a multi_device_client: libiotivity-lite-client.a
${CC} -o $@ ../../apps/multi_device_client_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS} ${CC} -o $@ ../../apps/multi_device_client_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
cloud_linux: libiotivity-constrained-client-server.a $(ROOT_DIR)/apps/cloud_linux.c cloud_linux: libiotivity-lite-client-server.a $(ROOT_DIR)/apps/cloud_linux.c
${CC} -o $@ ../../apps/cloud_linux.c libiotivity-constrained-client-server.a -DOC_CLIENT -DOC_SERVER ${CFLAGS} ${CFLAGS_CLOUD} ${LIBS} ${CC} -o $@ ../../apps/cloud_linux.c libiotivity-lite-client-server.a -DOC_CLIENT -DOC_SERVER ${CFLAGS} ${CFLAGS_CLOUD} ${LIBS}
cloud_tests: libiotivity-constrained-client-server.a $(ROOT_DIR)/apps/cloud_certification_tests.c cloud_tests: libiotivity-lite-client-server.a $(ROOT_DIR)/apps/cloud_certification_tests.c
${CC} -o $@ ../../apps/cloud_certification_tests.c libiotivity-constrained-client-server.a -DOC_CLIENT -DOC_SERVER ${CFLAGS} ${CFLAGS_CLOUD} ${LIBS} ${CC} -o $@ ../../apps/cloud_certification_tests.c libiotivity-lite-client-server.a -DOC_CLIENT -DOC_SERVER ${CFLAGS} ${CFLAGS_CLOUD} ${LIBS}
${OBT}: libiotivity-constrained-client.a ${OBT}: libiotivity-lite-client.a
${CC} -o $@ ../../onboarding_tool/obtmain.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS} ${CC} -o $@ ../../onboarding_tool/obtmain.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
server_multithread_linux: libiotivity-constrained-server.a server_multithread_linux: libiotivity-lite-server.a
${CC} -o $@ ../../apps/server_multithread_linux.c libiotivity-constrained-server.a -DOC_SERVER ${CFLAGS} ${LIBS} ${CC} -o $@ ../../apps/server_multithread_linux.c libiotivity-lite-server.a -DOC_SERVER ${CFLAGS} ${LIBS}
client_multithread_linux: libiotivity-constrained-client.a client_multithread_linux: libiotivity-lite-client.a
${CC} -o $@ ../../apps/client_multithread_linux.c libiotivity-constrained-client.a -DOC_CLIENT ${CFLAGS} ${LIBS} ${CC} -o $@ ../../apps/client_multithread_linux.c libiotivity-lite-client.a -DOC_CLIENT ${CFLAGS} ${LIBS}
ifneq ($(SECURE),0) ifneq ($(SECURE),0)
MBEDTLS_PATCHES ?= $(sort $(wildcard ../../patches/*.patch)) MBEDTLS_PATCHES ?= $(sort $(wildcard ../../patches/*.patch))
......
This diff is collapsed.
# Copyright (c) 2019 Jozef Kralik
# Copyright (c) 2018 Samsung Electronics All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: libiotivity-constrained-cloud
Description: Iotivity constrained resource directory client library
Version: @version@
Libs.private: -lm -pthread
Cflags: -I${includedir}/iotivity-constrained @extra_cflags@
Libs: -L${libdir} -liotivity-constrained-cloud
# Copyright (c) 2019 Jozef Kralik
# Copyright (c) 2018 Samsung Electronics All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
includedir=@includedir@
Name: libiotivity-constrained-rd-client
Description: Iotivity constrained resource directory client library
Version: @version@
Libs.private: -lm -pthread
Cflags: -I${includedir}/iotivity-constrained @extra_cflags@
Libs: -L${libdir} -liotivity-constrained-rd-client
...@@ -17,9 +17,9 @@ exec_prefix=@exec_prefix@ ...@@ -17,9 +17,9 @@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
Name: iotivity-constrained-client-server Name: iotivity-lite-client-server
Description: Iotivity constrained client and server library Description: Iotivity lite client and server library
Version: @version@ Version: @version@
Libs.private: -lm -pthread Libs.private: -lm -pthread
Cflags: -I${includedir}/iotivity-constrained -DOC_CLIENT -DOC_SERVER @extra_cflags@ Cflags: -I${includedir}/iotivity-lite -DOC_CLIENT -DOC_SERVER @extra_cflags@
Libs: -L${libdir} -liotivity-constrained-client-server Libs: -L${libdir} -liotivity-lite-client-server
...@@ -17,9 +17,9 @@ exec_prefix=@exec_prefix@ ...@@ -17,9 +17,9 @@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
Name: iotivity-constrained-client Name: iotivity-lite-client
Description: Iotivity constrained client library Description: Iotivity lite client library
Version: @version@ Version: @version@
Libs.private: -lm -pthread Libs.private: -lm -pthread
Cflags: -I${includedir}/iotivity-constrained -DOC_CLIENT @extra_cflags@ Cflags: -I${includedir}/iotivity-lite -DOC_CLIENT @extra_cflags@
Libs: -L${libdir} -liotivity-constrained-client Libs: -L${libdir} -liotivity-lite-client
...@@ -17,9 +17,9 @@ exec_prefix=@exec_prefix@ ...@@ -17,9 +17,9 @@ exec_prefix=@exec_prefix@
libdir=@libdir@ libdir=@libdir@
includedir=@includedir@ includedir=@includedir@
Name: iotivity-constrained-server Name: iotivity-lite-server
Description: Iotivity constrained server library Description: Iotivity lite server library
Version: @version@ Version: @version@
Libs.private: -lm -pthread Libs.private: -lm -pthread
Cflags: -I${includedir}/iotivity-constrained -DOC_SERVER @extra_cflags@ Cflags: -I${includedir}/iotivity-lite -DOC_SERVER @extra_cflags@
Libs: -L${libdir} -liotivity-constrained-server Libs: -L${libdir} -liotivity-lite-server
...@@ -68,7 +68,7 @@ def check_style(files, only_print): ...@@ -68,7 +68,7 @@ def check_style(files, only_print):
if __name__ == '__main__': if __name__ == '__main__':
parser = argparse.ArgumentParser(description= parser = argparse.ArgumentParser(description=
'Format the files in the repository according ' 'Format the files in the repository according '
'with iotivity constrained code style.') 'with iotivity-lite code style.')
parser.add_argument('-p', action='store_true', default=False, parser.add_argument('-p', action='store_true', default=False,
help='Only print the changes') help='Only print the changes')
......
...@@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 ...@@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
# title of most generated pages and in a few other places. # title of most generated pages and in a few other places.
# The default value is: My Project. # The default value is: My Project.
PROJECT_NAME = IoTivity-constrained PROJECT_NAME = IoTivity-Lite
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This # The PROJECT_NUMBER tag can be used to enter a project or revision number. This
# could be handy for archiving the generated documentation or if some version # could be handy for archiving the generated documentation or if some version
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment