From: Youngjae Shin Date: Mon, 31 Aug 2015 05:35:18 +0000 (+0900) Subject: Imported Upstream version 0.9.2 X-Git-Tag: upstream/0.9.2^0 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8c01dff2c5bc5496f7dc1632c498943ec6ecb015;p=platform%2Fupstream%2Fiotivity.git Imported Upstream version 0.9.2 --- diff --git a/.gitignore b/.gitignore index d0fbb21..c891e5c 100644 --- a/.gitignore +++ b/.gitignore @@ -48,18 +48,28 @@ resource/unittests/debug/ service/things-manager/build/linux/release service/things-manager/build/linux/debug service/things-manager/sdk/build/linux/ + # Ignore any object files *.o +*.os *.obj +# Ignore libraries +*.a +*.so # Ignore Eclipse workspace files *.settings/ +# Ignore proguard file generated by Eclipse +proguard-project.txt + # Ignore CTags default data tags + # Ignore dependencies folder, which should be generated dependencies/ +dep/ #ignore Klocwork stuff .kwlp/ @@ -86,14 +96,21 @@ extlibs/android/gradle/gradle-2.2.1 extlibs/android/ndk/android-ndk-r10d extlibs/android/sdk/android-sdk_r24.2 extlibs/boost/boost_1_58_0 +extlibs/tinycbor/tinycbor *.tgz *.zip extlibs/arduino/arduino-1.5.8 build_common/arduino/extlibs/arduino/arduino-1.5.8 +extlibs/tinydtls/dtls-client +extlibs/tinydtls/dtls-server # Ignore editor (e.g. Emacs) backup and autosave files *~ *#*# +*.orig # Ignore byte-compiled Python scripts *.pyc + +# Ignore Valgrind generated files. +*.memcheck diff --git a/NOTICE.md b/NOTICE.md index 6d243f8..027511d 100644 --- a/NOTICE.md +++ b/NOTICE.md @@ -40,20 +40,13 @@ license can be found at The original software is available from http://sourceforge.net/projects/boost/files/boost -JSON serialization is provided by the cereal package, -which is open source software, written by Philip Hazel, and copyright -by the University of Cambridge, England. The original software is -available from - ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/ - +CBOR serialization is provided by the tinycbor package, +which is open source software, written by Thiago Macieira and is +copyright by the Intel Corporation. The original software is available +from + https://github.com/01org/tinycbor/ JSON serialization is provided by the cjson package, which is open source software, written and copyright by Dave Gamble with an MIT license. The original software is available from http://sourceforge.net/projects/cjson/ -JSON serialization is provided by the rapidjson package, -which is open source software, written and copyright by Milo Yip -with an MIT license. The original software is available from - http://code.google.com/p/rapidjson/ - - diff --git a/Readme.scons.txt b/Readme.scons.txt index d433b3b..fd0b3a0 100644 --- a/Readme.scons.txt +++ b/Readme.scons.txt @@ -5,12 +5,12 @@ command in this directory) Install external libraries: - $ sudo apt-get install libboost-dev libboost-program-options-dev libexpat1-dev libboost-thread-dev uuid-dev + $ sudo apt-get install libboost-dev libboost-program-options-dev libexpat1-dev libboost-thread-dev uuid-dev libssl-dev Build release binaries: $ scons -(Note: C++ sdk requires cereal. Please follow the instruction in the build -message to install cereal) +(Note: C sdk requires tiny-cbor. Please follow the instruction in the build +message to install tiny-cbor) Build debug binaries: $scons RELEASE=false @@ -90,7 +90,7 @@ To build for Android, Andorid NDK and SDK are required. Arduino: To build for Arduino, Arduino IDE is required. Arduino IDE: http://arduino.cc/en/Main/Software - (Note: recommend install Arduino IDE >=1.5.7) + (Note: recommend install Arduino IDE >=1.5.8) Arduino builds are dependent on latest Time library. Download it from here: http://www.pjrc.com/teensy/td_libs_Time.html @@ -116,13 +116,10 @@ so you don't need to add it in command line each time. The build script will guide you to do that.) Tizen: -To build for tizen platform cereal library is needed. -Please download cereal if it is not present in extlibs/cereal folder -and apply the patch as following: - $ git clone https://github.com/USCiLab/cereal.git extlibs/cereal/cereal - $ cd extlibs/cereal/cereal - $ git reset --hard 7121e91e6ab8c3e6a6516d9d9c3e6804e6f65245 - $ git apply ../../../resource/patches/cereal_gcc46.patch +To build for tizen platform tiny-cbor library is needed. +Please download tiny-cbor if it is not present in extlibs/tiny-cbor folder +by doing the following: + $ git clone https://github.com/01org/tinycbor.git extlibs/tinycbor/tinycbor * 3. External libraries @@ -140,7 +137,7 @@ to skip it. 1. Build IoTivity project for Linux $ cd - $ sudo apt-get install libboost-dev libexpat1-dev libboost-thread-dev + $ sudo apt-get install libboost-dev libexpat1-dev libboost-thread-dev libssl-dev $ scons 2. Build IoTivity project for Android @@ -151,13 +148,14 @@ allowed value, please execute command 'scons TARGET_OS=android -Q -h') 3. Build IoTivity project for Arduino $ cd - $ scons TARGET_OS=arduino TARGET_ARCH=xxx BOARD=yyy -(xxx can be avr, arm; yyy is the name of the board, to get its allowed value -run: scons TARGET_OS=arduino TARGET_ARCH=xxx -h. You may see a option 'CPU' in -the output of above command line, that's due to some boards have different -processors, to specify the processor, add 'CPU=zzz' in the command line. If no -'CPU' option exists, that means the board only support one kind of processor, -it's unnecessary to specify it) + $ sudo apt-get install dos2unix + $ scons TARGET_OS=arduino TARGET_ARCH=xxx BOARD=yyy SHIELD=zzz +(xxx can be avr, arm; yyy is the name of the board, zzz is the shield type, to +get allowed values run: scons TARGET_OS=arduino TARGET_ARCH=xxx SHIELD=zzz -h. +You may see a option 'CPU' in the output of above command line, that's due to +some boards have different processors, to specify the processor, add 'CPU=zzz' +in the command line. If no 'CPU' option exists, that means the board only +support one kind of processor, it's unnecessary to specify it) 4. Build Iotivity project for Tizen $ cd @@ -167,24 +165,6 @@ gbs is default build tool for Tizen platfrom, we can refer the following wiki to setup Tizen development environment: https://source.tizen.org/documentation/developer-guide/getting-started-guide) -=== Build IoTivity project on Android === - -1. Build IoTivity project for Android(It's the same as on Ubuntu) - $ cd - $ scons TARGET_OS=android TARGET_ARCH=xxx -(xxx can be x86, armeabi, armeabi-v7a, armeabi-v7a-hard ...) - -2. Build IoTivity project for Arduino(It's the same as on Ubuntu) - $ cd - $ scons TARGET_OS=arduino TARGET_ARCH=xxx BOARD=yyy -(xxx can be avr, arm; yyy is the name of the board, to get its allowed value -run: scons TARGET_OS=arduino TARGET_ARCH=xxx -h. You may see a option 'CPU' in -the output of above command line, that's due to some boards have different -processor, to specify the processor, add 'CPU=zzz' in the command line. If no -'CPU' option exists, that means the board only support one kind of processor, -it's unnecessary to specify it) - - Note: Currently most IoTivity project doesn't support Windows, so you can't set TARGET_OS to 'windows' except the project support Windows. @@ -220,6 +200,3 @@ To build: $ auto_build.sh To clean: $ auto_build.sh -c - -2) For Arduino build, the Time library should >=1.3. The old can only be built -with Arduino IDE 1.0.x diff --git a/android/BuildInstructionsForAndroidAPI.txt b/android/BuildInstructionsForAndroidAPI.txt index 8dda6db..4bc0515 100644 --- a/android/BuildInstructionsForAndroidAPI.txt +++ b/android/BuildInstructionsForAndroidAPI.txt @@ -26,7 +26,7 @@ TO RUN UNIT TESTS IN ANDROID-API TO USE THE .AAR FILE IN /android/examples project -6. Verify that 9 different *.so files exist inside /android/android-api/base/libs/ directory. (They should already be present in the *.aar file.) +6. Verify that 7 different *.so files exist inside /android/android-api/base/libs/ directory. (They should already be present in the *.aar file.) 7. Import Project 'Examples' into android-studio. 8.To add an .aar file to the 'Examples' project, a.Right click on Examples->New->Module->Import .JAR or .AAR Package @@ -39,7 +39,7 @@ TO USE THE .AAR FILE IN /android/examples project TO USE THE .AAR FILE IN A DIFFERENT PROJECT -9. Verify that 9 different *.so files exist inside /android/android-api/base/libs/ directory. +9. Verify that 7 different *.so files exist inside /android/android-api/base/libs/ directory. 10. Import the .aar file in your project to use it diff --git a/android/android_api/base/base.iml b/android/android_api/base/base.iml index 36cf651..49b2159 100755 --- a/android/android_api/base/base.iml +++ b/android/android_api/base/base.iml @@ -9,7 +9,6 @@