Skip to content

Commit 3e91b00

Browse files
authored
feat realmedium_sample: made makefile consistent (#5)
1 parent 5643477 commit 3e91b00

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

Makefile

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,13 @@ test-debug test-release: test-%: build-%
5151
pycodestyle tests
5252

5353
# Start the service (via testsuite service runner)
54-
.PHONY: service-start-debug service-start-release
55-
service-start-debug service-start-release: service-start-%: build-%
54+
.PHONY: start-debug start-release
55+
start-debug start-release: start-%: build-%
5656
cmake --build build_$* -v --target start-realmedium_sample
5757

58+
.PHONY: service-start-debug service-start-release
59+
service-start-debug service-start-release: service-start-%: start-%
60+
5861
# Cleanup data
5962
.PHONY: clean-debug clean-release
6063
clean-debug clean-release: clean-%:
@@ -91,10 +94,13 @@ export DB_CONNECTION := postgresql://${POSTGRES_USER}:${POSTGRES_PASSWORD}@servi
9194
--config_vars /home/user/.local/etc/realmedium_sample/config_vars.docker.yaml
9295

9396
# Build and run service in docker environment
94-
.PHONY: docker-start-service-debug docker-start-service-release
95-
docker-start-service-debug docker-start-service-release: docker-start-service-%:
97+
.PHONY: docker-start-debug docker-start-release
98+
docker-start-debug docker-start-release: docker-start-%:
9699
$(DOCKER_COMPOSE) run -p 8080:8080 --rm realmedium-sample make -- --in-docker-start-$*
97100

101+
.PHONY: docker-start-service-debug docker-start-service-release
102+
docker-start-service-debug docker-start-service-release: docker-start-service-%: docker-start-%
103+
98104
# Start targets makefile in docker environment
99105
.PHONY: docker-cmake-debug docker-build-debug docker-test-debug docker-clean-debug docker-install-debug docker-cmake-release docker-build-release docker-test-release docker-clean-release docker-install-release
100106
docker-cmake-debug docker-build-debug docker-test-debug docker-clean-debug docker-install-debug docker-cmake-release docker-build-release docker-test-release docker-clean-release docker-install-release: docker-%:

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ make test-release
3434
* `make build-release` - release build of the service with LTO
3535
* `make test-debug` - does a `make build-debug` and runs all the tests on the result
3636
* `make test-release` - does a `make build-release` and runs all the tests on the result
37-
* `make service-start-debug` - builds the service in debug mode and starts it
38-
* `make service-start-release` - builds the service in release mode and starts it
37+
* `make start-debug` - builds the service in debug mode and starts it
38+
* `make start-release` - builds the service in release mode and starts it
3939
* `make` or `make all` - builds and runs all the tests in release and debug modes
4040
* `make format` - autoformat all the C++ and Python sources
4141
* `make clean-` - cleans the object files
@@ -47,8 +47,8 @@ make test-release
4747
* `make docker-test-debug` - does a `make build-debug` and runs all the tests on the result in docker environment
4848
* `make docker-build-release` - release build of the service with all the assertions and sanitizers enabled in docker environment
4949
* `make docker-test-release` - does a `make build-release` and runs all the tests on the result in docker environment
50-
* `make docker-start-service-release` - does a `make install-release` and runs service in docker environment
51-
* `make docker-start-service-debug` - does a `make install-debug` and runs service in docker environment
50+
* `make docker-start-release` - does a `make install-release` and runs service in docker environment
51+
* `make docker-start-debug` - does a `make install-debug` and runs service in docker environment
5252
* `make docker-clean-data` - stop docker containers and clean database data
5353

5454

0 commit comments

Comments
 (0)