Skip to content
Snippets Groups Projects
Commit 07eb46c6 authored by Florent Gluck's avatar Florent Gluck
Browse files

Updated Makefile: added check for CERT env. var

parent b954b34b
No related branches found
No related tags found
No related merge requests found
......@@ -221,11 +221,13 @@ check_bin_var:
check_server_var:
$(call check_defined, SERVER)
check_cert_var:
$(call check_defined, CERT)
check_login_var:
$(call check_defined, LOGIN)
check_nexus_exam_vars:
$(call check_defined, CERT)
$(call check_defined, EXAM_USER)
$(call check_defined, EXAM_PWD)
......@@ -273,7 +275,7 @@ else
@echo -n "" > $(RESOURCES_DIR_CLIENT)/$(CA_CERT_FILE)
endif
xbuild_client: check_bin_var check_server_var copy_resources_client $(SRC_CLIENT)/nexush $(SRC_CLIENT)/nexus-cli
xbuild_client: check_bin_var check_server_var check_cert_var copy_resources_client $(SRC_CLIENT)/nexush $(SRC_CLIENT)/nexus-cli
@echo "[Cross-building $(BIN) into $(BUILD_DIR_CLIENT) directory]"
@for os in $(OSES_CLIENT); do \
for arch in $(ARCHES_CLIENT); do \
......@@ -296,15 +298,15 @@ xbuild_client: check_bin_var check_server_var copy_resources_client $(SRC_CLIENT
$(BUILD_DIR_CLIENT):
mkdir $@
build_nexush: check_server_var copy_resources_client $(BUILD_DIR_CLIENT) $(SRC_CLIENT)/nexush
build_nexush: check_server_var check_cert_var copy_resources_client $(BUILD_DIR_CLIENT) $(SRC_CLIENT)/nexush
@echo "[Building nexush into $(BUILD_DIR_CLIENT) directory]"
@cd $(SRC_CLIENT)/nexush && go build $(BUILD_FLAGS) $(BUILD_CLIENT_FLAGS) && mv nexush $(BUILD_ABS_CLIENT)
build_nexus-cli: check_server_var copy_resources_client $(BUILD_DIR_CLIENT) $(SRC_CLIENT)/nexus-cli
build_nexus-cli: check_server_var check_cert_var copy_resources_client $(BUILD_DIR_CLIENT) $(SRC_CLIENT)/nexus-cli
@echo "[Building nexus-cli into $(BUILD_DIR_CLIENT) directory]"
@cd $(SRC_CLIENT)/nexus-cli && go build $(BUILD_FLAGS) $(BUILD_CLIENT_FLAGS) && mv nexus-cli $(BUILD_ABS_CLIENT)
build_nexus-exam: check_server_var check_nexus_exam_vars copy_resources_client $(BUILD_DIR_CLIENT) $(SRC_CLIENT)/nexus-exam
build_nexus-exam: check_server_var check_cert_var check_nexus_exam_vars copy_resources_client $(BUILD_DIR_CLIENT) $(SRC_CLIENT)/nexus-exam
@echo "[Building nexus-exam into $(BUILD_DIR_CLIENT) directory]"
@echo -n '$(value EXAM_USER)' > $(NEXUS_EXAM_USER_CREDS_FILE)
@echo -n '$(value EXAM_PWD)' > $(NEXUS_EXAM_PWD_CREDS_FILE)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment