diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-12-21 16:30:27 (GMT) |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-12-21 16:30:27 (GMT) |
| commit | 4160336cb433be66a5c9c63458658e816b6f3c23 (patch) | |
| tree | 18cd58a76095e0f071e530f302de9c201501d0b8 | |
| parent | 34a99e547ab7754bf69618d3047a80b1b35148b3 (diff) | |
| parent | 0f698c830f7977a5eb61c397a15a6c5be25dbb3f (diff) | |
| download | googletest-4160336cb433be66a5c9c63458658e816b6f3c23.zip googletest-4160336cb433be66a5c9c63458658e816b6f3c23.tar.gz googletest-4160336cb433be66a5c9c63458658e816b6f3c23.tar.bz2 | |
Merge pull request #2013 from ciband:chore/fix_library_json
PiperOrigin-RevId: 226493373
| -rw-r--r-- | .gitignore | 57 | ||||
| -rw-r--r-- | README.md | 2 | ||||
| -rw-r--r-- | library.json | 2 |
3 files changed, 59 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3794794 --- /dev/null +++ b/.gitignore @@ -0,0 +1,57 @@ +# Ignore CI build directory +build/ +xcuserdata +cmake-build-debug/ +.idea/ +bazel-bin +bazel-genfiles +bazel-googletest +bazel-out +bazel-testlogs +# python +*.pyc + +# Visual Studio files +.vs +*.sdf +*.opensdf +*.VC.opendb +*.suo +*.user +_ReSharper.Caches/ +Win32-Debug/ +Win32-Release/ +x64-Debug/ +x64-Release/ + +# Ignore autoconf / automake files +Makefile.in +aclocal.m4 +configure +build-aux/ +autom4te.cache/ +googletest/m4/libtool.m4 +googletest/m4/ltoptions.m4 +googletest/m4/ltsugar.m4 +googletest/m4/ltversion.m4 +googletest/m4/lt~obsolete.m4 + +# Ignore generated directories. +googlemock/fused-src/ +googletest/fused-src/ + +# macOS files +.DS_Store +googletest/.DS_Store +googletest/xcode/.DS_Store + +# Ignore cmake generated directories and files. +CMakeFiles +CTestTestfile.cmake +Makefile +cmake_install.cmake +googlemock/CMakeFiles +googlemock/CTestTestfile.cmake +googlemock/Makefile +googlemock/cmake_install.cmake +googlemock/gtest @@ -1,7 +1,7 @@ # Google Test # -[](https://travis-ci.org/google/googletest) +[](https://travis-ci.org/abseil/googletest) [](https://ci.appveyor.com/project/GoogleTestAppVeyor/googletest/branch/master) **Future Plans**: diff --git a/library.json b/library.json index 3104ec1..fed9f69 100644 --- a/library.json +++ b/library.json @@ -30,7 +30,7 @@ "googletest/xcode", "googletest/CMakeLists.txt", "googletest/Makefile.am", - "googletest/configure.ac", + "googletest/configure.ac" ], "frameworks": "arduino", "platforms": [ |