Use Pitchfork layout

See https://github.com/vector-of-bool/pitchfork

Signed-off-by: onox <[email protected]>

Author: onox

.gitignore

@@ -1,11 +1,10 @@
-/lib/
-/obj/
-/test/unit/obj/
-/test/cov/
+/build/
+/tests/unit/build/
+/tests/cov/
 /bin/
 *.swp
 .DS_Store
 .#*#
 auto.cgpr
-/test/unit/test_bindings
+/tests/unit/test_bindings
 /TEST-*.xml

Makefile

@@ -12,37 +12,37 @@ gprdir     = $(PREFIX)/share/gpr
 libdir     = $(PREFIX)/lib
 alidir     = $(libdir)
 
-.PHONY: build test debug clean coverage install
+.PHONY: build tests debug clean coverage install
 
 build:
-	$(GNATMAKE) -P json_ada.gpr -cargs $(CFLAGS) -largs $(LDFLAGS)
+	$(GNATMAKE) -P tools/json_ada.gpr -cargs $(CFLAGS) -largs $(LDFLAGS)
 
 build_test:
-	$(GNATMAKE) -P test/unit/unit_tests.gpr -XMode=coverage -cargs -O0 -largs $(LDFLAGS)
+	$(GNATMAKE) -P tests/unit/unit_tests.gpr -XMode=coverage -cargs -O0 -largs $(LDFLAGS)
 
 debug:
-	$(GNATMAKE) -P json_ada.gpr -XMode=debug -cargs $(CFLAGS) -largs $(LDFLAGS)
+	$(GNATMAKE) -P tools/json_ada.gpr -XMode=debug -cargs $(CFLAGS) -largs $(LDFLAGS)
 
 clean:
-	$(GNATCLEAN) -P json_ada.gpr
-	$(GNATCLEAN) -P test/unit/unit_tests.gpr
-	rm -rf lib obj test/unit/obj test/cov
+	$(GNATCLEAN) -P tools/json_ada.gpr
+	$(GNATCLEAN) -P tests/unit/unit_tests.gpr
+	rm -rf build tests/unit/build test/cov TEST-*.xml
 
-test: build_test
-	./test/unit/test_bindings
+tests: build_test
+	./tests/unit/test_bindings
 
 coverage:
-	mkdir -p test/cov
-	lcov -q -c -d test/unit/obj -o test/cov/unit.info
-	lcov -q -r test/cov/unit.info */adainclude/* -o test/cov/unit.info
-	lcov -q -r test/cov/unit.info */test/unit/* -o test/cov/unit.info
-	genhtml -q --ignore-errors source -o test/cov/html test/cov/unit.info
-	lcov -l test/cov/unit.info
+	mkdir -p tests/cov
+	lcov -q -c -d tests/unit/build/obj -o tests/cov/unit.info
+	lcov -q -r tests/cov/unit.info */adainclude/* -o tests/cov/unit.info
+	lcov -q -r tests/cov/unit.info */tests/unit/* -o tests/cov/unit.info
+	genhtml -q --ignore-errors source -o tests/cov/html tests/cov/unit.info
+	lcov -l tests/cov/unit.info
 
 install:
-	$(GNATINSTALL) --relocate-build-tree -p -q -f --install-name='json-ada' \
+	$(GNATINSTALL) -p -q -f --install-name='json-ada' \
 		--sources-subdir=$(includedir) \
 		--project-subdir=$(gprdir) \
 		--lib-subdir=$(libdir) \
 		--ali-subdir=$(alidir) \
-		--prefix=$(PREFIX) -P json_ada.gpr
+		--prefix=$(PREFIX) -P tools/json_ada.gpr

README.md

@@ -113,11 +113,11 @@ $ make
 
 ## Tests
 
-The project contains a set of unit tests. Use `make test` to build and
+The project contains a set of unit tests. Use `make tests` to build and
 run the unit tests. A coverage report can be generated with `make coverage`:
 
 ```
-$ make test
+$ make tests
 $ make coverage
 ```
 

shippable.yml

@@ -7,7 +7,7 @@ build:
     pull: true
   ci:
     - apt install -y --no-install-recommends gprbuild make libahven6-dev lcov
-    - make test
+    - make tests
     - make coverage
   post_ci:
     - mkdir -p shippable/testresults