projects
/
platform
/
upstream
/
iotivity.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update snapshot(2018-01-04)
[platform/upstream/iotivity.git]
/
.gitignore
diff --git
a/.gitignore
b/.gitignore
index
f9377e9
..
a6a0722
100644
(file)
--- a/
.gitignore
+++ b/
.gitignore
@@
-37,6
+37,9
@@
resource/csdk/stack/samples/linux/SimpleClientServer/release/
resource/csdk/connectivity/build/out/
resource/csdk/connectivity/build/out/
+# Ignore autogenerated files
+resource/c_common/iotivity_config.h
+
resource/oc_logger/bin/
resource/oc_logger/lib/
resource/oc_logger/samples/linux/release/
resource/oc_logger/bin/
resource/oc_logger/lib/
resource/oc_logger/samples/linux/release/
@@
-48,10
+51,20
@@
resource/unittests/debug/
service/things-manager/build/linux/release
service/things-manager/build/linux/debug
service/things-manager/sdk/build/linux/
service/things-manager/build/linux/release
service/things-manager/build/linux/debug
service/things-manager/sdk/build/linux/
+
+service/notification/android/.gradle/
+service/notification/android/build/
+service/notification/android/notification-service/build/
+service/notification/android/notification-service/src/main/obj/
+
# Ignore any object files
*.o
# Ignore any object files
*.o
+*.os
*.obj
*.obj
+# Ignore libraries
+*.a
+*.so
# Ignore Eclipse workspace files
*.settings/
# Ignore Eclipse workspace files
*.settings/
@@
-61,8
+74,10
@@
proguard-project.txt
# Ignore CTags default data
tags
# Ignore CTags default data
tags
+
# Ignore dependencies folder, which should be generated
dependencies/
# Ignore dependencies folder, which should be generated
dependencies/
+dep/
#ignore Klocwork stuff
.kwlp/
#ignore Klocwork stuff
.kwlp/
@@
-77,30
+92,55
@@
config.log
os
out/
platform
os
out/
platform
+iotivity.pc
+tmp/
# Ignore downloaded dependencies
# Ignore downloaded dependencies
+extlibs/libcoap/libcoap
extlibs/gtest/gtest-*
extlibs/hippomocks-master/
extlibs/master.zip
extlibs/cereal/cereal
extlibs/gtest/gtest-*
extlibs/hippomocks-master/
extlibs/master.zip
extlibs/cereal/cereal
-extlibs/expat/expat*
extlibs/cereal
extlibs/android/gradle/gradle-2.2.1
extlibs/android/ndk/android-ndk-r10d
extlibs/android/sdk/android-sdk_r24.2
extlibs/cereal
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/android/sdk/android-sdk-linux
+extlibs/android/sdk/android-sdk-macosx
+extlibs/android/sdk/android-sdk-windows
+extlibs/boost/*
+extlibs/tinycbor/tinycbor
*.tgz
*.zip
extlibs/arduino/arduino-1.5.8
build_common/arduino/extlibs/arduino/arduino-1.5.8
*.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
+extlibs/bluez/bluez
+# extlibs/mbedtls/mbedtls
+extlibs/raxmpp/raxmpp
+extlibs/yaml/yaml
# Ignore editor (e.g. Emacs) backup and autosave files
*~
*#*#
*.orig
# Ignore editor (e.g. Emacs) backup and autosave files
*~
*#*#
*.orig
+.cproject
+.gradle/
+.project
# Ignore byte-compiled Python scripts
*.pyc
# Ignore Valgrind generated files.
*.memcheck
# Ignore byte-compiled Python scripts
*.pyc
# Ignore Valgrind generated files.
*.memcheck
+
+# Ignore generated files
+# *.dat
+
+# Ignore debian generated files
+debian/files
+debian/*.debhelper.log
+debian/*.substvars
+debian/iotivity*/*
+debian/tmp/*