Skip to content

Commit 127d962

Browse files
jkeiserjkeiser
committed
Remove unneeded .gitignores
Now that cmake is the only build system, we don't generate binaries in the source tree anymore. Amalgamate also doesn't leave anything around.
1 parent af12066 commit 127d962

File tree

2 files changed

+16
-140
lines changed

2 files changed

+16
-140
lines changed

‎.gitignore

Lines changed: 14 additions & 138 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
visual_studio
2-
3-
/benchbranch/
4-
/submodules/
5-
61
# eclipse project files
72
.cproject
83
.project
@@ -52,117 +47,6 @@ gens
5247
libs
5348
objs
5449

55-
# Build outputs (TODO build to a subdir so we can exclude that instead)
56-
/.simdjson-user-CMakeCache.txt
57-
/allparserscheckfile
58-
/allparsingcompetition
59-
/basictests
60-
/benchfeatures
61-
/benchmark/allparsingcompetition
62-
/benchmark/bench_dom_api
63-
/benchmark/bench_parse_call
64-
/benchmark/distinctuseridcompetition
65-
/benchmark/get_corpus_benchmark
66-
/benchmark/minifiercompetition
67-
/benchmark/parse
68-
/benchmark/parseandstatcompetition
69-
/benchmark/parse_nonumberparsing
70-
/benchmark/parse_nostringparsing
71-
/benchmark/parse_noutf8validation
72-
/benchmark/parse_stream
73-
/benchmark/parsingcompetition
74-
/benchmark/perfdiff
75-
/benchmark/simdjson-master
76-
/benchmark/statisticalmodel
77-
/build/
78-
/build-ossfuzz-*/
79-
/build-plain-*/
80-
/corpus.zip
81-
/distinctuseridcompetition
82-
/errortests
83-
/examples/quickstart/quickstart
84-
/examples/quickstart/quickstart11
85-
/examples/quickstart/quickstart14
86-
/examples/quickstart/quickstart17
87-
/examples/quickstart/simdjson.cpp
88-
/examples/quickstart/simdjson.h
89-
/examples/quickstart/twitter.json
90-
/fuzz/fuzz_dump
91-
/fuzz/fuzz_dump_raw_tape
92-
/fuzz/fuzz_minify
93-
/fuzz/fuzz_parser
94-
/fuzz/fuzz_print_json
95-
/get_corpus_benchmark
96-
/json2json
97-
/jsoncheck
98-
/jsoncheck_westmere
99-
/jsoncheck_fallback
100-
/jsonpointer
101-
/jsonstats
102-
/integer_tests
103-
/libsimdjson.so*
104-
/minifiercompetition
105-
/minify
106-
/numberparsingcheck
107-
/ossfuzz-out
108-
/out
109-
/parse
110-
/parse_many_test
111-
/parse_nonumberparsing
112-
/parse_nostringparsing
113-
/parse_noutf8validation
114-
/parse_stream
115-
/parseandstatcompetition
116-
/parsingcompetition
117-
/perfdiff
118-
/pointercheck
119-
/readme_examples
120-
/readme_examples11
121-
/readme_examples_noexceptions
122-
/readme_examples_noexceptions11
123-
/staticchecks
124-
/statisticalmodel
125-
/stringparsingcheck
126-
/submodules
127-
/ujdecode.o
128-
/amalgamate_demo.cpp
129-
/simdjson.cpp
130-
/simdjson.h
131-
/singleheader/amalgamate_demo
132-
/singleheader/demo
133-
/tests/allparserscheckfile
134-
/tests/basictests
135-
/tests/checkimplementation
136-
/tests/compilation_failure_tests/dangling_parser_load_should_compile
137-
/tests/compilation_failure_tests/dangling_parser_parse_padstring_should_compile
138-
/tests/compilation_failure_tests/dangling_parser_parse_stdstring_should_compile
139-
/tests/compilation_failure_tests/dangling_parser_parse_uchar_should_compile
140-
/tests/compilation_failure_tests/dangling_parser_parse_uint8_should_compile
141-
/tests/compilation_failure_tests/example_compiletest_should_compile
142-
/tests/errortests
143-
/tests/extracting_values_example
144-
/tests/integer_tests
145-
/tests/jsoncheck
146-
/tests/numberparsingcheck
147-
/tests/pointercheck
148-
/tests/parse_many_test
149-
/tests/readme_examples
150-
/tests/readme_examples11
151-
/tests/readme_examples_noexceptions
152-
/tests/readme_examples_noexceptions11
153-
/tests/staticchecks
154-
/tests/stringparsingcheck
155-
/tools/json2json
156-
/tools/jsonstats
157-
/tools/minify
158-
/build*/
159-
160-
# Don't check in generated API docs
161-
/doc/api
162-
163-
# Don't check in generated examples
164-
/jsonexamples/generated
165-
16650
# C++ ignore from https://github.com/github/gitignore/blob/master/C%2B%2B.gitignore
16751

16852
# Prerequisites
@@ -199,27 +83,19 @@ objs
19983
*.app
20084

20185

202-
### https://raw.github.com/github/gitignore/e92f8db7a027af8cc25da2dc0758317e39697684/CMake.gitignore
86+
# CMake files that may be specific to our installation
20387

204-
CMakeLists.txt.user
205-
CMakeCache.txt
206-
CMakeFiles
207-
CMakeScripts
208-
Testing
209-
Makefile
210-
cmake_install.cmake
211-
install_manifest.txt
212-
compile_commands.json
213-
CTestTestfile.cmake
214-
_deps
88+
# Build outputs
89+
/build*/
21590

216-
# CMake files that may be specific to our installation
217-
/CPackConfig.cmake
218-
/CPackSourceConfig.cmake
219-
# We check in a custom version of root Makefile that is not generated by CMake
220-
!/Makefile
221-
222-
singleheader/amalgamation_demo
223-
singleheader/amalgamation_demo.cpp
224-
singleheader/simdjson.cpp
225-
singleheader/simdjson.h
91+
# Fuzzer outputs generated by instructions in fuzz/Fuzzing.md
92+
/corpus.zip
93+
/ossfuzz-out/
94+
/out/
95+
96+
# Don't check in generated API docs
97+
/doc/api
98+
99+
# Don't check in generated examples
100+
/jsonexamples/generated
101+
/visual_studio

‎HACKING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -199,9 +199,9 @@ We assume you have a common 64-bit Windows PC with at least Visual Studio 2017 a
199199

200200
- Grab the simdjson code from GitHub, e.g., by cloning it using [GitHub Desktop](https://desktop.github.com/).
201201
- Install [CMake](https://cmake.org/download/). When you install it, make sure to ask that `cmake` be made available from the command line. Please choose a recent version of cmake.
202-
- Create a subdirectory within simdjson, such as `VisualStudio`.
202+
- Create a subdirectory within simdjson, such as `build`.
203203
- Using a shell, go to this newly created directory. You can start a shell directly from GitHub Desktop (Repository > Open in Command Prompt).
204-
- Type `cmake -DCMAKE_GENERATOR_PLATFORM=x64 ..` in the shell while in the `VisualStudio` repository. (Alternatively, if you want to build a DLL, you may use the command line `cmake -DCMAKE_GENERATOR_PLATFORM=x64 -DSIMDJSON_BUILD_STATIC=OFF ..`.)
204+
- Type `cmake -DCMAKE_GENERATOR_PLATFORM=x64 ..` in the shell while in the `build` repository. (Alternatively, if you want to build a DLL, you may use the command line `cmake -DCMAKE_GENERATOR_PLATFORM=x64 -DSIMDJSON_BUILD_STATIC=OFF ..`.)
205205
- This last command (`cmake ...`) created a Visual Studio solution file in the newly created directory (e.g., `simdjson.sln`). Open this file in Visual Studio. You should now be able to build the project and run the tests. For example, in the `Solution Explorer` window (available from the `View` menu), right-click `ALL_BUILD` and select `Build`. To test the code, still in the `Solution Explorer` window, select `RUN_TESTS` and select `Build`.
206206

207207

0 commit comments

Comments
 (0)