Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop thirdparty libraries and minor cleanups #180

Merged
merged 4 commits into from
Oct 29, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@
/build/gmake
/build/vs*/
/doc/html
/doc/doxygen_*.db
/thirdparty/lib
/intermediate
4 changes: 0 additions & 4 deletions build/premake4.lua
Original file line number Diff line number Diff line change
Expand Up @@ -114,17 +114,13 @@ solution "test"
files {
"../include/**.h",
"../test/perftest/**.cpp",
"../test/perftest/**.c",
"../test/perftest/**.h",
}

includedirs {
"../include/",
"../thirdparty/gtest/include/",
"../thirdparty/",
"../thirdparty/jsoncpp/include/",
"../thirdparty/libjson/",
"../thirdparty/yajl/include/",
}

libdirs "../thirdparty/lib"
Expand Down
1 change: 0 additions & 1 deletion doc/diagram/.gitignore

This file was deleted.

10 changes: 8 additions & 2 deletions doc/performance.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,15 @@

The old performance article for RapidJSON 0.1 is provided [here](https://code.google.com/p/rapidjson/wiki/Performance).

This file will be updated with new version and better procedures.
The (third-party) performance tests have been removed from this repository
and are now part of a dedicated [native JSON benchmark collection] [1].

In the meantime, you may also refer to the following third-party benchmarks.
This file will be updated with a summary of benchmarking results based on
the above benchmark collection in the future.

[1]: https://github.com/miloyip/nativejson-benchmark

Additionally, you may refer to the following third-party benchmarks.

## Third-party benchmarks

Expand Down
77 changes: 0 additions & 77 deletions test/perftest/jsoncpptest.cpp

This file was deleted.

9 changes: 0 additions & 9 deletions test/perftest/perftest.h
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,6 @@
#define PERFTEST_H_

#define TEST_RAPIDJSON 1
#define TEST_JSONCPP 0
#define TEST_YAJL 0
#define TEST_ULTRAJSON 0
#define TEST_PLATFORM 0
#define TEST_MISC 0

Expand All @@ -39,12 +36,6 @@
# define RAPIDJSON_SSE2
#endif

#if TEST_YAJL
#include "yajl/yajl_common.h"
#undef YAJL_MAX_DEPTH
#define YAJL_MAX_DEPTH 1024
#endif

////////////////////////////////////////////////////////////////////////////////
// Google Test

Expand Down
84 changes: 0 additions & 84 deletions test/perftest/ultrajsontest.cpp

This file was deleted.

22 changes: 0 additions & 22 deletions test/perftest/yajl_all.c

This file was deleted.

Loading